diff --git a/openstack/sap-seeds/templates/flavor-seed.yaml b/openstack/sap-seeds/templates/flavor-seed.yaml
index afdce559174..21029b00bf0 100644
--- a/openstack/sap-seeds/templates/flavor-seed.yaml
+++ b/openstack/sap-seeds/templates/flavor-seed.yaml
@@ -6,7 +6,29 @@ spec:
   requires:
   - monsoon3/nova-flavor-seed
   flavors:
-{{- range $name, $values := .Values.flavors.untemplated }}
+  ### From .Values.flavors.(templates x hypervisors)
+{{- range $hyp, $hypervisor := $.Values.flavors.hypervisors }}
+  {{- $hypervisorSpec := default (dict) $hypervisor.spec  }}
+  {{- range $ver, $version := $hypervisor.variants }}
+    {{- $hypervisorVerSpec := merge (default (dict) $hypervisor.spec) $hypervisorSpec }}
+      {{- range $cat, $category := $.Values.flavors.templates }}
+          {{- $categorySpec := default (dict) $category.spec }}
+          {{- range $cpu, $cpus:= $category.variants }}
+              {{- $cpuSpec := merge (default (dict) $cpus.spec) $categorySpec }}
+              {{- range $ram, $rams:= $cpus.variants }}
+                  {{- $ramSpec := merge (default (dict) $rams.spec) $cpuSpec }}
+                  {{- $name := list $cat $hyp $cpu $ram $ver | join "_"}}
+                  {{- $overrides := get $.Values.flavors.overrides $name | default (dict) }}
+                  {{- $spec := merge $overrides $hypervisorVerSpec $ramSpec }}
+  - name: {{ $name }}
+    {{- toYaml $spec | nindent 4 }}
+              {{- end }}
+          {{- end }}
+      {{- end }}
+  {{- end }}
+{{- end }}
+  ### From .Values.flavors.untemplated
+{{- range $name, $values := $.Values.flavors.untemplated }}
   - name: {{ $name }}
     {{- toYaml $values | nindent 4 }}
 {{- end }}
diff --git a/openstack/sap-seeds/values.yaml b/openstack/sap-seeds/values.yaml
index b4c29cf7aa9..d0e0dff23ae 100644
--- a/openstack/sap-seeds/values.yaml
+++ b/openstack/sap-seeds/values.yaml
@@ -47,681 +47,576 @@ extra_specs:
     <<: [*vmware_common_v2, *vmware_hana_exclusive]
 
 flavors:
