diff --git a/charts/incubator/sogo/Chart.yaml b/charts/incubator/sogo/Chart.yaml
index 906a6f23bfb..6a8fa8051a1 100644
--- a/charts/incubator/sogo/Chart.yaml
+++ b/charts/incubator/sogo/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 5.2.0"
+appVersion: 5.2.0
 dependencies:
 - name: common
   repository: https://truecharts.org/
@@ -27,4 +27,4 @@ name: sogo
 sources:
 - https://www.sogo.nu/
 type: application
-version: 2.0.2
+version: 2.0.3
diff --git a/charts/incubator/sogo/SCALE/ix_values.yaml b/charts/incubator/sogo/SCALE/ix_values.yaml
index b313b47a0ae..9d12a1cd2a6 100644
--- a/charts/incubator/sogo/SCALE/ix_values.yaml
+++ b/charts/incubator/sogo/SCALE/ix_values.yaml
@@ -6,11 +6,16 @@
 image:
   repository: ghcr.io/truecharts/sogo
   pullPolicy: IfNotPresent
-  tag: "v5.2.0"
+  tag: v5.2.0
+
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: 13.4-alpine
 
 initContainers:
   - name: init-postgresdb
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
diff --git a/charts/incubator/sogo/values.yaml b/charts/incubator/sogo/values.yaml
index eb480993995..f5fbabf8e3b 100644
--- a/charts/incubator/sogo/values.yaml
+++ b/charts/incubator/sogo/values.yaml
@@ -2,7 +2,12 @@
 image:
   repository: ghcr.io/truecharts/sogo
   pullPolicy: IfNotPresent
-  tag: "v5.2.0"
+  tag: v5.2.0
+
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: 13.4-alpine
 
 # -- services
 service:
@@ -15,7 +20,7 @@ service:
 initContainers:
   # -- wait for database before starting sogo
   init-postgresdb:
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository }}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
diff --git a/charts/library/common/templates/addons/code-server/_container.tpl b/charts/library/common/templates/addons/code-server/_container.tpl
index 23af35efda1..4fef39213a4 100644
--- a/charts/library/common/templates/addons/code-server/_container.tpl
+++ b/charts/library/common/templates/addons/code-server/_container.tpl
@@ -6,8 +6,8 @@ The code-server sidecar container to be inserted.
 {{- fail "At least 1 volumeMount is required for codeserver container" }}
 {{- end -}}
 name: codeserver
-image: "{{ .Values.addons.codeserver.image.repository }}:{{ .Values.addons.codeserver.image.tag }}"
-imagePullPolicy: {{ .Values.addons.codeserver.pullPolicy }}
+image: "{{ .Values.codeserverImage.repository }}:{{ .Values.codeserverImage.tag }}"
+imagePullPolicy: {{ .Values.codeserverImage.pullPolicy }}
 {{- with .Values.addons.codeserver.securityContext }}
 securityContext:
   {{- toYaml . | nindent 2 }}
diff --git a/charts/library/common/templates/addons/netshoot/_container.tpl b/charts/library/common/templates/addons/netshoot/_container.tpl
index 3e7a429cff4..a44bebb66bb 100644
--- a/charts/library/common/templates/addons/netshoot/_container.tpl
+++ b/charts/library/common/templates/addons/netshoot/_container.tpl
@@ -3,8 +3,8 @@ The netshoot sidecar container to be inserted.
 */}}
 {{- define "common.addon.netshoot.container" -}}
 name: netshoot
-image: "{{ .Values.addons.netshoot.image.repository }}:{{ .Values.addons.netshoot.image.tag }}"
-imagePullPolicy: {{ .Values.addons.netshoot.pullPolicy }}
+image: "{{ .Values.netshootImage.repository }}:{{ .Values.netshootImage.tag }}"
+imagePullPolicy: {{ .Values.netshootImage.pullPolicy }}
 {{- with .Values.addons.netshoot.securityContext }}
 securityContext:
   {{- toYaml . | nindent 2 }}
diff --git a/charts/library/common/templates/addons/promtail/_container.tpl b/charts/library/common/templates/addons/promtail/_container.tpl
index f4936bc4988..2cfbe17a404 100644
--- a/charts/library/common/templates/addons/promtail/_container.tpl
+++ b/charts/library/common/templates/addons/promtail/_container.tpl
@@ -6,8 +6,8 @@ The promtail sidecar container to be inserted.
 {{- fail "At least 1 volumeMount is required for the promtail container" }}
 {{- end -}}
 name: promtail
