diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 4532d4998..b9feaac7a 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -851,12 +851,18 @@
   become: True
   gather_facts: false
   tasks:
+    - name: check for ceph rbd mirror services
+      command: systemctl show --no-pager --property=Id --state=enabled ceph-rbd-mirror@*  # noqa 303
+      changed_when: false
+      register: rbdmirror_services
+
     - name: stop ceph rbd mirror
-      systemd:
-        name: "ceph-rbd-mirror@rbd-mirror.{{ ansible_facts['hostname'] }}"
+      service:
+        name: "{{ item.split('=')[1] }}"
         state: stopped
         enabled: no
         masked: yes
+      loop: "{{ rbdmirror_services.stdout_lines }}"
 
     - import_role:
         name: ceph-defaults