-  untemplated:
+  hypervisors:
+    k:
+      spec:
+        disk: 0
+        is_public: false
+        extra_spec:
+          capabilities:hypervisor_type: QEMU
+          hw:mem_page_size: large
+          hw_video:ram_max_mb: 16
+      variants:
+        v1: {}
+        v2: {}
+    v:
+      spec:
+        disk: 64
+        is_public: true
+        extra_specs:
+          <<: *vmware_common
+      variants:
+        v1:
+          spec:
+            extra_spec:
+              vmware:evc_mode: intel-cascadelake
+        v2:
+          spec:
+            extra_spec:
+              trait:CUSTOM_HW_SAPPHIRE_RAPIDS: required
+  templates:
+    # Our naming scheme is starting with a category, which is the top-level key here
+    c:
+      # This is followed by the hypervisor-type letter, which is specified under 'hypervisors'
+      spec: # Spec common to all flavors of this category
+        extra_specs:
+          trait:CUSTOM_HANA_EXCLUSIVE_HOST: forbidden
+      variants: # Then we follow the tree here,
+        c16:
+          spec:
+            vcpus: 16
+          variants:
+            m16:
+              spec:
+                ram: 16368
+        c2:
+          spec:
+            vcpus: 2
+          variants:
+            m2:
+              spec:
+                ram: 2032
+        c4:
+          spec:
+            vcpus: 4
+          variants:
+            m4:
+              spec:
+                ram: 4080
+    g:
+      spec:
+        extra_specs:
+          trait:CUSTOM_HANA_EXCLUSIVE_HOST: forbidden
+      variants:
+        c128:
+          spec:
+            vcpus: 128
+          variants:
+            m512:
+              spec:
+                ram: 524272
+        c12:
+          spec:
+            vcpus: 12
+          variants:
+            m48:
+              spec:
+                ram: 49136
+        c16:
+          spec:
+            vcpus: 16
+          variants:
+            m32:
+              spec:
+                ram: 32752
+            m64:
+              spec:
+                ram: 65520
+        c1:
+          spec:
+            vcpus: 1
+          variants:
+            m2:
+              spec:
+                ram: 2032
+            m3:
+              spec:
+                ram: 3056
+            m4:
+              spec:
+                ram: 4080
+        c24:
+          spec:
+            vcpus: 24
+          variants:
+            m96:
+              spec:
+                ram: 98288
+        c2:
+          spec:
+            vcpus: 2
+          variants:
+            m4:
+              spec:
+                ram: 4080
+            m8:
+              spec:
+                ram: 8176
+        c32:
+          spec:
+            vcpus: 32
+          variants:
+            m128:
+              spec:
+                ram: 131056
+        c48:
+          spec:
+            vcpus: 48
+          variants:
+            m192:
+              spec:
+                ram: 196592
+        c4:
+          spec:
+            vcpus: 4
+          variants:
+            m16:
+              spec:
+                ram: 16368
+            m8:
+              spec:
+                ram: 8176
+        c64:
+          spec:
+            vcpus: 64
+          variants:
+            m256:
+              spec:
+                ram: 262128
+        c6:
+          spec:
+            vcpus: 6
+          variants:
+            m24:
+              spec:
+                ram: 24560
+        c8:
+          spec:
+            vcpus: 8
+          variants:
+            m16:
+              spec:
+                ram: 16368
+            m32:
+              spec:
+                ram: 32752
+    m:
+      spec:
+        extra_specs:
+          trait:CUSTOM_HANA_EXCLUSIVE_HOST: forbidden
+      variants:
+        c128:
+          spec:
+            vcpus: 128
+          variants:
+            m1000:
+              spec:
+                ram: 1048560
+        c16:
+          spec:
+            vcpus: 16
+          variants:
+            m128:
+              spec:
+                ram: 131056
+            m256:
+              spec:
+                ram: 262128
+            m512:
+              spec:
+                ram: 524272
+        c20:
+          spec:
+            vcpus: 20
+          variants:
+            m160:
+              spec:
+                ram: 163824
+        c24:
+          spec:
+            vcpus: 24
+          variants:
+            m192:
+              spec:
+                ram: 196592
+        c2:
+          spec:
+            vcpus: 2
+          variants:
+            m16:
+              spec:
+                ram: 16368
+        c32:
+          spec:
+            vcpus: 32
+          variants:
+            m256:
+              spec:
+                ram: 262128
+            m512:
+              spec:
+                ram: 524272
+        c48:
+          spec:
+            vcpus: 48
+          variants:
+            m512:
+              spec:
+                ram: 524272
+        c4:
+          spec:
+            vcpus: 4
+          variants:
+            m32:
+              spec:
+                ram: 32752
+            m64:
+              spec:
+                ram: 65520
+        c64:
+          spec:
+            vcpus: 64
+          variants:
+            m512:
+              spec:
+                ram: 524272
+        c8:
+          spec:
+            vcpus: 8
+          variants:
+            m128:
+              spec:
+                ram: 131056
+            m256:
+              spec:
+                ram: 262128
+            m64:
+              spec:
+                ram: 65520
+    s:
+      spec:
+        extra_specs:
+          trait:CUSTOM_HANA_EXCLUSIVE_HOST: forbidden
+      variants:
+        c64:
+          spec:
+            vcpus: 64
+          variants:
+            m64:
+              spec:
+                ram: 65520
+  overrides:
     c_v_c16_m16_v1:
