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 8f931ddb7..b0c49d84c 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
@@ -51,6 +51,7 @@
     health_mon_check_retries: 5
     health_mon_check_delay: 15
     containerized_deployment: true
+    switch_to_containers: True
     mon_group_name:       mons
   hosts:
     - "{{ mon_group_name|default('mons') }}"
diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index 5c95026d6..ac158a084 100644
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -10,12 +10,15 @@
   when:
     # we test for both container and non-container
     - (mon_socket_stat is defined and mon_socket_stat.get('rc') != 0) or (ceph_mon_container_stat is defined and ceph_mon_container_stat.get('stdout_lines', [])|length == 0)
+    - not switch_to_containers | default(False)
 
 - name: include start_monitor.yml
   include_tasks: start_monitor.yml
 
 - name: include_tasks ceph_keys.yml
   include_tasks: ceph_keys.yml
+  when:
+    - not switch_to_containers | default(False)
 
 - name: include secure_cluster.yml
   include_tasks: secure_cluster.yml