diff --git a/tasks/fast-forward-upgrade/overcloud_upgrade_hosts.yaml b/tasks/fast-forward-upgrade/overcloud_upgrade_hosts.yaml
index 20eda7dc..82ad212d 100644
--- a/tasks/fast-forward-upgrade/overcloud_upgrade_hosts.yaml
+++ b/tasks/fast-forward-upgrade/overcloud_upgrade_hosts.yaml
@@ -11,6 +11,15 @@
   when: ffu_upgrade_workarounds
   tags: ffu_overcloud_system_upgrade
 
+- name: Disable scheduling on {{ host }}
+  when:
+    - compute_present|bool
+  shell: |
+    set -o pipefail
+    source {{ overcloud_rc }}
+    HOST="$(openstack compute service list -f value -c Host | grep {{ host }})"
+    openstack compute service set --disable --disable-reason FFWD "$HOST" nova-compute
+
 - name: run the pre upgrade script for the host {{ host }}
   when:
     - compute_present|bool
@@ -59,6 +68,15 @@
     timeout: 600
 
 ######## overcloud upgrade run ########
+- name: Enable scheduling on {{ host }}
+  when:
+    - compute_present|bool
+  shell: |
+    set -o pipefail
+    source {{ overcloud_rc }}
+    HOST="$(openstack compute service list -f value -c Host | grep {{ host }})"
+    openstack compute service set --enable "$HOST" nova-compute
+
 - name: apply pre ffu overcloud upgrade workarounds in {{ host }}
   shell: |
     set -o pipefail