diff --git a/common/acm/templates/policies/application-policies.yaml b/common/acm/templates/policies/application-policies.yaml
index 65e1232..2dd2240 100644
--- a/common/acm/templates/policies/application-policies.yaml
+++ b/common/acm/templates/policies/application-policies.yaml
@@ -58,7 +58,11 @@ spec:
                       - name: global.hubClusterDomain
                         value: {{ $.Values.global.hubClusterDomain }}
                       - name: global.localClusterDomain
-                        value: '{{`{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain  }}`}}'
+                      {{- if $.Values.clusterGroup.isHubCluster }}
+                        value: {{ $.Values.global.hubClusterDomain }}
+                      {{- else }}
+                        value: '{{ `{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain }}` }}'
+                      {{- end }}
                      {{- range .helmOverrides }}
                       - name: {{ .name }}
                         value: {{ .value | quote }}
diff --git a/common/clustergroup/templates/applications.yaml b/common/clustergroup/templates/applications.yaml
index 2e4379c..0fede23 100644
--- a/common/clustergroup/templates/applications.yaml
+++ b/common/clustergroup/templates/applications.yaml
@@ -40,7 +40,11 @@ spec:
         - name: global.hubClusterDomain
           value: {{ $.Values.global.hubClusterDomain }}
         - name: global.localClusterDomain
+        {{- if $.Values.clusterGroup.isHubCluster }}
+          value: {{ $.Values.global.hubClusterDomain }}
+        {{- else }}
           value: {{ $.Values.global.localClusterDomain }}
+        {{- end }}
         {{- range .overrides }}
         - name: {{ .name }}
           value: {{ .value | quote }}
diff --git a/common/clustergroup/values.yaml b/common/clustergroup/values.yaml
index aec0fcd..58643cc 100644
--- a/common/clustergroup/values.yaml
+++ b/common/clustergroup/values.yaml
@@ -8,10 +8,7 @@ global:
 
 clusterGroup:
   name: example
-
-  proposedOptions:
-    manageGitops: True
-    isHubCluster: True
+  isHubCluster: true
 
 #  managedClusterGroups:
 #  - name: factory
diff --git a/common/vault-route/.helmignore b/common/vault-route/.helmignore
deleted file mode 100644
index b25c15b..0000000
--- a/common/vault-route/.helmignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/common/vault-route/Chart.yaml b/common/vault-route/Chart.yaml
deleted file mode 100644
index 2295c23..0000000
--- a/common/vault-route/Chart.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v2
-description: A Helm chart to create a route for vault in edge modeArgoCD applications and any required namespaces or subscriptions
-keywords:
-- pattern
-name: pattern-vault-route
-version: 0.0.1
diff --git a/common/vault-route/templates/vault-route.yaml b/common/vault-route/templates/vault-route.yaml
deleted file mode 100644
index 49f575c..0000000
--- a/common/vault-route/templates/vault-route.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-kind: Route
-apiVersion: route.openshift.io/v1
-metadata:
-  name: vault
-  labels:
-    app.kubernetes.io/instance: vault
-    app.kubernetes.io/name: vault
-    argocd.argoproj.io/instance: vault
-  annotations:
-    openshift.io/host.generated: 'true'
-spec:
-  host: vault.{{ $.Values.global.hubClusterDomain }}
-  to:
-    kind: Service
-    name: vault
-    weight: 100
-  port:
-    targetPort: http
-  tls:
-    termination: edge
-    insecureEdgeTerminationPolicy: None
-  wildcardPolicy: None
-status:
diff --git a/common/vault-route/values.yaml b/common/vault-route/values.yaml
deleted file mode 100644
index 7082a85..0000000
--- a/common/vault-route/values.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-global:
-  hubClusterDomain: example.com
diff --git a/values-hub.yaml b/values-hub.yaml
index 27c086b..d912e3c 100644
--- a/values-hub.yaml
+++ b/values-hub.yaml
@@ -1,9 +1,6 @@
 clusterGroup:
   name: hub
-
-  proposedOptions:
-    manageGitops: True
-    isHubCluster: True
+  isHubCluster: true
 
   namespaces:
   - open-cluster-management
diff --git a/values-region-one.yaml b/values-region-one.yaml
index a787166..fac7a4e 100644
--- a/values-region-one.yaml
+++ b/values-region-one.yaml
@@ -6,10 +6,7 @@ global:
 
 clusterGroup:
   name: region-one
-
-  proposedOptions:
-    manageGitops: False
-    isHubCluster: False
+  isHubCluster: false
 
   namespaces:
     - multicloud-gitops-region-one
diff --git a/values-region-two.yaml b/values-region-two.yaml
deleted file mode 100644
index 12e0b1d..0000000
--- a/values-region-two.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-global:
-  options:
-    useCSV: True
-    syncPolicy: Automatic
-    installPlanApproval: Automatic
-
-site:
-  name: region-one
-
-  proposedOptions:
-    manageGitops: False
-    isHubCluster: False
-
-  namespaces:
-
-  subscriptions:
-
-  projects:
-
-  applications:
-
-#
-#  To have apps in multiple flavors, use namespaces and use helm overrides as appropriate
-#
-#  - name: pipelines
-#    namespace: production
-#    project: datacenter
-#    path: applications/pipeline
-#    repoURL: https://github.com/you/applications.git
-#    targetRevision: stable
-#    overrides:
-#    - name: myparam
-#      value: myparam
-#
-#  - name: pipelines
-#    namespace: staging
-#    project: datacenter
-#    path: applications/pipeline
-#    repoURL: https://github.com/you/applications.git
-#    targetRevision: main
-#
-#   Additional applications
-#   Be sure to include additional resources your apps will require
-#   +X machines
-#   +Y RAM
-#   +Z CPU
-#  - name: vendor-app
-#    namespace: default
-#    project: vendor
-#    path: path/to/myapp
-#    repoURL: https://github.com/vendor/applications.git
-#    targetRevision: main
-
-#  managedSites:
-#  - name: factory
-#    # repoURL: https://github.com/dagger-refuse-cool/manuela-factory.git
-#    targetRevision: main
-#    path: applications/factory
-#    helmOverrides:
-#    - name: site.isHubCluster
-#      value: false
-#    clusterSelector:
-#      matchExpressions:
-#      - key: vendor
-#        operator: In
-#        values:
-#          - OpenShift