diff --git a/.github/workflows/upgradeability-test.yaml b/.github/workflows/upgradeability-test.yaml
index 963474b..0059670 100644
--- a/.github/workflows/upgradeability-test.yaml
+++ b/.github/workflows/upgradeability-test.yaml
@@ -48,15 +48,15 @@ jobs:
       - name: "Setup Helm"
         uses: azure/setup-helm@v4
         with:
-          version: v3.8.1
+          version: v3.16.1
 
       - name: "Setup Kubectl"
         uses: azure/setup-kubectl@v4
         with:
-          version: 'v1.28.2'
+          version: 'v1.31.1'
 
       - name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.10.0
+        uses: helm/kind-action@v1.12.0
 
       - name: "Update helm repo"
         run: |
@@ -98,6 +98,10 @@ jobs:
           # wait for the pod to become ready
           kubectl rollout status deployment bdrs-server
 
+      - if: failure()
+        run:
+          kubectl logs deployment/bdrs-server
+
       - uses: ./.github/actions/setup-java
 
       - name: "Build docker images"
diff --git a/charts/bdrs-server/Chart.yaml b/charts/bdrs-server/Chart.yaml
index 2b5dc68..3d0c491 100644
--- a/charts/bdrs-server/Chart.yaml
+++ b/charts/bdrs-server/Chart.yaml
@@ -47,7 +47,7 @@ dependencies:
   # PostgreSQL
   - name: postgresql
     alias: postgresql
-    version: 12.11.2
+    version: 15.2.1
     repository: https://charts.bitnami.com/bitnami
     condition: install.postgresql
   # HashiCorp Vault
diff --git a/charts/bdrs-server/templates/deployment.yaml b/charts/bdrs-server/templates/deployment.yaml
index 5190213..a77d810 100644
--- a/charts/bdrs-server/templates/deployment.yaml
+++ b/charts/bdrs-server/templates/deployment.yaml
@@ -168,6 +168,11 @@ spec:
               value: "didentry"
 
             # note that the DB user and password must be put in the vault using the "edc.datasource.didentry.[user|password]" aliases, respectively!
+
+            - name: "EDC_DATASOURCE_DIDENTRY_USER"
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
+            - name: "EDC_DATASOURCE_DIDENTRY_PASSWORD"
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_DIDENTRY_URL"
               value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
diff --git a/system-tests/helm/values-vault-test.yaml b/system-tests/helm/values-vault-test.yaml
index 13cc072..68155c1 100644
--- a/system-tests/helm/values-vault-test.yaml
+++ b/system-tests/helm/values-vault-test.yaml
@@ -31,11 +31,7 @@ server:
     - |-
       {
       sleep 5
-      
-      /bin/vault kv put secret/edc.datasource.didentry.user content=bdrs
-      
-      /bin/vault kv put secret/edc.datasource.didentry.password content=password
-      
+
       /bin/vault kv put secret/mgmt-api-key content=password
       }
 hashicorp:
@@ -46,4 +42,4 @@ hashicorp:
     standbyOk: true
   paths:
     secret: /v1/secret
-    health: /v1/sys/health
\ No newline at end of file
+    health: /v1/sys/health