diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index f01b29372..d10544cf8 100644
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -37,8 +37,8 @@
   become: True
   gather_facts: false
   roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - ceph-defaults
+    - ceph-docker-common
     - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
     - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
 
diff --git a/site.yml.sample b/site.yml.sample
index 2e46bbacb..286701a10 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -65,8 +65,8 @@
   gather_facts: false
   become: True
   roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - ceph-defaults
+    - ceph-common
     - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
     - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
 
@@ -146,8 +146,8 @@
   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" }
+    - ceph-defaults
+    - ceph-common
     - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
     - { role: ceph-iscsi-gw, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }