diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 40007d3622..eedb360631 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -522,10 +522,12 @@ outputs:
                 - openstack-swift-container-replicator
                 - openstack-swift-container-updater
                 - openstack-swift-container
+                - openstack-swift-container-sync
                 - openstack-swift-object-auditor
                 - openstack-swift-object-replicator
                 - openstack-swift-object-updater
                 - openstack-swift-object
+                - openstack-swift-object-reconstructor
             - name: Set fact swift_services_enabled
               set_fact:
                 swift_services_enabled: "{{ swift_services_enabled_result }}"
@@ -580,10 +582,12 @@ outputs:
                 - openstack-swift-container-replicator
                 - openstack-swift-container-updater
                 - openstack-swift-container
+                - openstack-swift-container-sync
                 - openstack-swift-object-auditor
                 - openstack-swift-object-replicator
                 - openstack-swift-object-updater
                 - openstack-swift-object
+                - openstack-swift-object-reconstructor
               ignore_errors: True
               register: swift_services_enabled_result
             - name: Set fact swift_services_enabled
diff --git a/releasenotes/notes/disable-non-containerized-swift-services-4f7edd98203d749b.yaml b/releasenotes/notes/disable-non-containerized-swift-services-4f7edd98203d749b.yaml
new file mode 100644
index 0000000000..dbb2b8f6d1
--- /dev/null
+++ b/releasenotes/notes/disable-non-containerized-swift-services-4f7edd98203d749b.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Make sure all Swift services are disabled after upgrading to a
+    containerized undercloud.