diff --git a/docker/services/ceph-ansible/ceph-osd.yaml b/docker/services/ceph-ansible/ceph-osd.yaml
index 0fa77c17cd..bc32056534 100644
--- a/docker/services/ceph-ansible/ceph-osd.yaml
+++ b/docker/services/ceph-ansible/ceph-osd.yaml
@@ -57,7 +57,8 @@ outputs:
       service_name: ceph_osd
       upgrade_tasks:
         - name: Check legacy Ceph hieradata
-          tags: step0,validation
+          tags: validation
+          when: step|int == 0
           shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)"
       puppet_config:
         config_image: ''
diff --git a/docker/services/ironic-inspector.yaml b/docker/services/ironic-inspector.yaml
index a3870e997e..fee27ecab1 100644
--- a/docker/services/ironic-inspector.yaml
+++ b/docker/services/ironic-inspector.yaml
@@ -171,7 +171,7 @@ outputs:
               /var/log/containers/ironic-inspector.
           ignore_errors: true
       upgrade_tasks:
-        - when: step|int ==2
+        - when: step|int == 2
           block:
             - name: Stop and disable ironic_inspector service
               service: name=openstack-ironic-inspector state=stopped enabled=no
diff --git a/docker/services/ovn-metadata.yaml b/docker/services/ovn-metadata.yaml
index 34699a10b6..b1f57c48a3 100644
--- a/docker/services/ovn-metadata.yaml
+++ b/docker/services/ovn-metadata.yaml
@@ -146,9 +146,8 @@ outputs:
           register: networking_ovn_metadata_agent_enabled
         - name: "PreUpgrade step0,validation: Check service networking-ovn-metadata-agent is running"
           command: systemctl is-active --quiet networking-ovn-metadata-agent
-          when: networking_ovn_metadata_agent_enabled.rc == 0
-          tags: step0,validation
+          when: (networking_ovn_metadata_agent_enabled.rc == 0) and (step|int == 0)
+          tags: validation
         - name: Stop and disable networking_ovn_metadata service
-          tags: step2
-          when: networking_ovn_metadata_agent_enabled.rc == 0
+          when: (networking_ovn_metadata_agent_enabled.rc == 0) and (step|int == 2)
           service: name=networking-ovn-metadata-agent state=stopped enabled=no
diff --git a/puppet/services/docker-registry.yaml b/puppet/services/docker-registry.yaml
index 0b7d74b623..fbd5521192 100644
--- a/puppet/services/docker-registry.yaml
+++ b/puppet/services/docker-registry.yaml
@@ -45,5 +45,5 @@ outputs:
         include ::tripleo::profile::base::docker_registry
       upgrade_tasks:
         - name: Install docker packages on upgrade if missing
-          tags: step3
+          when: step|int == 3
           yum: name=docker-distribution state=latest
diff --git a/puppet/services/ovn-metadata.yaml b/puppet/services/ovn-metadata.yaml
index abfe99a452..2f74c137cd 100644
--- a/puppet/services/ovn-metadata.yaml
+++ b/puppet/services/ovn-metadata.yaml
@@ -115,9 +115,8 @@ outputs:
           register: networking_ovn_metadata_agent_enabled
         - name: "PreUpgrade step0,validation: Check service networking-ovn-metadata-agent is running"
           shell: /usr/bin/systemctl show 'networking-ovn-metadata-agent' --property ActiveState | grep '\bactive\b'
-          when: networking_ovn_metadata_agent_enabled.rc == 0
-          tags: step0,validation
+          when: (networking_ovn_metadata_agent_enabled.rc == 0) and (step|int == 0)
+          tags: validation
         - name: Stop networking_ovn_metadata service
-          tags: step1
-          when: neutron_metadata_agent_enabled.rc == 0
+          when: (neutron_metadata_agent_enabled.rc == 0) and (step|int == 1)
           service: name=networking-ovn-metadata-agent state=stopped