diff --git a/roles/ceph-rgw/tasks/start_radosgw.yml b/roles/ceph-rgw/tasks/start_radosgw.yml
index 72b402fa6..c0689ff3b 100644
--- a/roles/ceph-rgw/tasks/start_radosgw.yml
+++ b/roles/ceph-rgw/tasks/start_radosgw.yml
@@ -25,7 +25,7 @@
     enabled: yes
   when:
     ansible_os_family == 'RedHat' and
-    not is_ceph_infernalis
+    is_before_infernalis
 
 - name: enable systemd unit file for rgw instance (for or after infernalis)
   file:
@@ -36,7 +36,7 @@
   failed_when: false
   when:
     ansible_distribution != "Ubuntu" and
-    is_ceph_infernalis
+    is_after_hammer
 
 - name: start rgw on red hat (after infernalis)
   service:
@@ -45,4 +45,4 @@
     enabled: yes
   when:
     ansible_os_family == 'RedHat' and
-    is_ceph_infernalis
+    is_after_hammer