diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 555802c..a33abc1 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -14,6 +14,8 @@ Default always defined top-level variables for helm charts
   value: {{ $.Values.global.pattern }}
 - name: global.clusterDomain
   value: {{ $.Values.global.clusterDomain }}
+- name: global.localClusterName
+  value: {{ $.Values.global.localClusterName }}
 - name: global.clusterVersion
   value: "{{ $.Values.global.clusterVersion }}"
 - name: global.clusterPlatform
@@ -54,6 +56,9 @@ Default always defined valueFiles to be included in Applications
 {{- if $.Values.global.clusterVersion }}
 - "/values-{{ $.Values.global.clusterVersion }}-{{ $.Values.clusterGroup.name }}.yaml"
 {{- end }}
+{{- if $.Values.global.localClusterName }}
+- "/values-{{ $.Values.global.localClusterName }}.yaml"
+{{- end }}
 {{- if $.Values.global.extraValueFiles }}
 {{- range $.Values.global.extraValueFiles }}
 - {{ . | quote }}
@@ -103,6 +108,9 @@ Default always defined valueFiles to be included in Applications but with a pref
 {{- if $.Values.global.clusterVersion }}
 - "$patternref/values-{{ $.Values.global.clusterVersion }}-{{ $.Values.clusterGroup.name }}.yaml"
 {{- end }}
+{{- if $.Values.global.localClusterName }}
+- "$patternref/values-{{ $.Values.global.localClusterName }}.yaml"
+{{- end }}
 {{- if $.Values.global.extraValueFiles }}
 {{- range $.Values.global.extraValueFiles }}
 - "$patternref/{{ . }}"
diff --git a/tests/application_multi_source_test.yaml b/tests/application_multi_source_test.yaml
index 3b2d009..434bd7f 100644
--- a/tests/application_multi_source_test.yaml
+++ b/tests/application_multi_source_test.yaml
@@ -62,7 +62,7 @@ tests:
           value: acm
         lengthEqual:
           path: spec.sources[1].helm.parameters
-          count: 16
+          count: 17
       - documentSelector:
           path: metadata.name
           value: vault
@@ -96,4 +96,4 @@ tests:
           value: acm
         lengthEqual:
           path: spec.sources[1].helm.parameters
-          count: 18
+          count: 19
diff --git a/values.schema.json b/values.schema.json
index ba2ea16..1108fcb 100644
--- a/values.schema.json
+++ b/values.schema.json
@@ -770,7 +770,7 @@
         },
         "image": {
           "type": "string",
-          "default": "registry.redhat.io/ansible-automation-platform-22/ee-supported-rhel8:latest"
+          "default": "quay.io/validatedpatterns/imperative-container:v1"
         },
         "namespace": {
           "type": "string",
@@ -868,7 +868,7 @@
         },
         "image": {
           "type": "string",
-          "default": "registry.redhat.io/ansible-automation-platform-22/ee-supported-rhel8:latest"
+          "default": "quay.io/validatedpatterns/imperative-container:v1"
         },
         "tags": {
           "type": "string"