diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml
index eb287d5467..f3e4a857fc 100644
--- a/docker/services/congress.yaml
+++ b/docker/services/congress.yaml
@@ -142,8 +142,18 @@ outputs:
             path: /var/log/containers/congress
             state: directory
       upgrade_tasks:
+        - name: Check if congress is deployed
+          command: systemctl is-enabled --quiet openstack-congress-server
+          tags: common
+          ignore_errors: True
+          register: congress_enabled
+        - name: "PreUpgrade step0,validation: Check service openstack-congress-server is running"
+          command: systemctl is-active --quiet openstack-congress-server
+          when: congress_enabled.rc == 0
+          tags: step0,validation
         - name: Stop and disable congress_api service
           tags: step2
+          when: congress_enabled.rc == 0
           service: name=openstack-congress-server state=stopped enabled=no
         - name: Remove openstack-congress package if operator requests it
           yum: name=openstack-congress state=removed
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index 627a40e8c3..d64491b73f 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -157,6 +157,16 @@ outputs:
             - /var/log/containers/redis
             - /var/run/redis
       upgrade_tasks:
+        - name: Check if redis is  deployed
+          command: systemctl is-enabled --quiet redis
+          tags: common
+          ignore_errors: True
+          register: redis_enabled
+        - name: "PreUpgrade step0,validation: Check if redis is running"
+          command: systemctl is-active --quiet redis
+          when: redis_enabled.rc == 0
+          tags: step0,validation
         - name: Stop and disable redis service
           tags: step2
+          when: redis_enabled.rc == 0
           service: name=redis state=stopped enabled=no
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml
index 48f1da4bda..9f33b0f51c 100644
--- a/docker/services/ec2-api.yaml
+++ b/docker/services/ec2-api.yaml
@@ -162,9 +162,29 @@ outputs:
             - ec2_api
             - ec2_api_metadata
       upgrade_tasks:
-        - name: Stop and disable EC2-API services
+        - name: Check if EC2-API is deployed
+          command: systemctl is-enabled --quiet openstack-ec2-api
+          tags: common
+          ignore_errors: True
+          register: ec2_api_enabled
+        - name: Check if EC2-API-METADATA are deployed
+          command: systemctl is-enabled --quiet openstack-ec2-api-metadata
+          tags: common
+          ignore_errors: True
+          register: ec2_api_metadata_enabled
+        - name: "PreUpgrade step0,validation: Check if openstack-ec2-api is running"
+          command: systemctl is-active --quiet openstack-ec2-api
+          when: ec2_api_enabled.rc == 0
+          tags: step0,validation
+        - name: "PreUpgrade step0,validation: Check if openstack-ec2-metadata-api is running"
+          command: systemctl is-active --quiet openstack-ec2-api-metadata
+          when: ec2_api_metadata_enabled.rc == 0
+          tags: step0,validation
+        - name: Stop and disable EC2-API service
           tags: step2
-          service: name={{ item }} state=stopped enabled=no
-          with_items:
-            - openstack-ec2-api
-            - openstack-ec2-api-metadata
+          when: ec2_api_enabled.rc == 0
+          service: name=openstack-ec2-api state=stopped enabled=no
+        - name: Stop and disable EC2-API-METADATA service
+          tags: step2
+          when: ec2_api_metadata_enabled.rc == 0
+          service: name=openstack-ec2-api-metadata state=stopped enabled=no
diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml
index 019b8c1bd2..00c9fb368e 100644
--- a/docker/services/etcd.yaml
+++ b/docker/services/etcd.yaml
@@ -115,6 +115,16 @@ outputs:
             path: /var/lib/etcd
             state: directory
       upgrade_tasks:
+        - name: Check if etcd is deployed
+          command: systemctl is-enabled --quiet etcd
+          tags: common
+          ignore_errors: True
+          register: etcd_enabled
+        - name: "PreUpgrade step0,validation: Check if etcd is running"
+          command: systemctl is-active --quiet etcd
+          when: etcd_enabled.rc == 0
+          tags: step0,validation
         - name: Stop and disable etcd service
           tags: step2
+          when: etcd_enabled.rc == 0
           service: name=etcd state=stopped enabled=no
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index ff8bd20623..bf15e51bab 100644
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -221,8 +221,18 @@ outputs:
               path: /etc/ceph
               state: directory
       upgrade_tasks:
+        - name: Check if glance_api is deployed
+          command: systemctl is-enabled --quiet openstack-glance-api
+          tags: common
+          ignore_errors: True
+          register: glance_api_enabled
+        - name: "PreUpgrade step0,validation: Check service openstack-glance-api is running"
+          command: systemctl is-active --quiet openstack-glance-api
+          tags: step0,validation
+          when: glance_api_enabled.rc == 0
         - name: Stop and disable glance_api service
           tags: step2
+          when: glance_api_enabled.rc == 0
           service: name=openstack-glance-api state=stopped enabled=no
         - name: Remove openstack-glance package if operator requests it
           yum: name=openstack-glance state=removed