diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index 6e3bcedf5..6f3aef102 100644
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -39,8 +39,8 @@
   roles:
     - ceph-defaults
     - ceph-docker-common
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
-    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
+    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
 
 - hosts: osds
   become: True
@@ -73,10 +73,10 @@
   become: True
   gather_facts: false
   roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
+    - ceph-defaults
+    - ceph-docker-common
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
+    - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
 
 - hosts: rbdmirrors
   become: True
diff --git a/site.yml.sample b/site.yml.sample
index 4ae0cc54f..be79b4800 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -67,8 +67,8 @@
   roles:
     - ceph-defaults
     - ceph-common
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
-    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
+    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
 
 - hosts: agents
   gather_facts: false
@@ -110,10 +110,10 @@
   gather_facts: false
   become: True
   roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
+    - ceph-defaults
+    - ceph-common
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
+    - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
 
 - hosts: restapis
   gather_facts: false