diff --git a/geoserver-lb/Chart.yaml b/geoserver-lb/Chart.yaml
index 85b810f..1d3fb86 100644
--- a/geoserver-lb/Chart.yaml
+++ b/geoserver-lb/Chart.yaml
@@ -2,5 +2,5 @@ name: geoserver-lb
 apiVersion: v2
 description: A Helm chart for deploying geoserver loadbalanced
 type: application
-version: 0.4.2
+version: 0.5.0
 appVersion: "22.0.4"
diff --git a/geoserver-lb/templates/geoserver-deploy.yaml b/geoserver-lb/templates/geoserver-deploy.yaml
index 40009e2..525a125 100644
--- a/geoserver-lb/templates/geoserver-deploy.yaml
+++ b/geoserver-lb/templates/geoserver-deploy.yaml
@@ -139,6 +139,66 @@ spec:
                 name: {{ .Values.database.geodata.auth.existingSecret }}
                 key: password
                 optional: false
+        - name: DF_PGHOST
+          valueFrom:
+            secretKeyRef:
+                name: {{ .Values.database.datafeeder.auth.existingSecret }}
+                key: host
+                optional: false
+        - name: DF_PGDATABASE
+          valueFrom:
+            secretKeyRef:
+                name: {{ .Values.database.datafeeder.auth.existingSecret }}
+                key: dbname
+                optional: false
+        - name: DF_PGPORT
+          valueFrom:
+            secretKeyRef:
+                name: {{ .Values.database.datafeeder.auth.existingSecret }}
+                key: port
+                optional: false
+        - name: DF_PGUSER
+          valueFrom:
+            secretKeyRef:
+                name: {{ .Values.database.datafeeder.auth.existingSecret }}
+                key: user
+                optional: false
+        - name: DF_PGPASSWORD
+          valueFrom:
+            secretKeyRef:
+                name: {{ .Values.database.datafeeder.auth.existingSecret }}
+                key: password
+                optional: false
+        - name: GWC_PGHOST
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.database.gwc.auth.existingSecret }}
+              key: host
+              optional: false
+        - name: GWC_PGPORT
+          valueFrom:
+             secretKeyRef:
+                name: {{ .Values.database.gwc.auth.existingSecret }}
+                key: port
+                optional: false
+        - name: GWC_PGDATABASE
+          valueFrom:
+            secretKeyRef:
+                name: {{ .Values.database.gwc.auth.existingSecret }}
+                key: dbname
+                optional: false
+        - name: GWC_PGUSERNAME
+          valueFrom:
+            secretKeyRef:
+                name: {{ .Values.database.gwc.auth.existingSecret }}
+                key: user
+                optional: false
+        - name: GWC_PGPASSWORD
+          valueFrom:
+            secretKeyRef:
+                name: {{ .Values.database.gwc.auth.existingSecret }}
+                key: password
+                optional: false
         {{- with .Values.geoserver.extra_environment }}
         {{- . | toYaml | nindent 8 }}
         {{- end }}
diff --git a/geoserver-lb/values.yaml b/geoserver-lb/values.yaml
index a543473..ab8b820 100644
--- a/geoserver-lb/values.yaml
+++ b/geoserver-lb/values.yaml
@@ -31,4 +31,10 @@ database:
     existingSecret: mysecret
   geodata:
     auth:
-      existingSecret: mysecret
\ No newline at end of file
+      existingSecret: mysecret
+  datafeeder:
+    auth:
+      existingSecret: mysecret
+  gwc:
+    auth:
+      existingSecret: mysecret