diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index af2444b25c..096893cf08 100644
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -274,3 +274,18 @@ outputs:
             - remove_swift_proxy_package|bool
       metadata_settings:
         get_attr: [SwiftProxyBase, role_data, metadata_settings]
+      fast_forward_upgrade_tasks:
+        - name: Check if swift-proxy or swift-object-expirer are deployed
+          command: systemctl is-enabled --quiet "{{ item }}"
+          register: swift_proxy_services_enabled
+          with_items:
+            - openstack-swift-proxy
+            - openstack-swift-object-expirer
+          ignore_errors: True
+        - name: Stop swift-proxy and swift-object-expirer services
+          service: name={{ item.item }} state=stopped enabled=no
+          with_items: "{{ swift_proxy_services_enabled.results }}"
+          when:
+            - step|int == 2
+            - release == 'ocata'
+            - item.rc == 0
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index b9ada58e2a..810e6f31bf 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -538,3 +538,37 @@ outputs:
           file:
             path: /var/run/rsyncd.pid
             state: absent
+      fast_forward_upgrade_tasks:
+        - name: Check if swift storage services are deployed
+          command: systemctl is-enabled --quiet "{{ item }}"
+          register: swift_services_enabled
+          with_items:
+            - openstack-swift-account-auditor
+            - openstack-swift-account-reaper
+            - openstack-swift-account-replicator
+            - openstack-swift-account
+            - openstack-swift-container-auditor
+            - openstack-swift-container-replicator
+            - openstack-swift-container-updater
+            - openstack-swift-container
+            - openstack-swift-object-auditor
+            - openstack-swift-object-replicator
+            - openstack-swift-object-updater
+            - openstack-swift-object
+          ignore_errors: True
+        - name: Stop swift storage services
+          service: name={{ item.item }} state=stopped enabled=no
+          with_items: "{{ swift_services_enabled.results }}"
+          when:
+            - step|int == 2
+            - release == 'ocata'
+            - item.rc == 0
+        - name: Update swift storage services
+          yum: name={{ item }} state=latest
+          with_items:
+            - openstack-swift-container
+            - openstack-swift-object
+            - openstack-swift-account
+          when:
+            - step|int == 6
+            - is_bootstrap_node|bool