diff --git a/charts/incubator/sogo/templates/common.yaml b/charts/incubator/sogo/templates/common.yaml
index 51e8201cc68..6fcc8fbce16 100644
--- a/charts/incubator/sogo/templates/common.yaml
+++ b/charts/incubator/sogo/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Render config and secrets for sogo */}}
 {{- include "sogo.config" . }}
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index b83f744f45a..9264602f925 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 8.3.1
+version: 8.3.2
diff --git a/charts/library/common/templates/_all.tpl b/charts/library/common/templates/_all.tpl
index 43b1917bbd3..887cfea96dc 100644
--- a/charts/library/common/templates/_all.tpl
+++ b/charts/library/common/templates/_all.tpl
@@ -2,8 +2,8 @@
 Main entrypoint for the common library chart. It will render all underlying templates based on the provided values.
 */}}
 {{- define "common.all" -}}
-  {{- /* Merge the local chart values and the common chart defaults */ -}}
-  {{- include "common.values.setup" . }}
+  {{- /* Generate chart and dependency values */ -}}
+  {{- include "common.setup" . }}
 
   {{- /* Enable code-server add-on if required */ -}}
   {{- if .Values.addons.codeserver.enabled }}
@@ -28,9 +28,6 @@ Main entrypoint for the common library chart. It will render all underlying temp
   {{- /* Build the templates */ -}}
   {{- include "common.pvc" . }}
 
-  {{- /* Autogenerate postgresql passwords if needed */ -}}
-  {{- include "common.dependencies.postgresql.injector" . }}
-
   {{- if .Values.serviceAccount.create -}}
     {{- include "common.serviceAccount" . }}
   {{- end -}}
diff --git a/charts/library/common/templates/lib/chart/_setup.tpl b/charts/library/common/templates/lib/chart/_setup.tpl
new file mode 100644
index 00000000000..bcdff22b3d4
--- /dev/null
+++ b/charts/library/common/templates/lib/chart/_setup.tpl
@@ -0,0 +1,7 @@
+{{- define "common.setup" -}}
+{{- /* Merge the local chart values and the common chart defaults */ -}}
+{{- include "common.values" . }}
+
+{{- /* Autogenerate postgresql passwords if needed */ -}}
+{{- include "common.dependencies.postgresql.injector" . }}
+{{- end -}}
diff --git a/charts/library/common/templates/lib/chart/_values.tpl b/charts/library/common/templates/lib/chart/_values.tpl
index 90de0dac775..c14bb352c7f 100644
--- a/charts/library/common/templates/lib/chart/_values.tpl
+++ b/charts/library/common/templates/lib/chart/_values.tpl
@@ -1,5 +1,5 @@
 {{/* Merge the local chart values and the common chart defaults */}}
-{{- define "common.values.setup" -}}
+{{- define "common.values" -}}
   {{- if .Values.common -}}
     {{- $defaultValues := deepCopy .Values.common -}}
     {{- $userValues := deepCopy (omit .Values "common") -}}
diff --git a/charts/stable/authelia/templates/common.yaml b/charts/stable/authelia/templates/common.yaml
index a31b342f9a0..e12894b34b2 100644
--- a/charts/stable/authelia/templates/common.yaml
+++ b/charts/stable/authelia/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Render configmap for authelia */}}
 {{- include "authelia.configmap" . }}
diff --git a/charts/stable/fireflyiii/templates/common.yaml b/charts/stable/fireflyiii/templates/common.yaml
index 64e027ac0fa..5c5aa574829 100644
--- a/charts/stable/fireflyiii/templates/common.yaml
+++ b/charts/stable/fireflyiii/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}
diff --git a/charts/stable/freeradius/templates/common.yaml b/charts/stable/freeradius/templates/common.yaml
index 64e027ac0fa..5c5aa574829 100644
--- a/charts/stable/freeradius/templates/common.yaml
+++ b/charts/stable/freeradius/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}
diff --git a/charts/stable/gitea/templates/common.yaml b/charts/stable/gitea/templates/common.yaml
index be409737195..31f989cc560 100644
--- a/charts/stable/gitea/templates/common.yaml
+++ b/charts/stable/gitea/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Render secrets for gitea */}}
 {{- include "gitea.secrets" . }}
diff --git a/charts/stable/k8s-gateway/templates/common.yaml b/charts/stable/k8s-gateway/templates/common.yaml
index 9c42c9fb446..e2b0bbcfea5 100644
--- a/charts/stable/k8s-gateway/templates/common.yaml
+++ b/charts/stable/k8s-gateway/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 
 {{/* Render configmap for nextcloud */}}
diff --git a/charts/stable/littlelink/templates/common.yaml b/charts/stable/littlelink/templates/common.yaml
index d5c310d4859..be87c2524a0 100644
--- a/charts/stable/littlelink/templates/common.yaml
+++ b/charts/stable/littlelink/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}
diff --git a/charts/stable/mosquitto/templates/common.yaml b/charts/stable/mosquitto/templates/common.yaml
index 15d4d961a1c..5929163cdaf 100644
--- a/charts/stable/mosquitto/templates/common.yaml
+++ b/charts/stable/mosquitto/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Append the configMap volume to the volumes */}}
 {{- define "mosquitto.configVolume" -}}
diff --git a/charts/stable/nextcloud/templates/common.yaml b/charts/stable/nextcloud/templates/common.yaml
index 53b4b7b25be..be2911a68ba 100644
--- a/charts/stable/nextcloud/templates/common.yaml
+++ b/charts/stable/nextcloud/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Render configmap for nextcloud */}}
 {{- include "nextcloud.configmap" . }}
diff --git a/charts/stable/openldap/templates/common.yaml b/charts/stable/openldap/templates/common.yaml
index c9df40ff35f..1e13e008365 100644
--- a/charts/stable/openldap/templates/common.yaml
+++ b/charts/stable/openldap/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}
diff --git a/charts/stable/pihole/templates/common.yaml b/charts/stable/pihole/templates/common.yaml
index 795166e50a2..141f20a28ec 100644
--- a/charts/stable/pihole/templates/common.yaml
+++ b/charts/stable/pihole/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Render configmap for pihole */}}
 {{- include "pihole.configmap" . }}
diff --git a/charts/stable/traefik/templates/common.yaml b/charts/stable/traefik/templates/common.yaml
index a3ba841bdd7..c29a7233d6f 100644
--- a/charts/stable/traefik/templates/common.yaml
+++ b/charts/stable/traefik/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{- if .Values.metrics }}
 {{- if .Values.metrics.prometheus }}
diff --git a/charts/stable/vaultwarden/templates/common.yaml b/charts/stable/vaultwarden/templates/common.yaml
index 6af2072556b..30c51a2e0bf 100644
--- a/charts/stable/vaultwarden/templates/common.yaml
+++ b/charts/stable/vaultwarden/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 
 {{/* Render configmap for vaultwarden */}}