-      disk: 64
+      id: '52'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.xlarge_cpu,c_c16_m16
-      id: '52'
-      is_public: true
-      ram: 16368
-      vcpus: 16
     c_v_c16_m16_v2:
-      disk: 64
+      id: '411'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: c_c16_m16_v2
-      id: '411'
-      is_public: true
-      ram: 16368
-      vcpus: 16
     c_v_c2_m2_v1:
-      disk: 64
+      id: '20'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.small,m1.smallhdd,c_c2_m2
-      id: '20'
-      is_public: true
-      ram: 2032
-      vcpus: 2
     c_v_c2_m2_v2:
-      disk: 64
+      id: '403'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: c_c2_m2_v2
-      id: '403'
-      is_public: true
-      ram: 2032
-      vcpus: 2
     c_v_c4_m4_v1:
-      disk: 64
+      id: '30'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.medium,c_c4_m4
-      id: '30'
-      is_public: true
-      ram: 4080
-      vcpus: 4
     c_v_c4_m4_v2:
-      disk: 64
+      id: '408'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: c_c4_m4_v2
-      id: '408'
-      is_public: true
-      ram: 4080
-      vcpus: 4
     g_v_c128_m512_v1:
-      disk: 64
+      id: '230'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m5.32xlarge,g_c128_m512
-        hw:cpu_cores: '64'
-      id: '230'
-      is_public: true
-      ram: 524272
-      vcpus: 128
     g_v_c128_m512_v2:
-      disk: 64
+      id: '448'
       extra_specs:
-        <<: *vmware_v2
-        hw:cpu_cores: '64'
         catalog:alias: g_c128_m512_v2
-      id: '448'
-      is_public: true
-      ram: 524272
-      vcpus: 128
     g_v_c12_m48_v1:
-      disk: 64
+      id: '62'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: g_c12_m48
-      id: '62'
-      is_public: true
-      ram: 49136
-      vcpus: 12
     g_v_c12_m48_v2:
-      disk: 64
+      id: '415'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c12_m48_v2
-      id: '415'
-      is_public: true
-      ram: 49136
-      vcpus: 12
     g_v_c16_m32_v1:
-      disk: 64
+      id: '61'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.2xlargecpu,g_c16_m32
-      id: '61'
-      is_public: true
-      ram: 32752
-      vcpus: 16
     g_v_c16_m32_v2:
-      disk: 64
+      id: '414'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c16_m32_v2
-      id: '414'
-      is_public: true
-      ram: 32752
-      vcpus: 16
     g_v_c16_m64_v1:
-      disk: 64
+      id: '70'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.4xlarge,g_c16_m64
-      id: '70'
-      is_public: true
-      ram: 65520
-      vcpus: 16
     g_v_c16_m64_v2:
-      disk: 64
+      id: '416'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c16_m64_v2
-      id: '416'
-      is_public: true
-      ram: 65520
-      vcpus: 16
     g_v_c1_m2_v1:
-      disk: 64
+      id: '19'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.xsmallcpuhdd,g_c1_m2
-      id: '19'
-      is_public: true
-      ram: 2032
-      vcpus: 1
     g_v_c1_m2_v2:
-      disk: 64
+      id: '402'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c1_m2_v2
-      id: '402'
-      is_public: true
-      ram: 2032
-      vcpus: 1
     g_v_c1_m3_v1:
-      disk: 64
+      id: '24'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: g_c1_m3
-      id: '24'
-      is_public: true
-      ram: 3056
-      vcpus: 1
     g_v_c1_m3_v2:
-      disk: 64
+      id: '405'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c1_m3_v2
-      id: '405'
-      is_public: true
-      ram: 3056
-      vcpus: 1
     g_v_c1_m4_v1:
