diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index a4126f53bf..5ab2ca7007 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -42,12 +42,12 @@
     service: HTTP
     owner_user: apache
     host: "koji{{env_suffix}}.fedoraproject.org"
-  - { role: nfs/server, when: env == "staging" }
+  - { role: nfs/server, when: env == "staging" or datacenter == 'iad2' }
   - { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') and datacenter == 'phx2' }
   - role: nfs/client
     mnt_dir: '/mnt/fedora_koji'
     nfs_src_dir: 'fedora_koji'
-    when: env == 'production' and inventory_hostname.startswith('koji')
+    when: env == 'production' and inventory_hostname.startswith('koji') and datacenter == 'phx2'
   - role: nfs/client
     mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive00'
     nfs_src_dir: 'fedora_koji_archive00'
@@ -88,7 +88,7 @@
   - role: nfs/client
     mnt_dir: '/mnt/fedora_koji_prod'
     nfs_src_dir: 'fedora_koji'
-    when: env == 'staging' and inventory_hostname.startswith('koji')
+    when: env == 'staging' or datacenter == 'iad2' and inventory_hostname.startswith('koji')
   - role: nfs/client
     mnt_dir: '/mnt/koji/ostree'
     nfs_src_dir: 'fedora-ostree-content/ostree'
diff --git a/roles/nfs/server/files/koji01.iad2.fedoraproject.org-exports b/roles/nfs/server/files/koji01.iad2.fedoraproject.org-exports
new file mode 100644
index 0000000000..489abb8c76
--- /dev/null
+++ b/roles/nfs/server/files/koji01.iad2.fedoraproject.org-exports
@@ -0,0 +1 @@
+/mnt/fedora_koji 10.3.169.0/24(rw,no_root_squash)