diff --git a/charts/incubator/icantbelieveitsnotvaletudo/templates/common.yaml b/charts/incubator/icantbelieveitsnotvaletudo/templates/common.yaml
index ee5849d43d2..870213ec49c 100644
--- a/charts/incubator/icantbelieveitsnotvaletudo/templates/common.yaml
+++ b/charts/incubator/icantbelieveitsnotvaletudo/templates/common.yaml
@@ -1,4 +1,4 @@
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Append the hardcoded settings */}}
 {{- define "icantbelieveitsnotvaletudo.harcodedValues" -}}
@@ -27,4 +27,4 @@ service:
 {{- $_ := mergeOverwrite .Values (include "icantbelieveitsnotvaletudo.harcodedValues" . | fromYaml) -}}
 
 {{/* Render the templates */}}
-{{ include "common.all" . }}
+{{ include "common.postSetup" . }}
diff --git a/charts/incubator/valheim/templates/common.yaml b/charts/incubator/valheim/templates/common.yaml
index 944c76f271a..ed68b8e6fed 100644
--- a/charts/incubator/valheim/templates/common.yaml
+++ b/charts/incubator/valheim/templates/common.yaml
@@ -1,4 +1,4 @@
-{{- include "common.values.setup" . }}
+{{- include "common.setup" . }}
 
 {{/* Append the hardcoded settings */}}
 {{- define "valheim.hardcodedValues" -}}
@@ -13,4 +13,4 @@ probes:
 {{- $_ := mergeOverwrite .Values (include "valheim.hardcodedValues" . | fromYaml) -}}
 
 {{/* Render the templates */}}
-{{ include "common.all" . }}
+{{ include "common.postSetup" . }}
diff --git a/charts/incubator/zigbee2mqtt/templates/common.yaml b/charts/incubator/zigbee2mqtt/templates/common.yaml
index f65ea7ffba2..e13f800a2f0 100644
--- a/charts/incubator/zigbee2mqtt/templates/common.yaml
+++ b/charts/incubator/zigbee2mqtt/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 "zigbee2mqtt.settingsVolume" -}}
@@ -14,4 +14,4 @@ volumeSpec:
 {{- $_ := set .Values.persistence "zigbee2mqtt-settings" (include "zigbee2mqtt.settingsVolume" . | fromYaml) -}}
 
 {{/* Render the templates */}}
-{{ include "common.all" . }}
+{{ include "common.postSetup" . }}