-      disk: 64
+      id: '25'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: g_c1_m4
-      id: '25'
-      is_public: true
-      ram: 4080
-      vcpus: 1
     g_v_c1_m4_v2:
-      disk: 64
+      id: '406'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c1_m4_v2
-      id: '406'
-      is_public: true
-      ram: 4080
-      vcpus: 1
     g_v_c24_m96_v1:
-      disk: 64
+      id: '144'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: g_c24_m96
-      id: '144'
-      is_public: true
-      ram: 98288
-      vcpus: 24
     g_v_c24_m96_v2:
-      disk: 64
+      id: '451'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c24_m96_v2
-      id: '451'
-      is_public: true
-      ram: 98288
-      vcpus: 24
     g_v_c2_m4_v1:
-      disk: 64
+      id: '22'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.xsmall,m1.xsmallhdd,g_c2_m4
-      id: '22'
-      ram: 4080
-      vcpus: 2
-      is_public: true
     g_v_c2_m4_v2:
-      disk: 64
+      id: '404'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c2_m4_v2
-      id: '404'
-      is_public: true
-      ram: 4080
-      vcpus: 2
     g_v_c2_m8_v1:
-      disk: 64
+      id: '32'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.xmedium,g_c2_m8
-      id: '32'
-      is_public: true
-      ram: 8176
-      vcpus: 2
     g_v_c2_m8_v2:
-      disk: 64
+      id: '407'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c2_m8_v2
-      id: '407'
-      is_public: true
-      ram: 8176
-      vcpus: 2
     g_v_c32_m128_v1:
-      disk: 64
+      id: '162'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: g_c32_m128
-      id: '162'
-      is_public: true
-      ram: 131056
-      vcpus: 32
     g_v_c32_m128_v2:
-      disk: 64
+      id: '439'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c32_m128_v2
-      id: '439'
-      is_public: true
-      ram: 131056
-      vcpus: 32
     g_v_c48_m192_v1:
-      disk: 64
+      id: '166'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: g_c48_m192
-      id: '166'
-      is_public: true
-      ram: 196592
-      vcpus: 48
     g_v_c48_m192_v2:
-      disk: 64
+      id: '440'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c48_m192_v2
-      id: '440'
-      is_public: true
-      ram: 196592
-      vcpus: 48
     g_v_c4_m16_v1:
-      disk: 64
+      id: '50'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.xlarge,g_c4_m16
-      id: '50'
-      is_public: true
-      ram: 16368
-      vcpus: 4
     g_v_c4_m16_v2:
-      disk: 64
+      id: '410'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c4_m16_v2
-      id: '410'
-      is_public: true
-      ram: 16368
-      vcpus: 4
     g_v_c4_m8_v1:
-      disk: 64
+      id: '40'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.large,g_c4_m8
-      id: '40'
-      is_public: true
-      ram: 8176
-      vcpus: 4
     g_v_c4_m8_v2:
-      disk: 64
+      id: '409'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c4_m8_v2
-      id: '409'
-      is_public: true
-      ram: 8176
-      vcpus: 4
     g_v_c64_m256_v1:
-      disk: 64
+      id: '220'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m5.16xlarge,g_c64_m256
-        hw:cpu_cores: '64'
-      id: '220'
-      is_public: true
-      ram: 262128
-      vcpus: 64
     g_v_c64_m256_v2:
-      disk: 64
+      id: '446'
       extra_specs:
-        <<: *vmware_v2
-        hw:cpu_cores: '64'
         catalog:alias: g_c64_m256_v2
-      id: '446'
-      is_public: true
-      ram: 262128
-      vcpus: 64
     g_v_c6_m24_v1:
-      disk: 64
+      id: '53'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: g_c6_m24
-      id: '53'
-      is_public: true
-      ram: 24560
-      vcpus: 6
     g_v_c6_m24_v2:
