diff --git a/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp b/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
index 66fcd21560..ce78620f12 100644
--- a/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
+++ b/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
@@ -175,6 +175,17 @@ class openstack_tasks::swift::proxy_storage {
         verbose                     => $verbose,
         log_facility                => 'LOG_SYSLOG',
       }
+
+      service { 'swift-container-reconciler':
+        ensure  => stopped,
+        enable  => false,
+        require => Package['swift-container'],
+      }
+      service { 'swift-object-reconstructor':
+        ensure  => stopped,
+        enable  => false,
+        require => Package['swift-object'],
+      }
     }
 
     # swift_container_sync_realms file specifying
diff --git a/tests/noop/spec/hosts/swift/proxy_storage_spec.rb b/tests/noop/spec/hosts/swift/proxy_storage_spec.rb
index 5b6192ead9..d2c867521a 100644
--- a/tests/noop/spec/hosts/swift/proxy_storage_spec.rb
+++ b/tests/noop/spec/hosts/swift/proxy_storage_spec.rb
@@ -214,6 +214,22 @@ describe manifest do
         end
       end
 
+      if deploy_swift_storage
+        it 'should disable swift-container-reconciler service' do
+          should contain_service('swift-container-reconciler').with(
+            'ensure' => 'stopped',
+            'enable' => 'false',
+          ).that_requires('Package[swift-container]')
+        end
+
+        it 'should disable swift-object-reconstructor service' do
+          should contain_service('swift-object-reconstructor').with(
+            'ensure' => 'stopped',
+            'enable' => 'false',
+          ).that_requires('Package[swift-object]')
+        end
+      end
+
       if deploy_swift_proxy or deploy_swift_storage
         realm1_key = Noop.hiera('swift_realm1_key', 'realm1key')
         it 'should contain swift_container-sync-realms config' do