diff --git a/roles/copr/backend/files/provision/files/mock/site-defaults.cfg b/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
index 030b646605..d8491025e5 100644
--- a/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
+++ b/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
@@ -21,9 +21,6 @@ config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '75g'
 config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
 config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
 
-config_opts['cleanup_on_success'] = 0
-config_opts['cleanup_on_failure'] = 0
-
 {% if ansible_distribution == 'Fedora' and ansible_distribution_major_version|int > 21 %}
 config_opts['yum_command'] = '/usr/bin/yum-deprecated'
 {% endif %}
diff --git a/roles/copr/backend/templates/copr-be.conf.j2 b/roles/copr/backend/templates/copr-be.conf.j2
index 79c8726894..6a31960168 100644
--- a/roles/copr/backend/templates/copr-be.conf.j2
+++ b/roles/copr/backend/templates/copr-be.conf.j2
@@ -30,7 +30,7 @@ frontend_auth={{ copr_backend_password }}
 #   vm_terminating_timeout=600 - when machine was terminated and terminate PB did not finish within this number of second, we will run the PB once again.
 
 group0_name=PC
-group0_archs=i386,x86_64
+group0_archs=i386,x86_64,i586
 
 # new OS cloud, VMM based backend
 group0_spawn_playbook=/home/copr/provision/builderpb_nova.yml