diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 39e8907a12..e3280fde5f 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -192,3 +192,21 @@ outputs:
             - httpd_enabled.rc == 0
             - httpd_running.rc == 0
           service: name=httpd state=stopped enabled=no
+      fast_forward_upgrade_tasks:
+        - block:
+            - name: Check if ironic_api is deployed
+              command: systemctl is-enabled --quiet openstack-ironic-api
+              ignore_errors: True
+              register: ironic_api_enabled_result
+            - name: Set fact ironic_api_enabled
+              set_fact:
+                ironic_api_enabled: "{{ ironic_api_enabled_result.rc == 0 }}"
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: Stop openstack-ironic-api
+          service: name=openstack-ironic-api state=stopped enabled=no
+          when:
+            - step|int == 1
+            - release == 'ocata'
+            - ironic_api_enabled|bool
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index 089a1a14a6..5914a7ba56 100644
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@@ -229,3 +229,21 @@ outputs:
             - step|int == 2
             - ironic_conductor_enabled.rc == 0
           service: name=openstack-ironic-conductor state=stopped enabled=no
+      fast_forward_upgrade_tasks:
+        - block:
+            - name: Check if ironic_conductor is deployed
+              command: systemctl is-enabled --quiet openstack-ironic-conductor
+              ignore_errors: True
+              register: ironic_conductor_enabled_result
+            - name: Set fact ironic_conductor_enabled
+              set_fact:
+                ironic_conductor_enabled: "{{ ironic_conductor_enabled_result.rc == 0 }}"
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: Stop openstack-ironic-conductor
+          service: name=openstack-ironic-conductor state=stopped enabled=no
+          when:
+            - step|int == 1
+            - release == 'ocata'
+            - ironic_conductor_enabled|bool