diff --git a/site/aiab/software/charts/osh/openstack-glance/chart-group.yaml b/site/aiab/software/charts/osh/openstack-glance/chart-group.yaml
new file mode 100644
index 000000000..1c3e05c81
--- /dev/null
+++ b/site/aiab/software/charts/osh/openstack-glance/chart-group.yaml
@@ -0,0 +1,19 @@
+---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: openstack-glance-aiab
+  layeringDefinition:
+    abstract: false
+    layer: site
+    parentSelector:
+      name: openstack-glance-chart-group-global
+      component: glance
+    actions:
+      - method: replace
+        path: .chart_group
+  storagePolicy: cleartext
+data:
+  chart_group:
+    - glance-rabbitmq
+    - glance-aiab
diff --git a/site/aiab/software/charts/osh/openstack-glance/glance.yaml b/site/aiab/software/charts/osh/openstack-glance/glance.yaml
index 14073f112..4777ba4ee 100644
--- a/site/aiab/software/charts/osh/openstack-glance/glance.yaml
+++ b/site/aiab/software/charts/osh/openstack-glance/glance.yaml
@@ -2,13 +2,12 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: glance
-  replacement: true
+  name: glance-aiab
   layeringDefinition:
     abstract: false
     layer: site
     parentSelector:
-      name: glance-global
+      name: glance-type
     actions:
       - method: merge
         path: .
@@ -16,9 +15,5 @@ metadata:
 
 data:
   values:
-    pod:
-      replicas:
-        api: 1
-        registry: 1
     storage: pvc
 ...
diff --git a/site/aiab/software/charts/osh/openstack-heat/chart-group.yaml b/site/aiab/software/charts/osh/openstack-heat/chart-group.yaml
new file mode 100644
index 000000000..186e5f1ee
--- /dev/null
+++ b/site/aiab/software/charts/osh/openstack-heat/chart-group.yaml
@@ -0,0 +1,20 @@
+---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: openstack-heat-aiab
+  layeringDefinition:
+    abstract: false
+    layer: site
+    parentSelector:
+      name: openstack-heat-chart-group-global
+      component: heat
+    actions:
+      - method: replace
+        path: .chart_group
+  storagePolicy: cleartext
+data:
+  sequenced: true
+  chart_group:
+    - heat-rabbitmq
+    - heat-aiab
diff --git a/site/aiab/software/charts/osh/openstack-heat/heat.yaml b/site/aiab/software/charts/osh/openstack-heat/heat.yaml
index c614aa68a..bfdf5a257 100644
--- a/site/aiab/software/charts/osh/openstack-heat/heat.yaml
+++ b/site/aiab/software/charts/osh/openstack-heat/heat.yaml
@@ -2,13 +2,12 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: heat
-  replacement: true
+  name: heat-aiab
   layeringDefinition:
     abstract: false
     layer: site
     parentSelector:
-      name: heat-global
+      name: heat-type
     actions:
       - method: merge
         path: .
diff --git a/site/aiab/software/full-site.yaml b/site/aiab/software/full-site.yaml
index f6f0ade7f..dac74557a 100644
--- a/site/aiab/software/full-site.yaml
+++ b/site/aiab/software/full-site.yaml
@@ -36,8 +36,8 @@ data:
     - openstack-mariadb
     - openstack-memcached
     - openstack-keystone
-    - openstack-glance
+    - openstack-glance-aiab
     - openstack-compute-kit
-    - openstack-heat
+    - openstack-heat-aiab
     - openstack-horizon
 ...