diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml
index 0bfe8a7..200342a 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml
@@ -8,8 +8,6 @@
 
 parameters:
   image: bionic-server-cloudimg-amd64-20190612
-  ucp_flavor: system.compact.openstack.control
-  masters_flavor: system.compact.openstack.control
   workers_flavor: system.compact.openstack.control
   cmps_flavor: system.virtual.openstack.k8s.compute.small
   gtws_flavor: system.compact.openstack.gateway
diff --git a/de/heat-templates/env/mstr3-wrkr6-cmp3-osd3.yaml b/de/heat-templates/env/mstr3-wrkr6-cmp3-osd3.yaml
index eba5aa6..076c490 100644
--- a/de/heat-templates/env/mstr3-wrkr6-cmp3-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr6-cmp3-osd3.yaml
@@ -8,8 +8,6 @@
 
 parameters:
   image: bionic-server-cloudimg-amd64-20190612
-  ucp_flavor: system.compact.openstack.control
-  masters_flavor: system.compact.openstack.control
   workers_flavor: system.compact.openstack.control
   cmps_flavor: system.virtual.openstack.k8s.compute.small
   gtws_flavor: system.compact.openstack.gateway
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index da2e305..fa54943 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -120,10 +120,10 @@
     default: {}
   ucp_flavor:
     type: string
-    default: 'system.compact.openstack.control'
+    default: 'system.compact.openstack.proxy'
   masters_flavor:
     type: string
-    default: 'system.compact.openstack.control'
+    default: 'system.compact.openstack.proxy'
   workers_flavor:
     type: string
     default: 'system.compact.openstack.control'