diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index 5a2336986..a11eee051 100644
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -340,7 +340,7 @@
             start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
   roles:
     - { role: ceph-defaults, tags: ['ceph_update_config'] }
-    - ceph-docker-common
+    - { role: ceph-docker-common, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
     - { role: ceph-config, tags: ['ceph_update_config'], when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
     - { role: ceph-iscsi-gw, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
   post_tasks:
diff --git a/site.yml.sample b/site.yml.sample
index a8a4912c6..fd4929724 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -369,6 +369,8 @@
     - role: ceph-defaults
       tags: ['ceph_update_config']
     - role: ceph-common
+      when:
+        - ceph_release_num[ceph_release] >= ceph_release_num.luminous
     - role: ceph-config
       tags: ['ceph_update_config']
       when: