diff --git a/manifests/storage/account.pp b/manifests/storage/account.pp
index e4c41aeb..c21bb977 100644
--- a/manifests/storage/account.pp
+++ b/manifests/storage/account.pp
@@ -35,7 +35,6 @@ class swift::storage::account(
 ) inherits ::swift::params {
 
   Swift_config<| |> ~> Service['swift-account-reaper']
-  Swift_config<| |> ~> Service['swift-account-auditor']
 
   swift::storage::generic { 'account':
     manage_service   => $manage_service,
@@ -43,7 +42,7 @@ class swift::storage::account(
     package_ensure   => $package_ensure,
     config_file_name => $config_file_name,
     service_provider => $service_provider
-}
+  }
 
   if $manage_service {
     if $enabled {
@@ -61,13 +60,4 @@ class swift::storage::account(
     service_provider       => $service_provider,
     require                => Package['swift-account'],
   }
-
-  swift::service { 'swift-account-auditor':
-    os_family_service_name => $::swift::params::account_auditor_service_name,
-    service_ensure         => $service_ensure,
-    enabled                => $enabled,
-    config_file_name       => $config_file_name,
-    service_provider       => $service_provider,
-    require                => Package['swift-account'],
-  }
 }
diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp
index 82eaee67..067bcb3f 100644
--- a/manifests/storage/container.pp
+++ b/manifests/storage/container.pp
@@ -41,7 +41,6 @@ class swift::storage::container(
 ) inherits ::swift::params {
 
   Swift_config<| |> ~> Service['swift-container-updater']
-  Swift_config<| |> ~> Service['swift-container-auditor']
 
   swift::storage::generic { 'container':
     manage_service   => $manage_service,
@@ -68,15 +67,6 @@ class swift::storage::container(
     require                => Package['swift-container'],
   }
 
-  swift::service { 'swift-container-auditor':
-    os_family_service_name => $::swift::params::container_auditor_service_name,
-    service_ensure         => $service_ensure,
-    enabled                => $enabled,
-    config_file_name       => $config_file_name,
-    service_provider       => $service_provider,
-    require                => Package['swift-container'],
-  }
-
   if $::osfamily == 'Debian' {
     swift::service { 'swift-container-sync':
       os_family_service_name => $::swift::params::container_sync_service_name,
diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp
index 3d5be94c..7dd84965 100644
--- a/manifests/storage/generic.pp
+++ b/manifests/storage/generic.pp
@@ -42,6 +42,8 @@ define swift::storage::generic(
 
   Class['swift::storage'] -> Swift::Storage::Generic[$name]
   Swift_config<| |> ~> Service["swift-${name}-server"]
+  Swift_config<| |> ~> Service["swift-${name}-auditor"]
+  Swift_config<| |> ~> Service["swift-${name}-replicator"]
 
   validate_re($name, '^object|container|account$')
 
@@ -84,4 +86,13 @@ define swift::storage::generic(
     service_provider       => $service_provider,
     subscribe              => Package["swift-${name}"],
   }
+
+  swift::service { "swift-${name}-auditor":
+    os_family_service_name => getvar("::swift::params::${name}_auditor_service_name"),
+    service_ensure         => $service_ensure,
+    enabled                => $enabled,
+    config_file_name       => $config_file_name,
+    service_provider       => $service_provider,
+    subscribe              => Package["swift-${name}"],
+  }
 }
diff --git a/manifests/storage/object.pp b/manifests/storage/object.pp
index 9408236d..c7e8e43f 100644
--- a/manifests/storage/object.pp
+++ b/manifests/storage/object.pp
@@ -35,7 +35,6 @@ class swift::storage::object(
 ) inherits ::swift::params {
 
   Swift_config<| |> ~> Service['swift-object-updater']
-  Swift_config<| |> ~> Service['swift-object-auditor']
 
   swift::storage::generic { 'object':
     manage_service   => $manage_service,
@@ -61,13 +60,4 @@ class swift::storage::object(
     service_provider       => $service_provider,
     require                => Package['swift-object'],
   }
-
-  swift::service { 'swift-object-auditor':
-    os_family_service_name => $::swift::params::object_auditor_service_name,
-    service_ensure         => $service_ensure,
-    enabled                => $enabled,
-    config_file_name       => $config_file_name,
-    service_provider       => $service_provider,
-    require                => Package['swift-object'],
-  }
 }
diff --git a/spec/defines/swift_storage_generic_spec.rb b/spec/defines/swift_storage_generic_spec.rb
index 59f51f50..41c4b5b5 100644
--- a/spec/defines/swift_storage_generic_spec.rb
+++ b/spec/defines/swift_storage_generic_spec.rb
@@ -60,20 +60,29 @@ describe 'swift::storage::generic' do
               end
               it do
                 is_expected.to contain_service("swift-#{t}-server").with(
-                  :name    => platform_params["swift-#{t}-server"],
-                  :ensure  => (param_hash_manage[:manage_service] && param_hash_manage[:enabled]) ? 'running' : 'stopped',
-                  :enable  => param_hash_manage[:enabled],
+                  :name     => platform_params["swift-#{t}-server"],
+                  :ensure   => (param_hash_manage[:manage_service] && param_hash_manage[:enabled]) ? 'running' : 'stopped',
+                  :enable   => param_hash_manage[:enabled],
                   :provider => platform_params['service_provider'],
-                  :tag     => 'swift-service'
+                  :tag      => 'swift-service'
                 )
               end
               it do
                 is_expected.to contain_service("swift-#{t}-replicator").with(
-                  :name    => platform_params["swift-#{t}-replicator"],
-                  :ensure  => (param_hash_manage[:manage_service] && param_hash_manage[:enabled]) ? 'running' : 'stopped',
-                  :enable  => param_hash_manage[:enabled],
+                  :name     => platform_params["swift-#{t}-replicator"],
+                  :ensure   => (param_hash_manage[:manage_service] && param_hash_manage[:enabled]) ? 'running' : 'stopped',
+                  :enable   => param_hash_manage[:enabled],
                   :provider => platform_params['service_provider'],
-                  :tag => 'swift-service'
+                  :tag      => 'swift-service'
+                )
+              end
+              it do
+                is_expected.to contain_service("swift-#{t}-auditor").with(
+                  :name     => platform_params["swift-#{t}-auditor"],
+                  :ensure   => (param_hash_manage[:manage_service] && param_hash_manage[:enabled]) ? 'running' : 'stopped',
+                  :enable   => param_hash_manage[:enabled],
+                  :provider => platform_params['service_provider'],
+                  :tag      => 'swift-service'
                 )
               end
               it do
@@ -97,10 +106,13 @@ describe 'swift::storage::generic' do
     let :platform_params do
       {  'swift-account-server'       => 'swift-account',
          'swift-account-replicator'   => 'swift-account-replicator',
+         'swift-account-auditor'      => 'swift-account-auditor',
          'swift-container-server'     => 'swift-container',
          'swift-container-replicator' => 'swift-container-replicator',
+         'swift-container-auditor'    => 'swift-container-auditor',
          'swift-object-server'        => 'swift-object',
          'swift-object-replicator'    => 'swift-object-replicator',
+         'swift-object-auditor'       => 'swift-object-auditor',
          'service_provider'           => 'upstart'
       }
     end
@@ -115,11 +127,14 @@ describe 'swift::storage::generic' do
       let :platform_params do
         {  'swift-account-server'       => 'swift-account-server',
            'swift-account-replicator'   => 'swift-account-replicator',
+           'swift-account-auditor'      => 'swift-account-auditor',
            'swift-container-server'     => 'swift-container-server',
            'swift-container-replicator' => 'swift-container-replicator',
+           'swift-container-auditor'    => 'swift-container-auditor',
            'swift-object-server'        => 'swift-object-server',
            'swift-object-replicator'    => 'swift-object-replicator',
-           'service_provider'           => 'swiftinit'
+           'swift-object-auditor'       => 'swift-object-auditor',
+           'service_provider'           => 'swiftinit',
         }
       end
 
@@ -136,10 +151,13 @@ describe 'swift::storage::generic' do
     let :platform_params do
       {  'swift-account-server'       => 'openstack-swift-account',
          'swift-account-replicator'   => 'openstack-swift-account-replicator',
+         'swift-account-auditor'      => 'openstack-swift-account-auditor',
          'swift-container-server'     => 'openstack-swift-container',
          'swift-container-replicator' => 'openstack-swift-container-replicator',
+         'swift-container-auditor'    => 'openstack-swift-container-auditor',
          'swift-object-server'        => 'openstack-swift-object',
-         'swift-object-replicator'    => 'openstack-swift-object-replicator'
+         'swift-object-replicator'    => 'openstack-swift-object-replicator',
+         'swift-object-auditor'       => 'openstack-swift-object-auditor',
       }
     end
 
@@ -153,11 +171,14 @@ describe 'swift::storage::generic' do
       let :platform_params do
         {  'swift-account-server'       => 'swift-account-server',
            'swift-account-replicator'   => 'swift-account-replicator',
+           'swift-account-auditor'      => 'swift-account-auditor',
            'swift-container-server'     => 'swift-container-server',
            'swift-container-replicator' => 'swift-container-replicator',
+           'swift-container-auditor'    => 'swift-container-auditor',
            'swift-object-server'        => 'swift-object-server',
            'swift-object-replicator'    => 'swift-object-replicator',
-           'service_provider'           => 'swiftinit'
+           'swift-object-auditor'       => 'swift-object-auditor',
+           'service_provider'           => 'swiftinit',
         }
       end