diff --git a/files/releng/fedora-branched-compose-armhfp.cfg b/files/releng/fedora-branched-compose-armhfp.cfg
index 10f2e16072..1dce6a1c59 100644
--- a/files/releng/fedora-branched-compose-armhfp.cfg
+++ b/files/releng/fedora-branched-compose-armhfp.cfg
@@ -1,6 +1,6 @@
 config_opts['root'] = 'fedora-branched-compose-armhfp'
 config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced joe pungi'
+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
diff --git a/files/releng/fedora-branched-compose-i386.cfg b/files/releng/fedora-branched-compose-i386.cfg
index 977d5f9004..d4fe906d30 100644
--- a/files/releng/fedora-branched-compose-i386.cfg
+++ b/files/releng/fedora-branched-compose-i386.cfg
@@ -1,6 +1,6 @@
 config_opts['root'] = 'fedora-branched-compose-i386'
 config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced joe pungi'
+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
diff --git a/files/releng/fedora-branched-compose-x86_64.cfg b/files/releng/fedora-branched-compose-x86_64.cfg
index 04450a1d8f..46b57d82e4 100644
--- a/files/releng/fedora-branched-compose-x86_64.cfg
+++ b/files/releng/fedora-branched-compose-x86_64.cfg
@@ -1,6 +1,6 @@
 config_opts['root'] = 'fedora-branched-compose-x86_64'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced joe pungi'
+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
diff --git a/files/releng/fedora-rawhide-compose-armhfp.cfg b/files/releng/fedora-rawhide-compose-armhfp.cfg
index d592831a02..0fb5a4ea54 100644
--- a/files/releng/fedora-rawhide-compose-armhfp.cfg
+++ b/files/releng/fedora-rawhide-compose-armhfp.cfg
@@ -1,6 +1,6 @@
 config_opts['root'] = 'fedora-rawhide-compose-armhfp'
 config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+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' ))