diff --git a/files/releng/fedora-rawhide-compose-armhfp.cfg b/files/releng/fedora-rawhide-compose-armhfp.cfg
index 0fb5a4ea54..2fc304b49d 100644
--- a/files/releng/fedora-rawhide-compose-armhfp.cfg
+++ b/files/releng/fedora-rawhide-compose-armhfp.cfg
@@ -1,11 +1,14 @@
 config_opts['root'] = 'fedora-rawhide-compose-armhfp'
 config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build uboot-tools'
-config_opts['dist'] = 'fc10'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools'
+config_opts['dist'] = 'fc21'  # 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]
diff --git a/files/releng/fedora-rawhide-compose-i386.cfg b/files/releng/fedora-rawhide-compose-i386.cfg
index 65f8e7089e..410f458f3e 100644
--- a/files/releng/fedora-rawhide-compose-i386.cfg
+++ b/files/releng/fedora-rawhide-compose-i386.cfg
@@ -1,10 +1,14 @@
 config_opts['root'] = 'fedora-rawhide-compose-i386'
 config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc10'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
+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]
diff --git a/files/releng/fedora-rawhide-compose-x86_64.cfg b/files/releng/fedora-rawhide-compose-x86_64.cfg
new file mode 100644
index 0000000000..c20a4d670b
--- /dev/null
+++ b/files/releng/fedora-rawhide-compose-x86_64.cfg
@@ -0,0 +1,40 @@
+config_opts['root'] = 'fedora-rawhide-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(('/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=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64
+enabled=1
+#cost=2000
+"""
+
+
+
diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml
index 4143078baa..116a5796ad 100644
--- a/tasks/koji/releng_config.yml
+++ b/tasks/koji/releng_config.yml
@@ -99,6 +99,7 @@
     - fedora-branched-compose-i386.cfg
     - fedora-rawhide-compose-i386.cfg
     - fedora-branched-compose-x86_64.cfg
+    - fedora-rawhide-compose-x86_64.cfg
 
 
 # idmapd and make sure it's set to run