diff --git a/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml b/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml
index 58294ec44..07cab9d3c 100644
--- a/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml
+++ b/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml
@@ -3,6 +3,9 @@ schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: openstack-ceph-config
+  labels:
+    name: openstack-ceph-config-global
+    component: ceph
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/osh/openstack-ceph-config/chart-group.yaml b/global/software/charts/osh/openstack-ceph-config/chart-group.yaml
index 338abe65b..8120ed0ab 100644
--- a/global/software/charts/osh/openstack-ceph-config/chart-group.yaml
+++ b/global/software/charts/osh/openstack-ceph-config/chart-group.yaml
@@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: openstack-ceph-config
+  labels:
+    name: openstack-ceph-config-chart-group-global
+    component: ceph
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/osh/openstack-cinder/chart-group.yaml b/global/software/charts/osh/openstack-cinder/chart-group.yaml
index d84e66111..dc25b480e 100644
--- a/global/software/charts/osh/openstack-cinder/chart-group.yaml
+++ b/global/software/charts/osh/openstack-cinder/chart-group.yaml
@@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: openstack-cinder
+  labels:
+    name: openstack-cinder-chart-group-global
+    component: cinder
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/osh/openstack-cinder/cinder.yaml b/global/software/charts/osh/openstack-cinder/cinder.yaml
index dd2c9205c..cc01c3455 100644
--- a/global/software/charts/osh/openstack-cinder/cinder.yaml
+++ b/global/software/charts/osh/openstack-cinder/cinder.yaml
@@ -4,6 +4,7 @@ metadata:
   schema: metadata/Document/v1
   name: cinder
   labels:
+    name: cinder-global
     component: cinder
   layeringDefinition:
     abstract: false
diff --git a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml b/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
index ab8fdfe0c..1c3d37878 100644
--- a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
@@ -3,6 +3,9 @@ schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: cinder-rabbitmq
+  labels:
+    name: cinder-rabbitmq-global
+    component: cinder
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/osh/openstack-horizon/chart-group.yaml b/global/software/charts/osh/openstack-horizon/chart-group.yaml
index f59b955e0..3ab0deda4 100644
--- a/global/software/charts/osh/openstack-horizon/chart-group.yaml
+++ b/global/software/charts/osh/openstack-horizon/chart-group.yaml
@@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: openstack-horizon
+  labels:
+    name: openstack-horizon-chart-group-global
+    component: horizon
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/osh/openstack-horizon/horizon.yaml b/global/software/charts/osh/openstack-horizon/horizon.yaml
index f64ae9167..71c16d54f 100644
--- a/global/software/charts/osh/openstack-horizon/horizon.yaml
+++ b/global/software/charts/osh/openstack-horizon/horizon.yaml
@@ -4,6 +4,7 @@ metadata:
   schema: metadata/Document/v1
   name: horizon
   labels:
+    name: horizon-global
     component: horizon
   layeringDefinition:
     abstract: false
diff --git a/global/software/charts/osh/openstack-memcached/chart-group.yaml b/global/software/charts/osh/openstack-memcached/chart-group.yaml
index f4d6b772d..7b3c28aec 100644
--- a/global/software/charts/osh/openstack-memcached/chart-group.yaml
+++ b/global/software/charts/osh/openstack-memcached/chart-group.yaml
@@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: openstack-memcached
+  labels:
+    name: openstack-memcached-chart-group-global
+    component: memcached
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/osh/openstack-memcached/memcached.yaml b/global/software/charts/osh/openstack-memcached/memcached.yaml
index 5ce47ff04..8e8ca3ea9 100644
--- a/global/software/charts/osh/openstack-memcached/memcached.yaml
+++ b/global/software/charts/osh/openstack-memcached/memcached.yaml
@@ -3,6 +3,9 @@ schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: openstack-memcached
+  labels:
+    name: openstack-memcached-global
+    component: memcached
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/ucp/armada/chart-group.yaml b/global/software/charts/ucp/armada/chart-group.yaml
index 01e6d06f0..4b6a71a74 100644
--- a/global/software/charts/ucp/armada/chart-group.yaml
+++ b/global/software/charts/ucp/armada/chart-group.yaml
@@ -3,6 +3,8 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: ucp-armada
+  labels:
+    name: ucp-armada-chart-group-global
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/ucp/ceph-config/ceph-config.yaml b/global/software/charts/ucp/ceph-config/ceph-config.yaml
index 19a380a8e..d9389d0f3 100644
--- a/global/software/charts/ucp/ceph-config/ceph-config.yaml
+++ b/global/software/charts/ucp/ceph-config/ceph-config.yaml
@@ -3,6 +3,9 @@ schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: ucp-ceph-config
+  labels:
+    name: ucp-ceph-config-global
+    components: ceph
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/ucp/ceph-config/chart-group.yaml b/global/software/charts/ucp/ceph-config/chart-group.yaml
index 09482e793..aad648b3f 100644
--- a/global/software/charts/ucp/ceph-config/chart-group.yaml
+++ b/global/software/charts/ucp/ceph-config/chart-group.yaml
@@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: ucp-ceph-config
+  labels:
+    name: ucp-ceph-config-chart-group-global
+    component: ceph
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/ucp/core/chart-group.yaml b/global/software/charts/ucp/core/chart-group.yaml
index e55ae0427..c995346ed 100644
--- a/global/software/charts/ucp/core/chart-group.yaml
+++ b/global/software/charts/ucp/core/chart-group.yaml
@@ -3,6 +3,8 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: ucp-core
+  labels:
+    name: ucp-core-chart-group-global
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/ucp/deckhand/chart-group.yaml b/global/software/charts/ucp/deckhand/chart-group.yaml
index e26aba3cb..cba361fee 100644
--- a/global/software/charts/ucp/deckhand/chart-group.yaml
+++ b/global/software/charts/ucp/deckhand/chart-group.yaml
@@ -3,6 +3,8 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: ucp-deckhand
+  labels:
+    name: ucp-deckhand-chart-group-global
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/ucp/keystone/chart-group.yaml b/global/software/charts/ucp/keystone/chart-group.yaml
index 5b2ae4771..48aea95ca 100644
--- a/global/software/charts/ucp/keystone/chart-group.yaml
+++ b/global/software/charts/ucp/keystone/chart-group.yaml
@@ -3,6 +3,8 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: ucp-keystone
+  labels:
+    name: ucp-keystone-chart-group-global
   layeringDefinition:
     abstract: false
     layer: global
diff --git a/global/software/charts/ucp/shipyard/chart-group.yaml b/global/software/charts/ucp/shipyard/chart-group.yaml
index 4dffc6e03..f4cc1f865 100644
--- a/global/software/charts/ucp/shipyard/chart-group.yaml
+++ b/global/software/charts/ucp/shipyard/chart-group.yaml
@@ -3,6 +3,8 @@ schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: ucp-shipyard
+  labels:
+    name: ucp-shipyard-chart-group-global
   layeringDefinition:
     abstract: false
     layer: global