-      disk: 64
+      id: '412'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c6_m24_v2
-      id: '412'
-      is_public: true
-      ram: 24560
-      vcpus: 6
     g_v_c8_m16_v1:
-      disk: 64
+      id: '110'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m2.xlarge,g_c8_m16
-      id: '110'
-      is_public: true
-      ram: 16368
-      vcpus: 8
     g_v_c8_m16_v2:
-      disk: 64
+      id: '424'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c8_m16_v2
-      id: '424'
-      is_public: true
-      ram: 16368
-      vcpus: 8
     g_v_c8_m32_v1:
-      disk: 64
+      id: '60'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m1.2xlarge,g_c8_m32
-      id: '60'
-      is_public: true
-      ram: 32752
-      vcpus: 8
     g_v_c8_m32_v2:
-      disk: 64
+      id: '413'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: g_c8_m32_v2
-      id: '413'
-      is_public: true
-      ram: 32752
-      vcpus: 8
     m_v_c128_m1000_v1:
-      disk: 64
+      id: '240'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m5.64xlarge,m_c128_m1000
-        hw:cpu_cores: '64'
-      id: '240'
-      is_public: true
-      ram: 1048560
-      vcpus: 128
     m_v_c128_m1000_v2:
-      disk: 64
+      id: '450'
       extra_specs:
-        <<: *vmware_v2
-        hw:cpu_cores: '64'
         catalog:alias: m_c128_m1000_v2
-      id: '450'
-      is_public: true
-      ram: 1048560
-      vcpus: 128
     m_v_c16_m128_v1:
-      disk: 64
+      id: '160'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m2.8xlarge,m_c16_m128
-      id: '160'
-      ram: 131056
-      vcpus: 16
-      is_public: true
     m_v_c16_m128_v2:
-      disk: 64
+      id: '436'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c16_m128_v2
-      id: '436'
-      is_public: true
-      ram: 131056
-      vcpus: 16
     m_v_c16_m256_v1:
-      disk: 64
+      id: '99'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: x1.2xmemory,m_c16_m256
-      id: '99'
-      is_public: true
-      ram: 262128
-      vcpus: 16
     m_v_c16_m256_v2:
-      disk: 64
+      id: '420'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c16_m256_v2
-      id: '420'
-      is_public: true
-      ram: 262128
-      vcpus: 16
     m_v_c16_m512_v1:
-      disk: 64
+      id: '164'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m_c16_m512
-      id: '164'
-      is_public: true
-      ram: 524272
-      vcpus: 16
     m_v_c16_m512_v2:
-      disk: 64
+      id: '438'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c16_m512_v2
-      id: '438'
-      is_public: true
-      ram: 524272
-      vcpus: 16
     m_v_c20_m160_v1:
-      disk: 64
+      id: '143'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m_c20_m160
-      id: '143'
-      is_public: true
-      ram: 163824
-      vcpus: 20
     m_v_c20_m160_v2:
-      disk: 64
+      id: '434'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c20_m160_v2
-      id: '434'
-      is_public: true
-      ram: 163824
-      vcpus: 20
     m_v_c24_m192_v1:
-      disk: 64
+      id: '142'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m_c24_m192
-      id: '142'
-      is_public: true
-      ram: 196592
-      vcpus: 24
     m_v_c24_m192_v2:
-      disk: 64
+      id: '435'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c24_m192_v2
-      id: '435'
-      is_public: true
-      ram: 196592
-      vcpus: 24
     m_v_c2_m16_v1:
-      disk: 64
+      id: '138'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m_c2_m16
-      id: '138'
-      is_public: true
-      ram: 16368
-      vcpus: 2
     m_v_c2_m16_v2:
-      disk: 64
+      id: '431'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c2_m16_v2
-      id: '431'
-      is_public: true
-      ram: 16368
-      vcpus: 2
     m_v_c32_m256_v1:
-      disk: 64
+      id: '163'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m_c32_m256
-      id: '163'
-      is_public: true
-      ram: 262128
-      vcpus: 32
     m_v_c32_m256_v2:
