diff --git a/roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml b/roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
index 0269bf57e..6c3d11c62 100644
--- a/roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
+++ b/roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
@@ -24,17 +24,12 @@
     enabled: no
   changed_when: false
 
-# This task is a workaround for rbd-mirror not starting after reboot
-# The upstream fix is: https://github.com/ceph/ceph/pull/17969
-# It's affecting, ceph version 12.2.0 (32ce2a3ae5239ee33d6150705cdb24d43bab910c) luminous (rc) and before
 - name: enable ceph-rbd-mirror.target
   systemd:
     name: "ceph-rbd-mirror.target"
     state: started
     enabled: yes
   changed_when: false
-  when:
-    - ceph_release_num[ceph_release] == ceph_release_num.luminous
 
 - name: start and add the rbd-mirror service instance
   service: