diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index a2273e6551..5045e9027d 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -84,10 +84,13 @@
 - name: put extra special  mock configs in
   template: src="{{ item }}" dest="/etc/mock/{{ item }}" mode=644
   with_items:
+    - fedora-22-compose-armhfp.cfg
     - fedora-branched-compose-armhfp.cfg
     - fedora-rawhide-compose-armhfp.cfg
+    - fedora-22-compose-i386.cfg
     - fedora-branched-compose-i386.cfg
     - fedora-rawhide-compose-i386.cfg
+    - fedora-22-compose-x86_64.cfg
     - fedora-branched-compose-x86_64.cfg
     - fedora-rawhide-compose-x86_64.cfg
 
diff --git a/roles/releng/templates/fedora-22-compose-armhfp.cfg b/roles/releng/templates/fedora-22-compose-armhfp.cfg
new file mode 100644
index 0000000000..580339d6da
--- /dev/null
+++ b/roles/releng/templates/fedora-22-compose-armhfp.cfg
@@ -0,0 +1,37 @@
+config_opts['root'] = 'fedora-22-compose-armhfp'
+config_opts['target_arch'] = 'armv7hl'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools'
+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(('/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/linux/releases/22/Everything/armhfp/os/
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/armhfp
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-22-compose-i386.cfg b/roles/releng/templates/fedora-22-compose-i386.cfg
new file mode 100644
index 0000000000..6aa865f1d5
--- /dev/null
+++ b/roles/releng/templates/fedora-22-compose-i386.cfg
@@ -0,0 +1,37 @@
+config_opts['root'] = 'fedora-22-compose-i386'
+config_opts['target_arch'] = 'i386'
+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(('/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/linux/releases/22/Everything/i386/os/
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/i386
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-22-compose-x86_64.cfg b/roles/releng/templates/fedora-22-compose-x86_64.cfg
new file mode 100644
index 0000000000..70d9362b37
--- /dev/null
+++ b/roles/releng/templates/fedora-22-compose-x86_64.cfg
@@ -0,0 +1,37 @@
+config_opts['root'] = 'fedora-22-compose-x86_64'
+config_opts['target_arch'] = 'x86_64'
+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(('/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/linux/releases/22/Everything/x86_64/os/
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/x86_64
+enabled=1
+#cost=2000
+"""