diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index adee1e971..1415bad11 100644
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -128,7 +128,7 @@
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph")
 
   - set_fact:
       ceph_uid: 167
@@ -206,7 +206,7 @@
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph")
 
   - set_fact:
       ceph_uid: 167
@@ -289,7 +289,7 @@
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph")
 
   - set_fact:
       ceph_uid: 167
@@ -340,7 +340,7 @@
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph")
 
   - set_fact:
       ceph_uid: 167
@@ -392,7 +392,7 @@
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph")
 
   - set_fact:
       ceph_uid: 167
@@ -442,7 +442,7 @@
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph")
 
   - set_fact:
       ceph_uid: 167