diff --git a/docker/services/tripleo-ui.yaml b/docker/services/tripleo-ui.yaml
index 4645a3e8fb..6f5a0f3c46 100644
--- a/docker/services/tripleo-ui.yaml
+++ b/docker/services/tripleo-ui.yaml
@@ -139,9 +139,14 @@ outputs:
         - name: "PreUpgrade step0,validation: Check if tripleo-ui is running"
           shell: systemctl status 'httpd' | grep -q tripleo-ui
           tags: validation
-          when: httpd_enabled.rc == 0 and httpd_running.rc == 0
+          when:
+            - httpd_enabled.rc == 0
+            - httpd_running.rc == 0
         - name: Stop and disable tripleo-ui service (running under httpd)
-          when: httpd_enabled.rc == 0 and httpd_running.rc == 0 and step|int == 2
+          when:
+            - step|int == 2
+            - httpd_enabled.rc == 0
+            - httpd_running.rc == 0
           service: name=httpd state=stopped enabled=no
         - name: Remove openstack-tripleo-ui package if operator requests it
           yum: name=openstack-tripleo-ui state=removed