-image: "{{ .Values.addons.promtail.image.repository }}:{{ .Values.addons.promtail.image.tag }}"
-imagePullPolicy: {{ .Values.addons.promtail.pullPolicy }}
+image: "{{ .Values.promtailImage.repository }}:{{ .Values.promtailImage.tag }}"
+imagePullPolicy: {{ .Values.promtailImage.pullPolicy }}
 {{- with .Values.addons.promtail.securityContext }}
 securityContext:
   {{- toYaml . | nindent 2 }}
diff --git a/charts/library/common/templates/addons/vpn/openvpn/_container.tpl b/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
index b06793a9b48..0e7b3f96bdb 100644
--- a/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
+++ b/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
@@ -3,8 +3,8 @@ The OpenVPN sidecar container to be inserted.
 */}}
 {{- define "common.addon.openvpn.container" -}}
 name: openvpn
-image: "{{ .Values.addons.vpn.openvpn.image.repository }}:{{ .Values.addons.vpn.openvpn.image.tag }}"
-imagePullPolicy: {{ .Values.addons.vpn.openvpn.pullPolicy }}
+image: "{{ .Values.openvpnImage.repository }}:{{ .Values.openvpnImage.tag }}"
+imagePullPolicy: {{ .Values.openvpnImage.pullPolicy }}
 {{- with .Values.addons.vpn.securityContext }}
 securityContext:
   {{- toYaml . | nindent 2 }}
diff --git a/charts/library/common/templates/addons/vpn/wireguard/_container.tpl b/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
index 36b3026035c..3c5496675eb 100644
--- a/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
+++ b/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
@@ -3,8 +3,8 @@ The Wireguard sidecar container to be inserted.
 */}}
 {{- define "common.addon.wireguard.container" -}}
 name: wireguard
-image: "{{ .Values.addons.vpn.wireguard.image.repository }}:{{ .Values.addons.vpn.wireguard.image.tag }}"
-imagePullPolicy: {{ .Values.addons.vpn.wireguard.pullPolicy }}
+image: "{{ .Values.wireguardImage.repository }}:{{ .Values.wireguardImage.tag }}"
+imagePullPolicy: {{ .Values.wireguardImage.pullPolicy }}
 {{- with .Values.addons.vpn.securityContext }}
 securityContext:
   {{- toYaml . | nindent 2 }}
diff --git a/charts/library/common/templates/lib/controller/_autopermissions.yaml b/charts/library/common/templates/lib/controller/_autopermissions.yaml
index ef6478cf0c6..77e5496bf9e 100644
--- a/charts/library/common/templates/lib/controller/_autopermissions.yaml
+++ b/charts/library/common/templates/lib/controller/_autopermissions.yaml
@@ -17,7 +17,7 @@ before chart installation.
   {{- end -}}
 {{- end }}
 - name: autopermissions
-  image: alpine:3.3
+  image: {{ .Values.alpineImage.repository }}:{{ .Values.alpineImage.tag }}
   securityContext:
     allowPrivilegeEscalation: false
     runAsUser: 0
diff --git a/charts/library/common/values.yaml b/charts/library/common/values.yaml
index 8bce73c6c1d..dad717a4da3 100644
--- a/charts/library/common/values.yaml
+++ b/charts/library/common/values.yaml
@@ -1,3 +1,57 @@
+# -- OpenVPN specific configuration
+# @default -- See below
+openvpnImage:
+  # -- Specify the openvpn client image
+  repository: dperson/openvpn-client
+  # -- Specify the openvpn client image tag
+  tag: latest
+  # -- Specify the openvpn client image pull policy
+  pullPolicy: IfNotPresent
+
+
+# -- WireGuard specific configuration
+# @default -- See below
+wireguardImage:
+  # -- Specify the WireGuard image
+  repository: ghcr.io/k8s-at-home/wireguard
+  # -- Specify the WireGuard image tag
+  tag: v1.0.20210424
+  # -- Specify the WireGuard image pull policy
+  pullPolicy: IfNotPresent
+
+promtailImage:
+  # -- Specify the promtail image
+  repository: grafana/promtail
+  # -- Specify the promtail image tag
+  tag: 2.2.0
+  # -- Specify the promtail image pull policy
+  pullPolicy: IfNotPresent
+
+
+netshootImage:
+  # -- Specify the netshoot image
+  repository: nicolaka/netshoot
+  # -- Specify the netshoot image tag
+  tag: latest
+  # -- Specify the netshoot image pull policy
+  pullPolicy: Always
+
+codeserverImage:
+  # -- Specify the code-server image
+  repository: codercom/code-server
+  # -- Specify the code-server image tag
+  tag: 3.9.2
+  # -- Specify the code-server image pull policy
+  pullPolicy: IfNotPresent
+
+alpineImage:
+  # -- Specify the code-server image
+  repository: alpine
+  # -- Specify the code-server image tag
+  tag: "3.3"
+  # -- Specify the code-server image pull policy
+  pullPolicy: IfNotPresent
+
 global:
   # -- Set an override for the prefix of the fullname
   nameOverride:
