diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 929ef0e979..0bff9073b3 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={{ max_mem_size|defaut(mem_size * 5) }} --memballoon virtio
+                 --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio
                  --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }},maxvcpus={{ max_mem_size|default(num_cpus * 5) }}  -l {{ ks_repo }} -x
+                 --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }}  -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={{ max_mem_size|default(mem_size * 5) }} --memballoon virtio
+                 --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio
                  --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }},maxvcpus={{ max_mem_size|default(num_cpus * 5) }}  -l {{ ks_repo }} -x
+                 --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }}  -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,14 +73,17 @@ 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={{ max_mem_size|default(mem_size * 5) }}
+                 --memory={{ mem_size }},maxmemory={{ max_mem_size }}
                  --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }},maxvcpus={{ max_mem_size|default(num_cpus * 5) }}  -l {{ ks_repo }} -x 
+                 --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }}  -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 }}" 
                  --network=bridge=br0 --autostart --noautoconsole --watchdog default
 
+max_mem_size: mem_size * 5
+max_cpu: num_cpus * 5
+
 # This is the wildcard certname for our proxies.  It has a different name for
 # the staging group and is used in the proxies.yml playbook.
 wildcard_cert_name: wildcard-2014.fedoraproject.org