diff --git a/inventory/group_vars/buildaarch64 b/inventory/group_vars/buildaarch64
index ef2a8781c7..67ad1d8f46 100644
--- a/inventory/group_vars/buildaarch64
+++ b/inventory/group_vars/buildaarch64
@@ -4,6 +4,10 @@ fas_client_groups: sysadmin-releng,sysadmin-secondary
 sudoers: "{{ private }}/files/sudo/buildsecondary-sudoers"
 gw: 10.5.78.254
 
+kojipkgs_url: armpkgs.fedoraproject.org
+kojihub_url: arm.koji.fedoraproject.org/kojihub
+kojihub_scheme: https
+
 koji_hub_nfs: "fedora_arm/data"
 koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
 koji_weburl: "http://arm.koji.fedoraproject.org/koji"
diff --git a/inventory/host_vars/aarch64-02a.arm.fedoraproject.org b/inventory/host_vars/aarch64-02a.arm.fedoraproject.org
index 6011419862..d0e28de458 100644
--- a/inventory/host_vars/aarch64-02a.arm.fedoraproject.org
+++ b/inventory/host_vars/aarch64-02a.arm.fedoraproject.org
@@ -1,15 +1,6 @@
-fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-veteran
-
-kojipkgs_url: armpkgs.fedoraproject.org
-kojihub_url: arm.koji.fedoraproject.org/kojihub
-kojihub_scheme: https
 eth0_ip: 10.5.78.75
 gw: 10.5.78.254
 
-koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
-koji_weburl: "http://arm.koji.fedoraproject.org/koji"
-koji_topurl: "http://armpkgs.fedoraproject.org/"
-
 fedmsg_certs:
 - service: releng
   owner: root
diff --git a/inventory/host_vars/arm-koji01.qa.fedoraproject.org b/inventory/host_vars/arm-koji01.qa.fedoraproject.org
index 74d686d121..6f59f0939f 100644
--- a/inventory/host_vars/arm-koji01.qa.fedoraproject.org
+++ b/inventory/host_vars/arm-koji01.qa.fedoraproject.org
@@ -11,7 +11,7 @@ datacenter: phx2
 nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
 
-fas_client_groups: sysadmin-noc,sysadmin-secondary,sysadmin-veteran
+fas_client_groups: sysadmin-releng,sysadmin-secondary
 
 fedmsg_fqdn: arm-koji01.qa.fedoraproject.org
 
diff --git a/inventory/host_vars/s390-koji01.qa.fedoraproject.org b/inventory/host_vars/s390-koji01.qa.fedoraproject.org
index 29591e0b51..237875aea6 100644
--- a/inventory/host_vars/s390-koji01.qa.fedoraproject.org
+++ b/inventory/host_vars/s390-koji01.qa.fedoraproject.org
@@ -12,7 +12,7 @@ datacenter: phx2
 nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
 
-fas_client_groups: sysadmin-noc,sysadmin-secondary,sysadmin-veteran
+fas_client_groups: sysadmin-releng,sysadmin-secondary
 
 fedmsg_fqdn: s390-koji01.qa.fedoraproject.org