diff --git a/playbooks/ceph.yml b/playbooks/ceph.yml
index 58ba618..6fb2c9c 100644
--- a/playbooks/ceph.yml
+++ b/playbooks/ceph.yml
@@ -16,17 +16,21 @@
   hosts: controllers:cephs
   become: true
   roles:
-    - ceph_repository
+    - role: ceph_repository
+      when: atmosphere_ceph_enabled | default(true)
 
 - name: Deploy Ceph monitors & managers
   hosts: controllers
   become: true
   roles:
-    - ceph_mon
-    - ceph_mgr
+    - role: ceph_mon
+      when: atmosphere_ceph_enabled | default(true)
+    - role: ceph_mgr
+      when: atmosphere_ceph_enabled | default(true)
 
 - name: Deploy Ceph OSDs
   hosts: cephs
   become: true
   roles:
-    - ceph_osd
+    - role: ceph_osd
+      when: atmosphere_ceph_enabled | default(true)