diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index bf95f8a321..05f86fb95d 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -52,9 +52,9 @@ main_bridge: br0
 nfs_bridge: br1
 
 virt_install_command_one_nic: virt-install -n {{ inventory_hostname }} 
-                 --memory={{ mem_size }},maxmemory={{ mem_size * 5 }} --memballoon virtio
+                 --memory={{ mem_size }},maxmemory={{ max_mem_size|defaut('mem_size * 5') }} --memballoon virtio
                  --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }},maxvcpus={{ num_cpus * 5 }}  -l {{ ks_repo }} -x
+                 --vcpus={{ num_cpus }},maxvcpus={{ max_mem_size|default('num_cpus * 5') }}  -l {{ ks_repo }} -x
                  'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none'
@@ -62,9 +62,9 @@ virt_install_command_one_nic: virt-install -n {{ inventory_hostname }}
                  --autostart --noautoconsole --watchdog default
 
 virt_install_command_two_nic: virt-install -n {{ inventory_hostname }} 
-                 --memory={{ mem_size }},maxmemory={{ mem_size * 5 }} --memballoon virtio
+                 --memory={{ mem_size }},maxmemory={{ max_mem_size|default('mem_size * 5') }} --memballoon virtio
                  --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }},maxvcpus={{ num_cpus * 5 }}  -l {{ ks_repo }} -x
+                 --vcpus={{ num_cpus }},maxvcpus={{ max_mem_size|default('num_cpus * 5') }}  -l {{ ks_repo }} -x
                  'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
@@ -73,9 +73,9 @@ virt_install_command_two_nic: virt-install -n {{ inventory_hostname }}
                  --autostart --noautoconsole --watchdog default
 
 virt_install_command_rhel6: /usr/sbin/virt-install -n {{ inventory_hostname }}
-                 --memory={{ mem_size }},maxmemory={{ mem_size * 5 }}
+                 --memory={{ mem_size }},maxmemory={{ max_mem_size|default('mem_size * 5') }}
                  --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }},maxvcpus={{ num_cpus * 5 }}  -l {{ ks_repo }} -x 
+                 --vcpus={{ num_cpus }},maxvcpus={{ max_mem_size|default('num_cpus * 5') }}  -l {{ ks_repo }} -x 
                  "ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} 
                   gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }}" 
diff --git a/inventory/host_vars/proxy04.fedoraproject.org b/inventory/host_vars/proxy04.fedoraproject.org
index 8e583fb217..7e614c78ea 100644
--- a/inventory/host_vars/proxy04.fedoraproject.org
+++ b/inventory/host_vars/proxy04.fedoraproject.org
@@ -24,4 +24,5 @@ nrpe_procs_warn: 1200
 nrpe_procs_crit: 1400
 
 mem_size: 16384
+max_mem_size: 20000
 num_cpus: 8