diff --git a/ansible/roles/hv-vm-manifests-compact/templates/manifest.yml.j2 b/ansible/roles/hv-vm-manifests-compact/templates/manifest.yml.j2
index b4b951b0..e5324982 100644
--- a/ansible/roles/hv-vm-manifests-compact/templates/manifest.yml.j2
+++ b/ansible/roles/hv-vm-manifests-compact/templates/manifest.yml.j2
@@ -108,11 +108,13 @@ kind: ManagedCluster
 metadata:
   name: compact-{{ '%05d' | format(item) }}
   labels:
+    common: 'true'
+    common-mno: 'true'
+    group-du-3node: ''
     name: compact-{{ '%05d' | format(item) }}
-    vendor: OpenShift
     observability: disabled
-    common: "true"
-    group-du-3node: ""
+    sites: compact-{{ '%05d' | format(item) }}
+    vendor: OpenShift
 spec:
   hubAcceptsClient: true
 {% endif %}
diff --git a/ansible/roles/hv-vm-manifests-compact/templates/siteconfig.yml.j2 b/ansible/roles/hv-vm-manifests-compact/templates/siteconfig.yml.j2
index 0bd08ccc..5b7e3322 100644
--- a/ansible/roles/hv-vm-manifests-compact/templates/siteconfig.yml.j2
+++ b/ansible/roles/hv-vm-manifests-compact/templates/siteconfig.yml.j2
@@ -34,13 +34,13 @@ spec:
       common-mno: 'true'
       group-du-3node: ''
       name: compact-{{ '%05d' | format(item) }}
-      sites: compact-{{ '%05d' | format(item) }}
-      vendor: OpenShift
 {% if siteconfig_observability %}
       observability: enabled
 {% else %}
       observability: disabled
 {% endif %}
+      sites: compact-{{ '%05d' | format(item) }}
+      vendor: OpenShift
     clusterNetwork:
     - cidr: {{ "fd01::/48" if hostvars[groups['hv_vm'][((item - 1) * compact_cluster_node_count)]]['hv_ip'] | ansible.utils.ipv6 else "10.128.0.0/14" }}
       hostPrefix: {{ compact_cluster_network_host_prefix }}
diff --git a/ansible/roles/hv-vm-manifests-jumbo/templates/manifest.yml.j2 b/ansible/roles/hv-vm-manifests-jumbo/templates/manifest.yml.j2
index 2c32a45e..71608d51 100644
--- a/ansible/roles/hv-vm-manifests-jumbo/templates/manifest.yml.j2
+++ b/ansible/roles/hv-vm-manifests-jumbo/templates/manifest.yml.j2
@@ -108,12 +108,13 @@ kind: ManagedCluster
 metadata:
   name: jumbocluster00
   labels:
+    # common: 'true'
+    # common-mno: 'true'
+    # group-du-standard: ''
     name: jumbocluster00
-    vendor: OpenShift
     observability: disabled
-    # common: "true"
-    # group-du-sno: ""
-    # group-sno-du: "true"
+    sites: jumbocluster00
+    vendor: OpenShift
 spec:
   hubAcceptsClient: true
 {% endif %}
diff --git a/ansible/roles/hv-vm-manifests-sno/templates/manifest.yml.j2 b/ansible/roles/hv-vm-manifests-sno/templates/manifest.yml.j2
index b30fe181..b3664b66 100644
--- a/ansible/roles/hv-vm-manifests-sno/templates/manifest.yml.j2
+++ b/ansible/roles/hv-vm-manifests-sno/templates/manifest.yml.j2
@@ -152,12 +152,12 @@ kind: ManagedCluster
 metadata:
   name: {{ inventory_hostname }}
   labels:
+    common: 'true'
+    group-du-sno: ''
     name: {{ inventory_hostname }}
-    vendor: OpenShift
     observability: disabled
-    common: "true"
-    group-du-sno: ""
-    group-sno-du: "true"
+    sites: {{ inventory_hostname }}
+    vendor: OpenShift
 spec:
   hubAcceptsClient: true
 {% endif %}
diff --git a/ansible/roles/hv-vm-manifests-sno/templates/siteconfig.yml.j2 b/ansible/roles/hv-vm-manifests-sno/templates/siteconfig.yml.j2
index e0d7c114..a601c3c5 100644
--- a/ansible/roles/hv-vm-manifests-sno/templates/siteconfig.yml.j2
+++ b/ansible/roles/hv-vm-manifests-sno/templates/siteconfig.yml.j2
@@ -69,18 +69,18 @@ spec:
 {% endif %}
     clusterLabels:
       common: 'true'
-      group-du-sno: ''
 {% if siteconfig_sno_du_profile in ["4.12", "4.13", "4.14", "4.15", "4.16"] %}
       du-profile: "{{ siteconfig_sno_du_profile }}"
 {% endif %}
+      group-du-sno: ''
       name: {{ inventory_hostname }}
-      sites: {{ inventory_hostname }}
-      vendor: OpenShift
 {% if siteconfig_observability %}
       observability: enabled
 {% else %}
       observability: disabled
 {% endif %}
+      sites: {{ inventory_hostname }}
+      vendor: OpenShift
     clusterNetwork:
     - cidr: {{ "fd01::/48" if hostvars[inventory_hostname]['ip'] | ansible.utils.ipv6 else "10.128.0.0/14" }}
       hostPrefix: {{ sno_cluster_network_host_prefix }}
diff --git a/ansible/roles/hv-vm-manifests-standard/templates/manifest.yml.j2 b/ansible/roles/hv-vm-manifests-standard/templates/manifest.yml.j2
index ff1b6969..21324281 100644
--- a/ansible/roles/hv-vm-manifests-standard/templates/manifest.yml.j2
+++ b/ansible/roles/hv-vm-manifests-standard/templates/manifest.yml.j2
@@ -108,15 +108,17 @@ kind: ManagedCluster
 metadata:
   name: standard-{{ '%05d' | format(item) }}
   labels:
+    common: 'true'
+    common-mno: 'true'
+    group-du-standard: ''
     name: standard-{{ '%05d' | format(item) }}
-    vendor: OpenShift
 {% if manifest_observability %}
     observability: enabled
 {% else %}
     observability: disabled
 {% endif %}
-    common: "true"
-    group-du-standard: ""
+    sites: standard-{{ '%05d' | format(item) }}
+    vendor: OpenShift
 spec:
   hubAcceptsClient: true
 {% endif %}
diff --git a/ansible/roles/hv-vm-manifests-standard/templates/siteconfig.yml.j2 b/ansible/roles/hv-vm-manifests-standard/templates/siteconfig.yml.j2
index 46e0d8cd..57f98693 100644
--- a/ansible/roles/hv-vm-manifests-standard/templates/siteconfig.yml.j2
+++ b/ansible/roles/hv-vm-manifests-standard/templates/siteconfig.yml.j2
@@ -34,13 +34,13 @@ spec:
       common-mno: 'true'
       group-du-standard: ''
       name: standard-{{ '%05d' | format(item) }}
-      sites: standard-{{ '%05d' | format(item) }}
-      vendor: OpenShift
 {% if siteconfig_observability %}
       observability: enabled
 {% else %}
       observability: disabled
 {% endif %}
+      sites: standard-{{ '%05d' | format(item) }}
+      vendor: OpenShift
     clusterNetwork:
     - cidr: {{ "fd01::/48" if hostvars[groups['hv_vm'][((item - 1) * standard_cluster_node_count)]]['hv_ip'] | ansible.utils.ipv6 else "10.128.0.0/14" }}
       hostPrefix: {{ standard_cluster_network_host_prefix }}