diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index d23f5b554e..6e24c85e3d 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -242,3 +242,35 @@ outputs:
           when:
             - step|int == 2
             - remove_httpd_package|bool
+      fast_forward_upgrade_tasks:
+        - name: Check is cinder_api is deployed
+          command: systemctl is-enabled --quiet openstack-cinder-api
+          ignore_errors: True
+          register: cinder_api_enabled
+        - name: Stop openstack-cinder-api
+          service: name=openstack-cinder-api state=stopped
+          when:
+            - step|int == 2
+            - release == 'ocata'
+            - cinder_api_enabled.rc == 0
+        - name: Extra migration for cinder
+          command: cinder-manage db online_data_migrations
+          when:
+            - step|int == 5
+            - release == 'pike'
+            - is_bootstrap_node|bool
+        - name: Cinder package update
+          command: yum update -y "{{ item }}"
+          with_items:
+              - puppet-cinder
+              - python2-cinderclient
+              - python-cinder
+              - openstack-cinder
+          when:
+            - step|int == 6
+            - is_bootstrap_node|bool
+        - name: Cinder db sync
+          command: cinder-manage db sync
+          when:
+            - step|int == 8
+            - is_bootstrap_node|bool
diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml
index 5467ec9198..64b1267d86 100644
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@@ -157,3 +157,14 @@ outputs:
           when:
             - step|int == 2
             - remove_cinder_package|bool
+      fast_forward_upgrade_tasks:
+        - name: Check if cinder_scheduler is deployed
+          command: systemctl is-enabled --quiet openstack-cinder-scheduler
+          ignore_errors: True
+          register: cinder_scheduler_enabled
+        - name: Stop openstack-cinder-scheduler
+          service: name=openstack-cinder-scheduler state=stopped enabled=no
+          when:
+            - step|int == 2
+            - release == 'ocata'
+            - cinder_scheduler_enabled.rc == 0
diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml
index cd620c2d57..2b8c25a21c 100644
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@@ -232,3 +232,14 @@ outputs:
           when:
             - step|int == 2
             - remove_cinder_package|bool
+      fast_forward_upgrade_tasks:
+        - name: Check if cinder_volume is deployed
+          command: systemctl is-enabled --quiet openstack-cinder-volume
+          ignore_errors: True
+          register: cinder_volume_enabled
+        - name: Stop openstack-cinder-volume
+          service: name=openstack-cinder-volume state=stopped enabled=no
+          when:
+            - step|int == 2
+            - release == 'ocata'
+            - cinder_volume_enabled.rc == 0