diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr-back
index 33e3e69a06..152a2258c4 100644
--- a/inventory/group_vars/copr-back
+++ b/inventory/group_vars/copr-back
@@ -7,7 +7,7 @@ copr_nova_tenant_name: "copr"
 copr_nova_username: "copr"
 
 # copr_builder_image_name: "Fedora-Cloud-Base-20141203-21"
-copr_builder_image_name: "builder-2015-05-15"
+copr_builder_image_name: "builder-2015-05-25"
 copr_builder_flavor_name: "m1.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 6c2ee21ee4..db820572f4 100644
--- a/inventory/group_vars/copr-back-stg
+++ b/inventory/group_vars/copr-back-stg
@@ -6,7 +6,7 @@ copr_nova_tenant_id: "566a072fb1694950998ad191fee3833b"
 copr_nova_tenant_name: "coprdev"
 copr_nova_username: "copr"
 
-copr_builder_image_name: "builder-2015-05-15"
+copr_builder_image_name: "builder-2015-05-25"
 copr_builder_flavor_name: "m1.builder"
 copr_builder_network_name: "coprdev-net"
 copr_builder_key_name: "buildsys"
diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index f367173a1a..e7851604e2 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -513,6 +513,8 @@
       name="{{item.name}}" ram="{{item.ram}}" disk="{{item.disk}}" vcpus="{{item.vcpus}}" swap="{{item.swap}}"
     with_items:
       - { name: m1.builder, ram: 5120, disk: 50, vcpus: 2, swap: 5120 }
+      - { name: ms2.builder, ram: 5120, disk: 20, vcpus: 2, swap: 50000 }
+      - { name: m2.prepare_builder, ram: 5120, disk: 20, vcpus: 2, swap: 0 }
       # same as m.* but with swap
       - { name: ms1.tiny, ram: 512, disk: 1, vcpus: 1, swap: 512 }
       - { name: ms1.small, ram: 2048, disk: 20, vcpus: 1, swap: 2048 }