diff --git a/inventory/host_vars/copr-dist-git.fedorainfracloud.org b/inventory/host_vars/copr-dist-git.fedorainfracloud.org
index 23cff8975f..3e03e3c5ff 100644
--- a/inventory/host_vars/copr-dist-git.fedorainfracloud.org
+++ b/inventory/host_vars/copr-dist-git.fedorainfracloud.org
@@ -1,5 +1,5 @@
 ---
-instance_type: ms1.medium
+instance_type: ms1.medium.bigswap
 #image: "{{ centos70_x86_64 }}"
 image: rhel7-20141015
 keypair: fedora-admin-20130801
diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 002acfb3fe..98deaad744 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -594,6 +594,7 @@
       - { name: ms1.tiny, ram: 512, disk: 1, vcpus: 1, swap: 512 }
       - { name: ms1.small, ram: 2048, disk: 20, vcpus: 1, swap: 2048 }
       - { name: ms1.medium, ram: 4096, disk: 40, vcpus: 2, swap: 4096 }
+      - { name: ms1.medium.bigswap, ram: 4096, disk: 40, vcpus: 2, swap: 400000 }
       - { name: ms1.large, ram: 8192, disk: 50, vcpus: 4, swap: 4096 }
       - { name: ms1.xlarge, ram: 16384, disk: 160, vcpus: 8, swap: 16384 }
       # inspired by http://aws.amazon.com/ec2/instance-types/
diff --git a/roles/copr/dist_git/tasks/mount_fs.yml b/roles/copr/dist_git/tasks/mount_fs.yml
index 6bb1957244..b41c9d5ed2 100644
--- a/roles/copr/dist_git/tasks/mount_fs.yml
+++ b/roles/copr/dist_git/tasks/mount_fs.yml
@@ -3,3 +3,8 @@
 
 - name: mount up disk of copr repo
   mount: name=/var/lib/dist-git src='LABEL=copr-dist-git' fstype=ext4 state=mounted
+
+- name: Mount tmp as tmpfs
+  action: lineinfile dest=/etc/fstab  regexp="/tmp" line="tmpfs     /tmp     tmpfs     defaults,size=20G     0     0" state=present
+
+- mount: name=/tmp src=tmpfs fstype=tmpfs state=present