diff --git a/templates/overcloud_online_data_migration.sh.j2 b/templates/overcloud_online_data_migration.sh.j2
index a39125de..692fd456 100644
--- a/templates/overcloud_online_data_migration.sh.j2
+++ b/templates/overcloud_online_data_migration.sh.j2
@@ -2,9 +2,9 @@
 #
 # Run online data migration for OpenStack services
 #
-{% if overcloud_update|bool -%}
+{% if overcloud_update|bool or update_noop|bool -%}
 {% set operation_type = 'update' -%}
-{% elif overcloud_upgrade|bool -%}
+{% elif overcloud_upgrade|bool or upgrade_noop|bool -%}
 {% set operation_type = 'upgrade' -%}
 {% endif -%}
 set -euo pipefail
diff --git a/templates/overcloud_prepare_containers.sh.j2 b/templates/overcloud_prepare_containers.sh.j2
index 559c8475..edb3d8d2 100644
--- a/templates/overcloud_prepare_containers.sh.j2
+++ b/templates/overcloud_prepare_containers.sh.j2
@@ -2,9 +2,9 @@
 #
 # Prepare conatainer images for overcloud update/upgrade
 #
-{% if overcloud_update|bool -%}
+{% if overcloud_update|bool or update_noop|bool -%}
 {% set operation_type = 'update' -%}
-{% elif overcloud_upgrade|bool -%}
+{% elif overcloud_upgrade|bool or upgrade_noop|bool -%}
 {% set operation_type = 'upgrade' -%}
 {% endif -%}
 set -euo pipefail