diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-aarch64.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-aarch64.cfg
index 3d00881ab9..79b92b5177 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-aarch64.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-aarch64.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'aarch64'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
index 5eba326eb5..9b370e2616 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'armv7hl'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
index 3fb947c83f..5496dbb50e 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'i386'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64.cfg
index 18a07b9af6..c0b66c8df3 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'ppc64'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64le.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64le.cfg
index 18a07b9af6..c0b66c8df3 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64le.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64le.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'ppc64'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
index efc3ee64b4..cb8c063abb 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-aarch64.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-aarch64.cfg
index be3834227d..7188c9a043 100644
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-aarch64.cfg
+++ b/roles/koji_builder/files/builders/fedora-rawhide-pungi-aarch64.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'aarch64'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg
index 594b3071f9..52d6ac7cb3 100644
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg
+++ b/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'armv7hl'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg
index ffc67c6dcb..a378d0cf03 100644
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg
+++ b/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'i386'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64.cfg
index f227e4659e..d058cd992f 100644
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64.cfg
+++ b/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'ppc64le'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64le.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64le.cfg
index f227e4659e..d058cd992f 100644
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64le.cfg
+++ b/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64le.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'ppc64le'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg
index f00e0135c1..a64d31ab77 100644
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg
+++ b/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg
@@ -3,9 +3,7 @@ config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'fc9'
 config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+config_opts['internal_dev_setup'] = True
 config_opts['plugin_conf']['root_cache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = False
 config_opts['plugin_conf']['ccache_enable'] = False