diff --git a/defaults/main.yml b/defaults/main.yml
index 47a5e53..9f0d4f5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -47,6 +47,7 @@ koji_kojira_principal: koji/kojira@ROCKYLINUX.ORG
 koji_kojira_keytab: /etc/koji.keytab
 
 # Storage
+koji_nfs: true
 koji_mount: /mnt/koji
 koji_nfs_path: nfs.rockylinux.org:/export/koji
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 00363f6..b136e9f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,8 +5,8 @@
 - name: Apply required SELinux booleans
   import_tasks: selinux_boolean.yml
 
-- name: Ensure NFS is mounted
-  import_tasks: nfs.yml
+- name: Ensure Storage is ready
+  import_tasks: storage.yml
 
 - name: Install required packages
   yum:
diff --git a/tasks/nfs.yml b/tasks/storage.yml
similarity index 94%
rename from tasks/nfs.yml
rename to tasks/storage.yml
index ca820ab..f4ed0cc 100644
--- a/tasks/nfs.yml
+++ b/tasks/storage.yml
@@ -1,5 +1,5 @@
 ---
-
+# Storage
 - name: Ensure the koji mountpoint exists
   file:
     path: "{{ koji_mount }}"
@@ -11,6 +11,7 @@
     src: "{{ koji_nfs_path }}"
     fstype: nfs
     state: mounted
+  when: koji_nfs
 
 - name: Create required default directories
   file: