diff --git a/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org b/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org
index 9554d0feef..ef6efb066d 100644
--- a/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org
+++ b/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org
@@ -1,11 +1,14 @@
 fas_client_groups: sysadmin-noc,sysadmin-releng
 
 kojipkgs_url: armpkgs.fedoraproject.org
-kojihub_url: koji.arm.fedoraproject.org/kojihub
+kojihub_url: arm.koji.fedoraproject.org/kojihub
 kojihub_scheme: https
-koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
 
-nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
+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
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index 96e7cabf19..0cea4516d1 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -59,7 +59,7 @@
     - /var/spool/rsyslog
 
 - name: add pkgs
-  action: yum  state=present pkg={{ item }}
+  yum: state=present pkg={{ item }}
   with_items:
     - yum-utils
     - koji
@@ -75,6 +75,26 @@
     - pykickstart
     - pyliblzma
     - httpd
+  when: ansible_distribution_major_version|int < 22
+
+- name: add pkgs
+  dnf: state=present pkg={{ item }}
+  with_items:
+    - yum-utils
+    - koji
+    - strace
+    - mock
+    - nfs-utils
+    - git
+    - mash
+    - intltool
+    - mutt
+    - koji
+    - createrepo
+    - pykickstart
+    - pyliblzma
+    - httpd
+  when: ansible_distribution_major_version|int > 21
 
 - name: copy over our mash.conf
   template: src=mash.conf dest=/etc/mash/mash.conf
@@ -95,6 +115,9 @@
     - fedora-22-compose-x86_64.cfg
     - fedora-branched-compose-x86_64.cfg
     - fedora-rawhide-compose-x86_64.cfg
+    - fedora-22-compose-aarch64.cfg
+    - fedora-branched-compose-aarch64.cfg
+    - fedora-rawhide-compose-aarch64.cfg
 
 
 # idmapd and make sure it's set to run
diff --git a/roles/releng/templates/fedora-22-compose-aarch64.cfg b/roles/releng/templates/fedora-22-compose-aarch64.cfg
new file mode 100644
index 0000000000..c9ac234c57
--- /dev/null
+++ b/roles/releng/templates/fedora-22-compose-aarch64.cfg
@@ -0,0 +1,37 @@
+config_opts['root'] = 'fedora-22-compose-aarch64'
+config_opts['target_arch'] = 'aarch64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = True
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/22/Everything/aarch64/os/
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/aarch64
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-branched-compose-aarch64.cfg b/roles/releng/templates/fedora-branched-compose-aarch64.cfg
new file mode 100644
index 0000000000..7af5cf3b24
--- /dev/null
+++ b/roles/releng/templates/fedora-branched-compose-aarch64.cfg
@@ -0,0 +1,38 @@
+config_opts['root'] = 'fedora-branched-compose-aarch64'
+config_opts['target_arch'] = 'aarch64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/mash/branched/aarch64/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/aarch64
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-rawhide-compose-aarch64.cfg b/roles/releng/templates/fedora-rawhide-compose-aarch64.cfg
new file mode 100644
index 0000000000..6e8a030e4c
--- /dev/null
+++ b/roles/releng/templates/fedora-rawhide-compose-aarch64.cfg
@@ -0,0 +1,37 @@
+config_opts['root'] = 'fedora-rawhide-compose-aarch64'
+config_opts['target_arch'] = 'aarch64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/mash/rawhide/aarch64/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/rawhide/latest/aarch64
+enabled=1
+#cost=2000
+"""