diff --git a/chart/gameshelf/templates/deployment.yaml b/chart/gameshelf/templates/deployment.yaml
index 3190ca6..110f937 100644
--- a/chart/gameshelf/templates/deployment.yaml
+++ b/chart/gameshelf/templates/deployment.yaml
@@ -25,12 +25,10 @@ spec:
       {{- end }}
       containers:
         - name: gameshelf
-          {{- if .Values.image.registry }}
-          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          {{- else if .Values.imageProxy.host }}
-          image: "{{ .Values.imageProxy.host }}/proxy/{{ .Values.imageProxy.appSlug }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          {{- if .Values.imageProxy.host }}
+          image: "{{ .Values.imageProxy.host }}/proxy/{{ .Values.imageProxy.appSlug }}/{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           {{- else }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
diff --git a/chart/gameshelf/values.yaml b/chart/gameshelf/values.yaml
index 00d8a98..ed2b399 100644
--- a/chart/gameshelf/values.yaml
+++ b/chart/gameshelf/values.yaml
@@ -14,8 +14,8 @@ imageProxy:
   appSlug: gameshelf
 
 image:
-  registry: ""  # When set, used directly as registry (EC installs set this via helmchart.yaml)
-  repository: ghcr.io/aa-replicated/gameshelf
+  registry: "ghcr.io"
+  repository: aa-replicated/gameshelf
   tag: ""
   pullPolicy: Always
 
diff --git a/helmchart.yaml b/helmchart.yaml
index e50ccc0..e2ff42a 100644
--- a/helmchart.yaml
+++ b/helmchart.yaml
@@ -12,25 +12,20 @@ spec:
     siteColor: repl{{ ConfigOption `site_color`}}
     customBrandingEnabled: repl{{ LicenseFieldValue `custom_branding_enabled` }}
     image:
-      registry: 'repl{{ ReplicatedImageRegistry "ghcr.io/aa-replicated/gameshelf" }}'
-      repository: 'repl{{ ReplicatedImageRepository "ghcr.io/aa-replicated/gameshelf" }}'
+      registry: 'repl{{ ReplicatedImageRegistry "ghcr.io" }}'
       pullPolicy: IfNotPresent
     replicated:
       image:
-        registry: 'repl{{ ReplicatedImageRegistry "proxy.replicated.com/library/replicated-sdk-image" }}'
-        repository: 'repl{{ ReplicatedImageRepository "proxy.replicated.com/library/replicated-sdk-image" }}'
+        registry: 'repl{{ ReplicatedImageRegistry (HelmValue ".replicated.image.registry") }}'
     postgresql:
       image:
-        registry: 'repl{{ ReplicatedImageRegistry "index.docker.io/bitnami/postgresql" }}'
-        repository: 'repl{{ ReplicatedImageRepository "index.docker.io/bitnami/postgresql" }}'
+        registry: 'repl{{ ReplicatedImageRegistry "index.docker.io" }}'
       volumePermissions:
         image:
-          registry: 'repl{{ ReplicatedImageRegistry "index.docker.io/bitnami/os-shell" }}'
-          repository: 'repl{{ ReplicatedImageRepository "index.docker.io/bitnami/os-shell" }}'
+          registry: 'repl{{ ReplicatedImageRegistry "index.docker.io" }}'
     redis:
       image:
-        registry: 'repl{{ ReplicatedImageRegistry "index.docker.io/bitnami/redis" }}'
-        repository: 'repl{{ ReplicatedImageRepository "index.docker.io/bitnami/redis" }}'
+        registry: 'repl{{ ReplicatedImageRegistry "index.docker.io" }}'
   builder:
     postgresql:
       image: