diff --git a/base-values/infra.yaml b/base-values/infra.yaml
index 6f30561..ce85121 100644
--- a/base-values/infra.yaml
+++ b/base-values/infra.yaml
@@ -1,5 +1,6 @@
 commons:
-  masterPassword:
+  # -- needed, but could be set with componentCommons.helm.release.valuesFrom
+  # masterPassword:
   auth:
     enabled: false
     type: "authentik"
diff --git a/base/templates/release.yaml b/base/templates/release.yaml
index 12d694d..e89629b 100644
--- a/base/templates/release.yaml
+++ b/base/templates/release.yaml
@@ -28,6 +28,12 @@ spec:
       optional: true
       valuesKey: init
       targetPath: init.version
+    {{- with $.Values.componentCommons.helm.release.valuesFrom }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+    {{- with $config.valuesFrom }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   values:
     {{- $config.values | default (dict) | mergeOverwrite (dict "commons" $.Values.commons "global" $.Values.global) | toYaml | nindent 4 }}
 {{- end }}
diff --git a/base/values.yaml b/base/values.yaml
index 7284880..4ab8912 100644
--- a/base/values.yaml
+++ b/base/values.yaml
@@ -10,4 +10,9 @@ commons:
       test: {}
       upgrade: {}
 
+componentCommons:
+  helm:
+    release:
+      valuesFrom: []
+
 components: {}