diff --git a/charts/app-mendix/templates/deployment-leader.yaml b/charts/app-mendix/templates/deployment-leader.yaml
index 315dea6..45a9181 100644
--- a/charts/app-mendix/templates/deployment-leader.yaml
+++ b/charts/app-mendix/templates/deployment-leader.yaml
@@ -42,10 +42,10 @@ spec:
             - name: {{ .name | quote}}
               value: {{ .value | quote}}
           {{- end }}
-          {{- if .Values.secretEnv }}
+          {{- if .Values.secretName }}
           envFrom:
             - secretRef:
-              name: {{ template "app-mendix.fullname" $ }}
+              name: {{ .Values.secretName }}
           {{- end }}
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
diff --git a/charts/app-mendix/templates/deployment-slave.yaml b/charts/app-mendix/templates/deployment-slave.yaml
index fb94526..33461f0 100644
--- a/charts/app-mendix/templates/deployment-slave.yaml
+++ b/charts/app-mendix/templates/deployment-slave.yaml
@@ -48,10 +48,10 @@ spec:
             - name: {{ .name | quote}}
               value: {{ .value | quote}}
           {{- end }}
-          {{- if .Values.secretEnv }}
+          {{- if .Values.secretName }}
           envFrom:
             - secretRef:
-              name: {{ template "app-mendix.fullname" $ }}
+              name: {{ .Values.secretName }}
           {{- end }}
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
diff --git a/charts/app-mendix/templates/secret.yaml b/charts/app-mendix/templates/secret.yaml
deleted file mode 100644
index 232f87e..0000000
--- a/charts/app-mendix/templates/secret.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-{{- if .Values.secretEnv }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "app-mendix.fullname" . }}
-  labels:
-    {{- include "app-mendix.labels" . | nindent 4 }}
-type: Opaque
-data:
-{{- range .Values.secretEnv }}
-  {{ .name }}: {{ .value | b64enc | quote}}
-{{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/app-mendix/values.yaml b/charts/app-mendix/values.yaml
index 79b3a51..0441e5a 100644
--- a/charts/app-mendix/values.yaml
+++ b/charts/app-mendix/values.yaml
@@ -41,8 +41,6 @@ env: []
   #   value: "test-mx-app"
   # - name: S3_ENDPOINT
   #   value: "http://minio:9000"
-
-secretEnv: []
   # - name: LICENSE_ID
   #   value: xxx
   # - name: LICENSE_KEY
@@ -58,6 +56,12 @@ secretEnv: []
   # - name: S3_SECRET_ACCESS_KEY
   #   value: "accesskey"
 
+# Secret name with mendix application runtime variables. Will be loaded as pod environment variables
+#  Example data
+#  data:
+#   ADMIN_PASSWORD: SGVsbG8wMTIzY2xlYXIK (base64)
+secretName: ""
+
 nodeSelector: {}
 
 tolerations: []