diff --git a/scripts/oooq_common_functions.sh b/scripts/oooq_common_functions.sh
index 85746a015..2d91ad626 100644
--- a/scripts/oooq_common_functions.sh
+++ b/scripts/oooq_common_functions.sh
@@ -32,6 +32,12 @@ function is_featureset_mixed_upgrade {
     [ $(shyaml get-value mixed_upgrade "False"< $FEATURESET_FILE) = "True" ]
 }
 
+function is_featureset_overcloud_update {
+    local FEATURESET_FILE="$1"
+
+    [ $(shyaml get-value overcloud_update "False"< $FEATURESET_FILE) = "True" ]
+}
+
 function run_with_timeout {
     # First parameter is the START_JOB_TIME
     # Second is the command to be executed
diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh
index d95d243e0..07b4adf36 100755
--- a/toci_gate_test-oooq.sh
+++ b/toci_gate_test-oooq.sh
@@ -135,6 +135,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
                 # Run overcloud-upgrade tag only in upgrades jobs
                 TAGS="$TAGS,overcloud-upgrade"
             fi
+            if is_featureset_overcloud_update "$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$JOB_TYPE_PART.yml"; then
+                TAGS="$TAGS,overcloud-update"
+            fi
         ;;
         ovb)
             OVB=1