diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index 3986661a3..5feee3c49 100644
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -8,6 +8,7 @@
   always_run: true
   when:
     - cephx
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
 
 # NOTE (leseb): wait for mon discovery and quorum resolution
 # the admin key is not instantaneously created so we have to wait a bit
diff --git a/roles/ceph-mon/tasks/create_mds_filesystems.yml b/roles/ceph-mon/tasks/create_mds_filesystems.yml
index 27941f252..d9a89ca77 100644
--- a/roles/ceph-mon/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mon/tasks/create_mds_filesystems.yml
@@ -18,11 +18,13 @@
   command: ceph --cluster {{ cluster }} fs set {{ cephfs }} allow_multimds true --yes-i-really-mean-it
   changed_when: false
   when:
+  - ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel
   - mds_allow_multimds
 
 - name: set max_mds
   command: ceph --cluster {{ cluster }} fs set {{ cephfs }} max_mds {{ mds_max_mds }}
   changed_when: false
   when:
+  - ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel
   - mds_allow_multimds
   - mds_max_mds > 1
diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml
index 59cbf0851..a89f84167 100644
--- a/roles/ceph-rgw/tasks/main.yml
+++ b/roles/ceph-rgw/tasks/main.yml
@@ -21,6 +21,7 @@
   when:
     - rgw_zone is defined
     - rgw_multisite
+    - ( ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel )
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False