diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index d61d98aede..08411fd251 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -109,6 +109,11 @@
   tags:
   - koji_builder
 
+- name: build /etc/koji/koji.conf from group vars
+  template: src=koji.conf dest=/etc/koji.conf
+  tags:
+  - koji_builder
+
 - name: config for the kojid runroot plugin (only in staging)
   copy: src=runroot.conf dest=/etc/kojid/runroot.conf
   when: 'staging' in group_names
@@ -117,18 +122,6 @@
   tags:
   - koji_builder
 
-- name: /etc/koji/koji.conf
-  copy: src=koji.conf dest=/etc/koji.conf
-  when: not inventory_hostname.startswith(('arm01','arm03','aarch64','ppc8'))
-  tags:
-  - koji_builder
-
-- name: /etc/koji/koji.conf
-  copy: src=arm-koji.conf dest=/etc/koji.conf
-  when: inventory_hostname.startswith(('arm01','arm03','aarch64'))
-  tags:
-  - koji_builder
-
 - name: /etc/koji/koji.conf
   copy: src=ppc-koji.conf dest=/etc/koji.conf
   when: inventory_hostname.startswith(('ppc8'))