diff --git a/tasks/main.yml b/tasks/main.yml
index 4fff5fd..23df3cf 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,8 +10,5 @@
 - name: Create the users for kojid
   import_tasks: users.yml
 
-- name: Ensure Storage is ready
-  import_tasks: storage.yml
-
 - name: Configure kojid
   import_tasks: config.yml
diff --git a/tasks/storage.yml b/tasks/storage.yml
index 52c38a1..014711c 100644
--- a/tasks/storage.yml
+++ b/tasks/storage.yml
@@ -14,4 +14,4 @@
     src: "{{ kojid_nfs_path }}"
     fstype: nfs
     state: mounted
-  when: koji_nfs
+  when: kojid_nfs|bool
diff --git a/tasks/users.yml b/tasks/users.yml
index 9e86293..cb4a259 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -36,7 +36,7 @@
   authorized_key:
     user: mockbuilder
     key: "{{ mockbuilder_pub_key }}"
-  when: mockbuilder_pub_key
+  when: mockbuilder_pub_key is defined
 
 - name: kojibuilder user
   user:
@@ -47,7 +47,7 @@
   authorized_key:
     user: kojibuilder
     key: "{{ kojibuilder_pub_key }}"
-  when: kojibuilder_pub_key
+  when: kojibuilder_pub_key is defined
 
 # We need the apache user for NFS
 - name: apache group