@@ -641,30 +695,14 @@ addons:
     # -- OpenVPN specific configuration
     # @default -- See below
     openvpn:
-      image:
-        # -- Specify the openvpn client image
-        repository: dperson/openvpn-client
-        # -- Specify the openvpn client image tag
-        tag: latest
-        # -- Specify the openvpn client image pull policy
-        pullPolicy: IfNotPresent
-
       # -- Credentials to connect to the VPN Service (used with -a)
       auth:  # "user;password"
       # -- Optionally specify an existing secret that contains the credentials.
       # Credentials should be stored under the `VPN_AUTH` key
       authSecret:  # my-vpn-secret
-
     # -- WireGuard specific configuration
     # @default -- See below
-    wireguard:
-      image:
-        # -- Specify the WireGuard image
-        repository: ghcr.io/k8s-at-home/wireguard
-        # -- Specify the WireGuard image tag
-        tag: v1.0.20210424
-        # -- Specify the WireGuard image pull policy
-        pullPolicy: IfNotPresent
+    wireguard: {}
 
     # -- Set the VPN container securityContext
     # @default -- See values.yaml
@@ -690,7 +728,6 @@ addons:
       # See Kubernetes documentation for options.
       hostPathType: "File"
 
-
     # -- Provide custom up/down scripts that can be used by the vpn configuration.
     # @default -- See values.yaml
     scripts:
@@ -709,18 +746,9 @@ addons:
     # -- Enable running a code-server container in the pod
     enabled: false
 
-    image:
-      # -- Specify the code-server image
-      repository: codercom/code-server
-      # -- Specify the code-server image tag
-      tag: 3.9.2
-      # -- Specify the code-server image pull policy
-      pullPolicy: IfNotPresent
-
     # -- Set any environment variables for code-server here
     env: {}
       # TZ: UTC
-
     # -- Set codeserver command line arguments.
     # Consider setting --user-data-dir to a persistent location to preserve code-server setting changes
     args:
@@ -794,24 +822,12 @@ addons:
   promtail:
     # -- Enable running a promtail container in the pod
     enabled: false
-
-    image:
-      # -- Specify the promtail image
-      repository: grafana/promtail
-      # -- Specify the promtail image tag
-      tag: 2.2.0
-      # -- Specify the promtail image pull policy
-      pullPolicy: IfNotPresent
-
     # -- Set any environment variables for promtail here
     env: {}
-
     # -- Set promtail command line arguments
     args: []
-
     # -- The URL to Loki
     loki: ""
-
     # -- The paths to logs on the volume
     logs: []
     # - name: log
@@ -833,14 +849,6 @@ addons:
     # -- Enable running a netshoot container in the pod
     enabled: false
 
-    image:
-      # -- Specify the netshoot image
-      repository: nicolaka/netshoot
-      # -- Specify the netshoot image tag
-      tag: latest
-      # -- Specify the netshoot image pull policy
-      pullPolicy: Always
-
     # -- Set any environment variables for netshoot here
     env: {}
 
diff --git a/charts/stable/authelia/SCALE/ix_values.yaml b/charts/stable/authelia/SCALE/ix_values.yaml
index 105cbbad0fc..95e586cdcd3 100644
--- a/charts/stable/authelia/SCALE/ix_values.yaml
+++ b/charts/stable/authelia/SCALE/ix_values.yaml
@@ -9,6 +9,12 @@ image:
   pullPolicy: IfNotPresent
   tag: "4.30.4"
 
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: 13.4-alpine
+
+
 enableServiceLinks: false
 
 command: ["authelia"]
@@ -17,7 +23,7 @@ args: ["--config=/configuration.yaml"]
 
 initContainers:
   init-postgresdb:
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
diff --git a/charts/stable/authelia/values.yaml b/charts/stable/authelia/values.yaml
index abbe3530f2c..d125872ffa0 100644
--- a/charts/stable/authelia/values.yaml
+++ b/charts/stable/authelia/values.yaml
@@ -5,6 +5,12 @@ image:
   pullPolicy: IfNotPresent
   tag: "4.30.4"
 
+
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: 13.4-alpine
+
 command: ["authelia"]
 args: ["--config=/configuration.yaml"]
 
