diff --git a/roles/copr/backend/files/provision/builderpb.yml b/roles/copr/backend/files/provision/builderpb.yml
index 39581eb767..49f1af569f 100644
--- a/roles/copr/backend/files/provision/builderpb.yml
+++ b/roles/copr/backend/files/provision/builderpb.yml
@@ -36,7 +36,7 @@
 
 - hosts: builder_temp_group
   user: root
-  gather_facts: False
+  gather_facts: True
   vars:
    - files: files/
   
@@ -84,7 +84,7 @@
     action: authorized_key user=mockbuilder key='{{ lookup('file', '/home/copr/provision/files/buildsys.pub') }}'
 
   - name: put updated mock configs into /etc/mock
-    action: copy src={{ files }}/mock/{{ item }} dest=/etc/mock
+    action: template src={{ files }}/mock/{{ item }} dest=/etc/mock
     with_items:
     - site-defaults.cfg
 
diff --git a/roles/copr/backend/files/provision/builderpb_nova.yml b/roles/copr/backend/files/provision/builderpb_nova.yml
index 578cb11c0c..0cb5fe161c 100644
--- a/roles/copr/backend/files/provision/builderpb_nova.yml
+++ b/roles/copr/backend/files/provision/builderpb_nova.yml
@@ -32,7 +32,7 @@
 
 - name: provision builder
   hosts: builder_temp_group
-  gather_facts: False
+  gather_facts: True
   sudo: True
   user: fedora 
 
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 477293365b..fda1515d8b 100644
--- a/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
+++ b/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
@@ -22,3 +22,7 @@ config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024
 config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '50g'
 config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
 config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
+
+{% 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/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml
index 15fbc5ed73..c3a9279896 100644
--- a/roles/copr/backend/files/provision/provision_builder_tasks.yml
+++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml
@@ -3,9 +3,10 @@
   yum: state=present pkg={{ item }}
   with_items:
     - dnf
+    - dnf-plugins-core
     - mock
 #    - mock-lvm
-    - createrepo
+    - createrepo_c
     - yum-utils
     - pyliblzma
     - rsync
@@ -27,7 +28,7 @@
     - ca-certificates
 
 - name: put updated mock configs into /etc/mock
-  copy: src=files/mock/{{ item }} dest=/etc/mock
+  template: src=files/mock/{{ item }} dest=/etc/mock
   with_items:
     - site-defaults.cfg