diff --git a/ansible/roles/ceph/tasks/start_mons.yml b/ansible/roles/ceph/tasks/start_mons.yml
index e555d8d5df..1bb2484a1c 100644
--- a/ansible/roles/ceph/tasks/start_mons.yml
+++ b/ansible/roles/ceph/tasks/start_mons.yml
@@ -12,4 +12,3 @@
       - "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro"
       - "ceph_mon:/var/lib/ceph"
       - "ceph_mon_config:/etc/ceph"
-  when: inventory_hostname in groups['ceph-mon']
diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml
index 1324fd80e7..1a59cbcd62 100644
--- a/ansible/roles/ceph/tasks/start_osds.yml
+++ b/ansible/roles/ceph/tasks/start_osds.yml
@@ -45,6 +45,4 @@
   with_together:
     - id.results
     - osds
-  when:
-    - inventory_hostname in groups['ceph-osd']
-    - osds
+  when: osds
diff --git a/ansible/roles/ceph/tasks/start_rgws.yml b/ansible/roles/ceph/tasks/start_rgws.yml
index 4de1e8afdc..f8f963225a 100644
--- a/ansible/roles/ceph/tasks/start_rgws.yml
+++ b/ansible/roles/ceph/tasks/start_rgws.yml
@@ -6,4 +6,3 @@
     image: "{{ ceph_rgw_image_full }}"
     name: "ceph_rgw"
     volumes: "{{ node_config_directory }}/ceph-rgw/:{{ container_config_directory }}/:ro"
-  when: inventory_hostname in groups['ceph-rgw']
diff --git a/ansible/roles/ceph/tasks/upgrade.yml b/ansible/roles/ceph/tasks/upgrade.yml
index ed97d539c0..db8bf0730f 100644
--- a/ansible/roles/ceph/tasks/upgrade.yml
+++ b/ansible/roles/ceph/tasks/upgrade.yml
@@ -1 +1,16 @@
 ---
+- include: config.yml
+
+- include: start_mons.yml
+  serial: "1"
+  when: inventory_hostname in groups['ceph-mon']
+
+- include: start_osds.yml
+  serial: "1"
+  when: inventory_hostname in groups['ceph-osd']
+
+- include: start_rgws.yml
+  serial: "30%"
+  when:
+    - inventory_hostname in groups['ceph-rgw']
+    - enable_ceph_rgw | bool