diff --git a/roles/bkernel/files/bkernel-site-defaults.cfg b/roles/bkernel/files/bkernel-site-defaults.cfg
index 2b973e0378..5a26c23346 100644
--- a/roles/bkernel/files/bkernel-site-defaults.cfg
+++ b/roles/bkernel/files/bkernel-site-defaults.cfg
@@ -2,8 +2,8 @@
 config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/run/pesign', '/var/run/pesign' ))
 config_opts['plugin_conf']['package_state_enable'] = False
 config_opts['macros']['%bugurl'] = 'https://bugz.fedoraproject.org/%name'
-config_opts['nosync'] = True
-config_opts['nosync_force'] = True
+#config_opts['nosync'] = True
+#config_opts['nosync_force'] = True
 config_opts['dnf_common_opts'] = ['--setopt=install_weak_deps=0']
 config_opts['environment']['LANG'] = 'C.UTF-8'
 config_opts['use_bootstrap'] = False
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 44078bfb37..80b0349f85 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -264,6 +264,7 @@
 
 - name: mock site-defaults.cfg
   template: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
+  when: not inventory_hostname.startswith(('bkernel'))
   tags:
   - koji_builder
   - site-defaults