diff --git a/ansible/roles/ceph/tasks/deploy.yml b/ansible/roles/ceph/tasks/deploy.yml
index 937c064ad4..39dc253203 100644
--- a/ansible/roles/ceph/tasks/deploy.yml
+++ b/ansible/roles/ceph/tasks/deploy.yml
@@ -13,7 +13,9 @@
   when: inventory_hostname in groups['ceph-mgr']
 
 - include: start_nfss.yml
-  when: inventory_hostname in groups['ceph-nfs']
+  when:
+    - enable_ceph_nfs | bool
+    - inventory_hostname in groups['ceph-nfs']
 
 - include: bootstrap_osds.yml
   when: inventory_hostname in groups['ceph-osd']
diff --git a/ansible/roles/ceph/tasks/pull.yml b/ansible/roles/ceph/tasks/pull.yml
index bf59e2c883..017909cc5e 100644
--- a/ansible/roles/ceph/tasks/pull.yml
+++ b/ansible/roles/ceph/tasks/pull.yml
@@ -43,4 +43,5 @@
     common_options: "{{ docker_common_options }}"
     image: "{{ ceph_nfs_image_full }}"
   when:
+    - enable_ceph_nfs | bool
     - inventory_hostname in groups['ceph-nfs']