diff --git a/ceph/setup/init.sls b/ceph/setup/init.sls
index 4004937..07d3bcf 100644
--- a/ceph/setup/init.sls
+++ b/ceph/setup/init.sls
@@ -3,7 +3,7 @@
 
 include:
 - ceph.common
-{%- if setup.get('crush', {}).enabled %}
+{%- if setup.get('crush') %}
 - ceph.setup.crush
 {%- endif %}
 {%- if setup.get('pool') %}
@@ -12,3 +12,5 @@
 {%- if common.get('keyring') %}
 - ceph.setup.keyring
 {%- endif %}
+
+{%- endif %}
diff --git a/ceph/setup/keyring.sls b/ceph/setup/keyring.sls
index 0a5b4c0..702200c 100644
--- a/ceph/setup/keyring.sls
+++ b/ceph/setup/keyring.sls
@@ -8,5 +8,3 @@
   - unless: ceph auth list | grep {{ keyring_name }}
 
 {%- endfor %}
-
-{%- endif %}