diff --git a/charts/woodpecker/charts/agent/templates/statefulset.yaml b/charts/woodpecker/charts/agent/templates/statefulset.yaml
index ac6b9b06..4034e3a8 100644
--- a/charts/woodpecker/charts/agent/templates/statefulset.yaml
+++ b/charts/woodpecker/charts/agent/templates/statefulset.yaml
@@ -69,7 +69,14 @@ spec:
           env:
             {{- range $key, $value := .Values.env }}
             - name: {{ $key }}
+              {{- if kindIs "string" $value }}
               value: {{ $value | quote }}
+              {{- else if kindIs "map" $value }}
+              {{- if $value.valueFrom }}
+              valueFrom:
+                {{- toYaml $value.valueFrom | nindent 16 }}
+              {{- end }}
+              {{- end }}
             {{- end }}
           envFrom:
             {{- if .Values.mapAgentSecret }}
diff --git a/charts/woodpecker/charts/server/templates/statefulset.yaml b/charts/woodpecker/charts/server/templates/statefulset.yaml
index 7c15935b..8a65bb12 100644
--- a/charts/woodpecker/charts/server/templates/statefulset.yaml
+++ b/charts/woodpecker/charts/server/templates/statefulset.yaml
@@ -103,7 +103,14 @@ spec:
           env:
             {{- range $key, $value := .Values.env }}
             - name: {{ $key }}
+              {{- if kindIs "string" $value }}
               value: {{ $value | quote }}
+              {{- else if kindIs "map" $value }}
+              {{- if $value.valueFrom }}
+              valueFrom:
+                {{- toYaml $value.valueFrom | nindent 16 }}
+              {{- end }}
+              {{- end }}
             {{- end }}
             {{- if .Values.metrics.enabled }}
             - name: WOODPECKER_METRICS_SERVER_ADDR
diff --git a/charts/woodpecker/charts/server/values.yaml b/charts/woodpecker/charts/server/values.yaml
index 5e6cfe2b..223187b5 100644
--- a/charts/woodpecker/charts/server/values.yaml
+++ b/charts/woodpecker/charts/server/values.yaml
@@ -34,6 +34,11 @@ env:
   WOODPECKER_ADMIN: 'woodpecker,admin'
   WOODPECKER_HOST: 'https://xxxxxxx'
   # WOODPECKER_GITHUB: "true"
+  # WOODPECKER_DATABASE_DATASOURCE:
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: woodpecker-database-secret
+  #       key: datasource
 
 # -- Add extra environment variables from the secrets list
 extraSecretNamesForEnvFrom: []
diff --git a/charts/woodpecker/values.yaml b/charts/woodpecker/values.yaml
index b01b13ac..3d27c032 100644
--- a/charts/woodpecker/values.yaml
+++ b/charts/woodpecker/values.yaml
@@ -35,6 +35,11 @@ agent:
     WOODPECKER_BACKEND_K8S_POD_LABELS: ''
     WOODPECKER_BACKEND_K8S_POD_ANNOTATIONS: ''
     WOODPECKER_CONNECT_RETRY_COUNT: '1'
+  # WOODPECKER_DATABASE_DATASOURCE:
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: woodpecker-database-secret
+  #       key: datasource
 
   # -- Add extra secret that is contains environment variables
   extraSecretNamesForEnvFrom: []