diff --git a/extraconfig/tasks/tripleo_upgrade_node.sh b/extraconfig/tasks/tripleo_upgrade_node.sh
index af49d49de8..baf838e419 100644
--- a/extraconfig/tasks/tripleo_upgrade_node.sh
+++ b/extraconfig/tasks/tripleo_upgrade_node.sh
@@ -55,6 +55,9 @@ if [[ -n \$NOVA_COMPUTE ]]; then
     log_debug "Stop and disable libvirtd service for upgrade to containers"
     systemctl stop libvirtd
     systemctl disable libvirtd
+    log_debug "Stop and disable openstack-nova-compute for upgrade to containers"
+    systemctl stop openstack-nova-compute
+    systemctl disable openstack-nova-compute
 fi
 
 # Apply puppet manifest to converge just right after the ${ROLE} upgrade