diff --git a/charts/wikijs/templates/common.yaml b/charts/wikijs/templates/common.yaml
index 9a13270..b8d48c9 100644
--- a/charts/wikijs/templates/common.yaml
+++ b/charts/wikijs/templates/common.yaml
@@ -1,3 +1,5 @@
+{{ include "bjw-s.common.loader.init" . }}
+
 {{/* Append the hardcoded settings */}}
 {{- define "wikijs.harcodedValues" -}}
 persistence:
@@ -72,11 +74,7 @@ controllers:
               
 {{- end -}}
 
-{{- $tmplVars := deepCopy . -}}
-{{ include "bjw-s.common.loader.init" $tmplVars }}
-{{- $defaultValues := include "wikijs.harcodedValues" $tmplVars | fromYaml -}}
-{{- $_ := mustMerge .Values $defaultValues -}}
+{{- $_ := mergeOverwrite .Values (include "wikijs.hardcodedValues" . | fromYaml) -}}
 
 {{/* Render the templates */}}
-{{ include "bjw-s.common.loader.init" . }}
 {{ include "bjw-s.common.loader.generate" . }}