diff --git a/roles/pvc/handlers/main.yml b/roles/pvc/handlers/main.yml
index 63c807c..8de48dc 100644
--- a/roles/pvc/handlers/main.yml
+++ b/roles/pvc/handlers/main.yml
@@ -19,33 +19,22 @@
     name: patroni
     state: restarted
 
-# Restart ceph-mon, but sequentially one-host-at-a-time with a 15s wait in between; this provides
-# plenty of time for the primary state to switch around without putting the cluster in a
-# no-primary state
 - name: restart ceph-mon
-  shell: systemctl restart ceph-mon@{{ play_host }} && sleep 15
-  run_once: true
-  delegate_to: "{{ play_host }}"
-  with_items: "{{ play_hosts }}"
-  loop_control:
-    loop_var: play_host
+  service:
+    name: ceph-mon@{{ ansible_hostname }}
+    state: restarted
 
-# Restart ceph-mgr, but sequentially one-host-at-a-time with a 15s wait in between; this provides
-# plenty of time for the primary state to switch around without putting the cluster in a
-# no-primary state
 - name: restart ceph-mgr
-  shell: systemctl restart ceph-mgr@{{ play_host }} && sleep 15
-  run_once: true
-  delegate_to: "{{ play_host }}"
-  with_items: "{{ play_hosts }}"
-  loop_control:
-    loop_var: play_host
+  service:
+    name: ceph-mgr@{{ ansible_hostname }}
+    state: restarted
 
 # Restart pvcd, but sequentially one-host-at-a-time with a 15s wait in between; this provides
 # plenty of time for the primary state to switch around without putting the cluster in a
 # no-primary state
 - name: restart pvcd
   shell: systemctl restart pvcd && sleep 15
+  ignore_errors: true
   run_once: true
   delegate_to: "{{ play_host }}"
   with_items: "{{ play_hosts }}"