diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr-back
index 9725defc26..6d598e4b33 100644
--- a/inventory/group_vars/copr-back
+++ b/inventory/group_vars/copr-back
@@ -6,7 +6,8 @@ copr_nova_tenant_id: "5d99f099b7fe4b0387f0352f6301ba6a"
 copr_nova_tenant_name: "copr"
 copr_nova_username: "copr"
 
-copr_builder_image_name: "builder-2015-10-06"
+# copr_builder_image_name: "Fedora-Cloud-Base-20141203-21"
+copr_builder_image_name: "builder-2015-05-27"
 copr_builder_flavor_name: "ms2.builder"
 copr_builder_network_name: "copr-net"
 copr_builder_key_name: "buildsys"
diff --git a/inventory/group_vars/copr-back-stg b/inventory/group_vars/copr-back-stg
index 27807a9c3a..7c0fb6addf 100644
--- a/inventory/group_vars/copr-back-stg
+++ b/inventory/group_vars/copr-back-stg
@@ -6,7 +6,7 @@ copr_nova_tenant_id: "a6ff2158641c439a8426d7facab45437"
 copr_nova_tenant_name: "coprdev"
 copr_nova_username: "copr"
 
-copr_builder_image_name: "builder-2015-10-06"
+copr_builder_image_name: "builder-2015-05-27"
 copr_builder_flavor_name: "ms2.builder"
 copr_builder_network_name: "coprdev-net"
 copr_builder_key_name: "buildsys"
diff --git a/roles/copr/backend/files/provision/builderpb_nova.yml b/roles/copr/backend/files/provision/builderpb_nova.yml
index f1b6199cda..1109be0e79 100644
--- a/roles/copr/backend/files/provision/builderpb_nova.yml
+++ b/roles/copr/backend/files/provision/builderpb_nova.yml
@@ -30,16 +30,6 @@
       poll: 2
 
 
-# only enable when creating base image
-#- name: provision builder
-#  hosts: builder_temp_group
-#  gather_facts: False
-#  sudo: True
-#  user: fedora
-#
-#  tasks:
-#  - raw: dnf install -y python2 python-dnf libselinux-python libsemanage-python python-firewall
-
 - name: provision builder
   hosts: builder_temp_group
   gather_facts: True
diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml
index 27ae3b8d49..2e73fbbc8e 100644
--- a/roles/copr/backend/files/provision/provision_builder_tasks.yml
+++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml
@@ -2,7 +2,7 @@
   copy: src="copr.repo" dest="/etc/yum.repos.d/copr.repo"
 
 - name: install pkgs
-  dnf: state=present pkg={{ item }}
+  yum: state=present pkg={{ item }}
   with_items:
     - dnf
     - dnf-plugins-core
@@ -21,19 +21,21 @@
     - ethtool
 #    - fedpkg-copr
 # BZ 1241507
-- shell: yum-deprecated install -y fedpkg-copr
+- shell: yum-deprecated install -y fedpkg-copr || yum install -y fedpkg-copr
 
-#- get_url: url=https://kojipkgs.fedoraproject.org//packages/mock/1.2.12/1.fc21/noarch/mock-1.2.12-1.fc21.noarch.rpm dest=/tmp/
-#- yum: state=present name=/tmp/mock-1.2.12-1.fc21.noarch.rpm
+# This needs to be updated for python-fedora
+- shell: yum-deprecated update -y python-requests || yum install -y python-requests
+
+- get_url: url=https://kojipkgs.fedoraproject.org//packages/mock/1.2.12/1.fc21/noarch/mock-1.2.12-1.fc21.noarch.rpm dest=/tmp/
+- yum: state=present name=/tmp/mock-1.2.12-1.fc21.noarch.rpm
 
 - name: make sure newest rpm
   # todo: replace with dnf after ansible 1.9 is available
-  dnf: name={{ item }} state=latest
+  yum: name={{ item }} state=latest
   with_items:
     - rpm
     - glib2
     - ca-certificates
-    - python-requests
 
 - copy: src=files/fedpkg-copr.conf dest=/etc/rpkg/fedpkg-copr.conf
 
@@ -67,7 +69,7 @@
 - name: prepare cache
   when: prepare_base_image is defined
   async: 14400
-  shell: "for i in epel-5-i386 epel-5-x86_64 epel-6-i386 epel-6-x86_64 epel-7-x86_64 fedora-21-i386 fedora-21-x86_64 fedora-22-i386 fedora-22-x86_64 fedora-23-i386 fedora-23-x86_64 fedora-rawhide-i386 fedora-rawhide-x86_64; do mock --init -r $i; done"
+  shell: "for i in epel-5-i386 epel-5-x86_64 epel-6-i386 epel-6-x86_64 epel-7-x86_64 fedora-20-i386 fedora-20-x86_64 fedora-21-i386 fedora-21-x86_64 fedora-22-i386 fedora-22-x86_64 fedora-23-i386 fedora-23-x86_64 fedora-rawhide-i386 fedora-rawhide-x86_64; do mock --init -r $i; done"
 
 - name: mockbuilder user
   user: name=mockbuilder groups=mock