diff --git a/infrastructure-playbooks/docker-to-podman.yml b/infrastructure-playbooks/docker-to-podman.yml
index 9ebb45707..e0c422a0c 100644
--- a/infrastructure-playbooks/docker-to-podman.yml
+++ b/infrastructure-playbooks/docker-to-podman.yml
@@ -65,6 +65,11 @@
   gather_facts: false
   become: true
   tasks:
+    - name: set_fact docker2podman and container_binary
+      set_fact:
+        docker2podman: True
+        container_binary: podman
+
     - import_role:
         name: ceph-defaults
     - import_role:
@@ -72,11 +77,6 @@
     - import_role:
         name: ceph-handler
 
-    - name: set_fact docker2podman and container_binary
-      set_fact:
-        docker2podman: True
-        container_binary: podman
-
     - name: install podman
       package:
         name: podman
diff --git a/roles/ceph-facts/tasks/container_binary.yml b/roles/ceph-facts/tasks/container_binary.yml
index 44249419f..0054f7848 100644
--- a/roles/ceph-facts/tasks/container_binary.yml
+++ b/roles/ceph-facts/tasks/container_binary.yml
@@ -6,4 +6,5 @@
 
 - name: set_fact container_binary
   set_fact:
-    container_binary: "{{ 'podman' if (podman_binary.stat.exists and ansible_facts['distribution'] == 'Fedora') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') else 'docker' }}"
\ No newline at end of file
+    container_binary: "{{ 'podman' if (podman_binary.stat.exists and ansible_facts['distribution'] == 'Fedora') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') else 'docker' }}"
+  when: not docker2podman | default(false) | bool
\ No newline at end of file
diff --git a/roles/ceph-handler/tasks/main.yml b/roles/ceph-handler/tasks/main.yml
index 099ad3b30..a8c76f519 100644
--- a/roles/ceph-handler/tasks/main.yml
+++ b/roles/ceph-handler/tasks/main.yml
@@ -51,6 +51,7 @@
 
 - name: rgw multi-instances related tasks
   when:
+    - not docker2podman | default(false) | bool
     - inventory_hostname in groups.get(rgw_group_name, [])
     - handler_rgw_status | bool
   block: