diff --git a/tasks/koji/base_builder.yml b/tasks/koji/base_builder.yml
index 84ddd9a26b..9e4a1809e8 100644
--- a/tasks/koji/base_builder.yml
+++ b/tasks/koji/base_builder.yml
@@ -62,7 +62,7 @@
   action: file state=directory path=$item
   with_items:
     - /pub
-    - /mnt/koji
+    - /mnt/fedora_koji
     - /pub/fedora
     - /pub/epel
     - /var/spool/rsyslog
@@ -124,8 +124,6 @@
 - name: copy over authorized keys for root
   action: copy src=$files/kojibuilder/root_auth_keys dest=/root/.ssh/authorized_keys mode=644
 
-
-
 # idmapd and make sure it's set to run
 - name: idmapd.conf
   action: copy src=$files/kojibuilder/idmapd.conf dest=/etc/idmapd.conf
@@ -140,7 +138,11 @@
   - nfslock
 
 - name: nfs mount points
-  action: mount name=/mnt/koji src=nfs01.phx2.fedoraproject.org:/ fstype=nfs4 opts=ro,hard,bg,intr,noatime,nodev,nosuid passno=0 dump=0 state=mounted
+  action: mount name=/mnt/fedora_koji src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_koji fstype=nfs3 opts=ro,hard,bg,intr,noatime,nodev,nosuid passno=0 dump=0 state=mounted
+  only_if: "'${inventory_hostname}'.startswith('build')"
+
+- name: make a mnt/koji link
+  action: file state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
   only_if: "'${inventory_hostname}'.startswith('build')"
 
 # mock configs for pungify job
diff --git a/tasks/koji/bkernel-setup.yml b/tasks/koji/bkernel-setup.yml
index 29ce0e7681..0c7b2cc8b8 100644
--- a/tasks/koji/bkernel-setup.yml
+++ b/tasks/koji/bkernel-setup.yml
@@ -30,9 +30,6 @@
 - name: put hw reinstall onto bkernel boxes since they are raw hw
   action: copy src=$files/common-scriptshardware-reinstall dest=/usr/local/bin/hardware-reinstall mode=0750 owner=root group=root
 
-- name: no nfs mounts on bkernel boxes
-  action: mount name=/mnt/koji src=nfs01.phx2.fedoraproject.org:/ fstype=nfs4 state=absent
-
 - name: make sure our bkernel boxes have static ip
   action: template src=$files/kojibuilder/builders/bkernel-eth0-network dest=/etc/sysconfig/network-scripts/ifcfg-eth0 
 
diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml
index 0249d940a8..fa7d4d6fd1 100644
--- a/tasks/koji/releng_config.yml
+++ b/tasks/koji/releng_config.yml
@@ -153,9 +153,11 @@
 - name: nfsmount - /pub/fedora
   action: mount name=/pub/fedora src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_ftp/fedora.redhat.com/pub/fedora fstype=nfs opts=rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3 passno=0 dump=0 state=mounted
 
-- name: nfs mount - /mnt/koji
-  action: mount name=/mnt/koji src=nfs01.phx2.fedoraproject.org:/ fstype=nfs4 opts=rw,soft,intr passno=0 dump=0 state=mounted
+- name: nfs mount points
+  action: mount name=/mnt/fedora_koji src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_koji fstype=nfs3 opts=ro,hard,bg,intr,noatime,nodev,nosuid passno=0 dump=0 state=mounted
 
+- name: make a mnt/koji link
+  action: file state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
 
 # put cron job in for branched compose
 - name: branched compose cron