diff --git a/inventory/builders b/inventory/builders
index 20cf782513..d9150ed7fa 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -130,8 +130,9 @@ arm02-builder23.arm.fedoraproject.org
 #arm03-builder05.arm.fedoraproject.org
 #arm03-builder06.arm.fedoraproject.org
 #arm03-builder07.arm.fedoraproject.org
-arm03-builder08.arm.fedoraproject.org
-arm03-builder09.arm.fedoraproject.org
+# These are in use as arm03-packager01-02
+#arm03-builder08.arm.fedoraproject.org
+#arm03-builder09.arm.fedoraproject.org
 arm03-builder10.arm.fedoraproject.org
 arm03-builder11.arm.fedoraproject.org
 arm03-builder12.arm.fedoraproject.org
diff --git a/inventory/group_vars/koji-hub-secondary b/inventory/group_vars/koji-hub-secondary
new file mode 100644
index 0000000000..7f20b3eef5
--- /dev/null
+++ b/inventory/group_vars/koji-hub-secondary
@@ -0,0 +1,10 @@
+---
+# common items for the koji server boxes
+lvm_size: 20000
+mem_size: 8192
+num_cpus: 4
+# for systems that do not match the above - specify the same parameter in
+# the host_vars/$hostname file
+
+tcp_ports: [ 80 443 ]
+fas_client_groups: sysadmin-build,sysadmin-noc
diff --git a/inventory/host_vars/aarch64-hub01.qa.fedoraproject.org b/inventory/host_vars/aarch64-hub01.qa.fedoraproject.org
new file mode 100644
index 0000000000..7aaf2cf3a3
--- /dev/null
+++ b/inventory/host_vars/aarch64-hub01.qa.fedoraproject.org
@@ -0,0 +1,10 @@
+---
+nm: 255.255.255.0
+gw: 10.5.124.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
+ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
+volgroup: /dev/VirtGuests
+eth0_ip: 10.5.124.149
+vmhost: virthost-comm02.qa.fedoraproject.org
+datacenter: phx2
diff --git a/inventory/inventory b/inventory/inventory
index 0e722f7333..23c4271766 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -4,6 +4,10 @@
 [bkernel]
 [buildvmhost]
 
+[arm-packager]
+arm03-packager01.arm.fedoraproject.org
+arm03-packager02.arm.fedoraproject.org
+
 [arm-qa]
 arm03-qa00.arm.fedoraproject.org
 arm03-qa01.arm.fedoraproject.org
@@ -195,6 +199,9 @@ hosted-lists01.fedoraproject.org
 kernel01.qa.fedoraproject.org
 kernel02.qa.fedoraproject.org
 
+[koji-hub-secondary]
+aarch64-hub01.qa.fedoraproject.org
+
 [koji]
 koji03.phx2.fedoraproject.org
 koji04.phx2.fedoraproject.org
diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
new file mode 100644
index 0000000000..4d26766d90
--- /dev/null
+++ b/playbooks/groups/koji-hub.yml
@@ -0,0 +1,48 @@
+# create a new koji hub server system
+# NOTE: should be used with --limit most of the time
+# NOTE: most of these vars come from group_vars/koji-hub or from hostvars
+
+- name: make koji hub
+  hosts: koji-hub-secondary
+  user: root
+  gather_facts: False
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - ${private}/vars.yml
+   - ${vars}/${ansible_distribution}.yml
+
+  tasks:
+  - include: $tasks/virt_instance_create.yml
+
+  handlers:
+  - include: $handlers/restart_services.yml
+
+# Once the instance exists, configure it. 
+
+- name: make koji_hub server system
+  hosts: koji-hub-secondary
+  user: root
+  gather_facts: True
+
+  vars_files: 
+   - /srv/web/infra/ansible/vars/global.yml
+   - ${private}/vars.yml
+   - ${vars}/${ansible_distribution}.yml
+
+  tasks:
+  - include: $tasks/hosts.yml
+  - include: $tasks/yumrepos.yml
+  - include: $tasks/base.yml
+  - include: $tasks/fas_client.yml
+  - include: $tasks/2fa_client.yml
+  - include: $tasks/motd.yml
+  - include: $tasks/sudo.yml
+  - include: $tasks/rkhunter.yml
+  - include: $tasks/denyhosts.yml
+  - include: $tasks/nagios_client.yml
+  - include: $tasks/collectd/client.yml
+  - include: $tasks/koji/koji_hub.yml
+
+  handlers:
+  - include: $handlers/restart_services.yml
diff --git a/tasks/koji/koji_hub.yml b/tasks/koji/koji_hub.yml
new file mode 100644
index 0000000000..ee42b2c794
--- /dev/null
+++ b/tasks/koji/koji_hub.yml
@@ -0,0 +1,23 @@
+---
+#
+# Setup koji hub server. 
+#
+- name: install koji hub server packages
+  yum: name=$item state=installed
+  with_items:
+  - koji-hub
+  - koji-web
+  - koji-utils
+  - mod_ssl
+  - git
+  - gnupg2
+  tags:
+  - packages
+
+- name: Set httpd to run on boot
+  service: name=httpd enabled=yes
+  ignore_errors: true
+  notify:
+  - restart httpd
+  tags:
+  - service