diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index e7fef8b8f4..c0e0f040a6 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -168,13 +168,6 @@
   tags:
   - koji_builder
 
-# idmapd and make sure it's set to run
-- name: idmapd.conf
-  copy: src=idmapd.conf dest=/etc/idmapd.conf
-  tags:
-  - configs
-  - koji_builder
-
 # oz.cfg  upstream ram and cpu definitions are not enough
 - name: oz.cfg
   copy: src=oz.cfg dest=/etc/oz/oz.cfg
diff --git a/roles/koji_builder/files/idmapd.conf b/roles/nfs/client/files/idmapd.conf
similarity index 100%
rename from roles/koji_builder/files/idmapd.conf
rename to roles/nfs/client/files/idmapd.conf
diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml
index e1a6ee782c..f08ac4371c 100644
--- a/roles/nfs/client/tasks/main.yml
+++ b/roles/nfs/client/tasks/main.yml
@@ -1,3 +1,10 @@
+# Setup our idmapd.conf file. It should be loaded automagically.
+- name: idmapd.conf
+  copy: src=idmapd.conf dest=/etc/idmapd.conf
+  tags:
+  - configs
+  - koji_builder
+
 - name: route config for netapp network
   copy: src=route-eth1.{{ datacenter }} dest=/etc/sysconfig/network-scripts/route-eth1
   when: datacenter == 'phx2' or datacenter == 'rdu2'