@@ -21,7 +27,7 @@ service:
 
 initContainers:
   init-postgresdb:
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
diff --git a/charts/stable/fireflyiii/SCALE/ix_values.yaml b/charts/stable/fireflyiii/SCALE/ix_values.yaml
index d6745dbd4b6..f6c6a726b4c 100644
--- a/charts/stable/fireflyiii/SCALE/ix_values.yaml
+++ b/charts/stable/fireflyiii/SCALE/ix_values.yaml
@@ -9,9 +9,15 @@ image:
   pullPolicy: IfNotPresent
   tag: version-5.5.12
 
+
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: 13.4-alpine
+
 initContainers:
   init-postgresdb:
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
diff --git a/charts/stable/fireflyiii/values.yaml b/charts/stable/fireflyiii/values.yaml
index dbb0a8f527f..ffb529e4771 100644
--- a/charts/stable/fireflyiii/values.yaml
+++ b/charts/stable/fireflyiii/values.yaml
@@ -5,6 +5,12 @@ image:
   pullPolicy: IfNotPresent
   tag: version-5.5.12
 
+
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: 13.4-alpine
+
 strategy:
   type: Recreate
 
@@ -22,7 +28,7 @@ service:
 
 initContainers:
   init-postgresdb:
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
diff --git a/charts/stable/nextcloud/SCALE/ix_values.yaml b/charts/stable/nextcloud/SCALE/ix_values.yaml
index 7b5f52dcca7..93109e95d17 100644
--- a/charts/stable/nextcloud/SCALE/ix_values.yaml
+++ b/charts/stable/nextcloud/SCALE/ix_values.yaml
@@ -9,6 +9,11 @@ image:
   pullPolicy: IfNotPresent
   tag: 22.1.1
 
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: 13.4-alpine
+
 strategy:
   type: Recreate
 
@@ -43,7 +48,7 @@ envValueFrom:
 
 initContainers:
   init-postgresdb:
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
@@ -56,7 +61,6 @@ initContainers:
             name: dbcreds
             key: plainhost
 
-
 # -- Probe configuration
 # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
 # @default -- See below
diff --git a/charts/stable/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml
index 5609c5c45d8..9dc05f21365 100644
--- a/charts/stable/nextcloud/values.yaml
+++ b/charts/stable/nextcloud/values.yaml
@@ -5,6 +5,11 @@ image:
   pullPolicy: IfNotPresent
   tag: 22.1.1
 
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: "13.1"
+
 strategy:
   type: Recreate
 
@@ -69,7 +74,7 @@ persistence:
 
 initContainers:
   init-postgresdb:
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
diff --git a/charts/stable/vaultwarden/SCALE/ix_values.yaml b/charts/stable/vaultwarden/SCALE/ix_values.yaml
index 21d89a891ca..5c0fe02463c 100644
--- a/charts/stable/vaultwarden/SCALE/ix_values.yaml
+++ b/charts/stable/vaultwarden/SCALE/ix_values.yaml
@@ -9,6 +9,12 @@ image:
   pullPolicy: IfNotPresent
   tag: 1.22.2
 
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: 13.4-alpine
+
+
 envTpl:
   DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}"
 
@@ -20,7 +26,7 @@ envFrom:
 
 initContainers:
   init-postgresdb:
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository }}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
diff --git a/charts/stable/vaultwarden/values.yaml b/charts/stable/vaultwarden/values.yaml
index d0903bad147..ffe8693f502 100644
--- a/charts/stable/vaultwarden/values.yaml
+++ b/charts/stable/vaultwarden/values.yaml
@@ -5,6 +5,12 @@ image:
   pullPolicy: IfNotPresent
   tag: 1.22.2
 
+postgresqlImage:
+  repository: postgres
+  pullPolicy: IfNotPresent
+  tag: 13.4-alpine
+
+
 strategy:
   type: Recreate
 
@@ -91,7 +97,7 @@ ingress:
 
 initContainers:
   init-postgresdb:
-    image: postgres:13.1
+    image: "{{ .Values.postgresqlImage.repository }}:{{ .Values.postgresqlImage.tag }}"
     command:
       - "sh"
       - "-c"
diff --git a/tools/build-release.sh b/tools/build-release.sh
index 23aa7cd389b..f5b85b84306 100755
--- a/tools/build-release.sh
+++ b/tools/build-release.sh
@@ -123,7 +123,7 @@ sync_tag() {
     local train="$3"
     local chartversion="$4"
     echo "Attempting to sync primary tag with appversion for: ${chartname}"
-    local tag="$(cat ${chart}/values.yaml | grep "^  tag: " | awk -F" " '{ print $2 }')"
+    local tag="$(cat ${chart}/values.yaml | grep '^  tag: ' | awk -F" " '{ print $2 }' | head -1)"
     tag="${tag:-auto}"
     tag="${tag#*release-}"
     tag="${tag#*version-}"