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 bffc4a5a2..5541a5ac4 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
@@ -197,6 +197,7 @@
   vars:
     containerized_deployment: true
     osd_group_name: osds
+    switch_to_containers: True
 
   hosts: "{{ osd_group_name|default('osds') }}"
 
diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index d22ba4a95..7a9f80520 100644
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -43,7 +43,9 @@
   delegate_to: "{{ groups[mon_group_name][0] }}"
   run_once: True
   changed_when: False
-  when: not rolling_update | default(False) | bool
+  when:
+    - not rolling_update | default(False) | bool
+    - not switch_to_containers | default(False) | bool
 
 - name: include container_options_facts.yml
   include_tasks: container_options_facts.yml
@@ -70,6 +72,7 @@
   changed_when: False
   when:
     - not rolling_update | default(False) | bool
+    - not switch_to_containers | default(False) | bool
     - inventory_hostname == ansible_play_hosts_all | last
 
 - name: wait for all osd to be up