diff --git a/inventory/group_vars/releng-secondary b/inventory/group_vars/releng-secondary
index 5c9ebb4da2..ec8654e51d 100644
--- a/inventory/group_vars/releng-secondary
+++ b/inventory/group_vars/releng-secondary
@@ -11,3 +11,22 @@ nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
 
 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3,rsize=32768,wsize=32768"
+
+fas_client_groups: sysadmin-noc,sysadmin-releng
+sudoers: "{{ private }}/files/sudo/00releng-sudoers"
+
+host_group: releng
+
+fedmsg_certs:
+- service: releng
+  owner: root
+  group: sysadmin-releng
+  can_send:
+  # pungi-koji stuff (ask dgilmore)
+  - pungi.compose.phase.start
+  - pungi.compose.phase.stop
+  - pungi.compose.status.change
+  - pungi.compose.createiso.targets
+  - pungi.compose.createiso.imagefail
+  - pungi.compose.createiso.imagedone
+
diff --git a/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org b/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org
index 356bcaddf0..55454cf5a8 100644
--- a/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org
+++ b/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org
@@ -1,4 +1,3 @@
-fas_client_groups: sysadmin-noc,sysadmin-releng
 eth0_ip: 10.5.78.70
 gw: 10.5.78.254
 
@@ -9,19 +8,3 @@ kojihub_scheme: https
 koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
 koji_weburl: "http://arm.koji.fedoraproject.org/koji"
 koji_topurl: "http://armpkgs.fedoraproject.org/"
-
-nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3,rsize=32768,wsize=32768
-
-fedmsg_certs:
-- service: releng
-  owner: root
-  group: sysadmin-releng
-  can_send:
-  # pungi-koji stuff (ask dgilmore)
-  - pungi.compose.phase.start
-  - pungi.compose.phase.stop
-  - pungi.compose.status.change
-  - pungi.compose.createiso.targets
-  - pungi.compose.createiso.imagefail
-  - pungi.compose.createiso.imagedone
-
diff --git a/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org b/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org
index f52aa37be5..e80af5509e 100644
--- a/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org
+++ b/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org
@@ -9,11 +9,6 @@ eth0_ip: 10.5.129.14
 gw: 10.5.129.254
 main_bridge: br1
 
-fas_client_groups: sysadmin-noc,sysadmin-releng
-sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-
-host_group: releng
-
 kojipkgs_url: ppcpkgs.fedoraproject.org
 kojihub_url: ppc.koji.fedoraproject.org/kojihub
 kojihub_scheme: http
@@ -21,17 +16,3 @@ kojihub_scheme: http
 koji_server_url: "http://ppc.koji.fedoraproject.org/kojihub"
 koji_weburl: "http://ppc.koji.fedoraproject.org/koji"
 koji_topurl: "http://ppcpkgs.fedoraproject.org/"
-
-fedmsg_certs:
-- service: releng
-  owner: root
-  group: sysadmin-releng
-  can_send:
-  # pungi-koji stuff (ask dgilmore)
-  - pungi.compose.phase.start
-  - pungi.compose.phase.stop
-  - pungi.compose.status.change
-  - pungi.compose.createiso.targets
-  - pungi.compose.createiso.imagefail
-  - pungi.compose.createiso.imagedone
-
diff --git a/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org b/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org
index aa37587d9a..7c491916a4 100644
--- a/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org
+++ b/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org
@@ -9,29 +9,10 @@ eth0_ip: 10.5.129.15
 gw: 10.5.129.254
 main_bridge: br1
 
-fas_client_groups: sysadmin-noc,sysadmin-releng
-sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-
-host_group: releng
-
-kojipkgs_url: ppcpkgs.fedoraproject.org
-kojihub_url: ppc.koji.fedoraproject.org/kojihub
-kojihub_scheme: http
-
-koji_server_url: "http://ppc.koji.fedoraproject.org/kojihub"
-koji_weburl: "http://ppc.koji.fedoraproject.org/koji"
-koji_topurl: "http://ppcpkgs.fedoraproject.org/"
-
-fedmsg_certs:
-- service: releng
-  owner: root
-  group: sysadmin-releng
-  can_send:
-  # pungi-koji stuff (ask dgilmore)
-  - pungi.compose.phase.start
-  - pungi.compose.phase.stop
-  - pungi.compose.status.change
-  - pungi.compose.createiso.targets
-  - pungi.compose.createiso.imagefail
-  - pungi.compose.createiso.imagedone
+kojipkgs_url: armpkgs.fedoraproject.org
+kojihub_url: arm.koji.fedoraproject.org/kojihub
+kojihub_scheme: https
 
+koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
+koji_weburl: "http://arm.koji.fedoraproject.org/koji"
+koji_topurl: "http://armpkgs.fedoraproject.org/"