diff --git a/vars/quickstart.yaml b/vars/quickstart.yaml
index 8ec0d92..d346617 100644
--- a/vars/quickstart.yaml
+++ b/vars/quickstart.yaml
@@ -27,10 +27,8 @@ non_root_chown: false
 # May be overrided
 virthost_nameservers: 8.8.8.8
 undercloud_enable_validations: false
-default_disk: 20
 undercloud_disk: 30
 undercloud_vcpu: 3
-default_memory: 4096
 undercloud_memory: 12288
 modify_image_vc_root_password: r00tme
 enable_port_forward_for_tripleo_ui: false
@@ -38,5 +36,11 @@ libvirt_cpu_mode: host-passthrough
 libvirt_volume_pool: default
 libvirt_domain_type: kvm
 
-# This needs to be common defaults in oooq prolly!
-step_overcloud_prep_flavors: true
+# https://bugs.launchpad.net/tripleo/+bug/1788875
+flavor_map:
+  control: control
+  compute: compute
+step_overcloud_prep_flavors: false
+default_disk: 18
+default_vcpu: 1
+default_memory: 4096
\ No newline at end of file