-      disk: 64
+      id: '444'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c32_m256_v2
-      id: '444'
-      is_public: true
-      ram: 262128
-      vcpus: 32
     m_v_c32_m512_v1:
-      disk: 64
+      id: '150'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: x1.4xmemory,m_c32_m512
-      id: '150'
-      is_public: true
-      ram: 524272
-      vcpus: 32
     m_v_c32_m512_v2:
-      disk: 64
+      id: '421'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c32_m512_v2
-      id: '421'
-      is_public: true
-      ram: 524272
-      vcpus: 32
     m_v_c48_m512_v1:
-      disk: 64
+      id: '221'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m_c48_m512
-      id: '221'
-      is_public: true
-      ram: 524272
-      vcpus: 48
     m_v_c48_m512_v2:
-      disk: 64
+      id: '447'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c48_m512_v2
-      id: '447'
-      is_public: true
-      ram: 524272
-      vcpus: 48
     m_v_c4_m32_v1:
-      disk: 64
+      id: '145'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m_c4_m32
-      id: '145'
-      is_public: true
-      ram: 32752
-      vcpus: 4
     m_v_c4_m32_v2:
-      disk: 64
+      id: '452'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c4_m32_v2
-      id: '452'
-      is_public: true
-      ram: 32752
-      vcpus: 4
     m_v_c4_m64_v1:
-      disk: 64
+      id: '100'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m2.large,m_c4_m64
-      id: '100'
-      is_public: true
-      ram: 65520
-      vcpus: 4
     m_v_c4_m64_v2:
-      disk: 64
+      id: '423'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c4_m64_v2
-      id: '423'
-      is_public: true
-      ram: 65520
-      vcpus: 4
     m_v_c64_m512_v1:
-      disk: 64
+      id: '165'
       extra_specs:
-        <<: *vmware_v1
-        hw:cpu_cores: '64'
         catalog:alias: m_c64_m512
-      id: '165'
-      is_public: true
-      ram: 524272
-      vcpus: 64
     m_v_c64_m512_v2:
-      disk: 64
+      id: '445'
       extra_specs:
-        <<: *vmware_v2
-        hw:cpu_cores: '64'
         catalog:alias: m_c64_m512_v2
-      id: '445'
-      is_public: true
-      ram: 524272
-      vcpus: 64
     m_v_c8_m128_v1:
-      disk: 64
+      id: '90'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: x1.memory,m_c8_m128
-      id: '90'
-      is_public: true
-      ram: 131056
-      vcpus: 8
     m_v_c8_m128_v2:
-      disk: 64
+      id: '419'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c8_m128_v2
-      id: '419'
-      is_public: true
-      ram: 131056
-      vcpus: 8
     m_v_c8_m256_v1:
-      disk: 64
+      id: '141'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m_c8_m256
-      id: '141'
-      is_public: true
-      ram: 262128
-      vcpus: 8
     m_v_c8_m256_v2:
-      disk: 64
+      id: '433'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c8_m256_v2
-      id: '433'
-      is_public: true
-      ram: 262128
-      vcpus: 8
     m_v_c8_m64_v1:
-      disk: 64
+      id: '140'
       extra_specs:
-        <<: *vmware_v1
         catalog:alias: m2.4xlarge,m_c8_m64
-      id: '140'
-      is_public: true
-      ram: 65520
-      vcpus: 8
     m_v_c8_m64_v2:
-      disk: 64
+      id: '432'
       extra_specs:
-        <<: *vmware_v2
         catalog:alias: m_c8_m64_v2
-      id: '432'
-      is_public: true
-      ram: 65520
-      vcpus: 8
+    s_v_c64_m64_v1:
+      id: '400'
+      extra_specs:
+        catalog:alias: s_c64_m64
+  untemplated:
     ##############################################
     # Legacy flavors
     ##############################################