diff --git a/charts/nmaas/Chart.lock b/charts/nmaas/Chart.lock
index f72725165fa74a12bd71c4c918e911c92ed118b7..3e911db7de98ffe7446e9a3affd2ee5b299104c3 100644
--- a/charts/nmaas/Chart.lock
+++ b/charts/nmaas/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: postgresql
   repository: https://artifactory.software.geant.org/artifactory/nmaas-helm-mirror
-  version: 10.16.2
-digest: sha256:94a23914d811a636356a9ee47d6910c3159225b69aef93bc4d9d56a1055b28a5
-generated: "2022-08-30T08:59:05.078630031+02:00"
+  version: 16.6.0
+digest: sha256:be748404e3b45e51a557c0406375f43a84aa32be35cf20c01cce266736bc2039
+generated: "2025-04-04T14:41:38.829381998+02:00"
diff --git a/charts/nmaas/Chart.yaml b/charts/nmaas/Chart.yaml
index 29437fa2b47137fc192a42cdec5429fc05fac675..c2594e632087b1f46ff13b3b0c578dbe6b5d29e5 100644
--- a/charts/nmaas/Chart.yaml
+++ b/charts/nmaas/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: nmaas
 description: GÉANT Network Management as a Service Helm chart for Kubernetes
-version: 1.3.0-alpha.6
-appVersion: 1.7.0-alfa
+version: 1.3.0-1
+appVersion: 1.7.0
 keywords:
   - Network Management
   - Cloud Deployment
@@ -13,6 +13,6 @@ maintainers:
     url: https://docs.nmaas.eu
 dependencies:
   - name: postgresql
-    version: 10.16.2
+    version: 16.6.0
     repository: https://artifactory.software.geant.org/artifactory/nmaas-helm-mirror
     condition: postgresql.install
diff --git a/charts/nmaas/charts/bitnami-postgresql-10.16.2.tgz b/charts/nmaas/charts/bitnami-postgresql-10.16.2.tgz
deleted file mode 100644
index d3a6d0f8f51e3f5ef0fdfa10b3205e922b5fcea8..0000000000000000000000000000000000000000
Binary files a/charts/nmaas/charts/bitnami-postgresql-10.16.2.tgz and /dev/null differ
diff --git a/charts/nmaas/charts/postgresql-16.6.0.tgz b/charts/nmaas/charts/postgresql-16.6.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..865acadee30f59e1a872f84f12eaeae096f457aa
Binary files /dev/null and b/charts/nmaas/charts/postgresql-16.6.0.tgz differ
diff --git a/charts/nmaas/values.yaml b/charts/nmaas/values.yaml
index a1f87f7a3d6458cf38acc90e3fee45d4b4db04bc..8e421731c88ea9fa94ff58cf39ade18e78340055 100644
--- a/charts/nmaas/values.yaml
+++ b/charts/nmaas/values.yaml
@@ -58,7 +58,7 @@ platform:
     timeoutSeconds: 10
   image:
     repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-platform
-    tag: "1.7.0-alfa"
+    tag: "1.7.0"
     pullPolicy: IfNotPresent
   port: 9001
   targetPort: 9001
@@ -82,7 +82,7 @@ platform:
     enabled: true
     image:
       repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-platform-populate
-      tag: "1.6.5"
+      tag: "1.7.0"
       pullPolicy: Always
   properties:
     oidcUserLinking: true
@@ -198,7 +198,7 @@ portal:
   name: nmaas-portal
   image:
     repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-portal
-    tag: "1.7.0-alfa"
+    tag: "1.7.0"
     pullPolicy: IfNotPresent
   ingress:
     # -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
@@ -278,7 +278,7 @@ janitor:
   name: nmaas-janitor
   image:
     repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-janitor
-    tag: "1.6.1"
+    tag: "1.7.0"
     pullPolicy: IfNotPresent
   port: 5000
   targetPort: 5000
@@ -288,9 +288,12 @@ janitor:
 # -- settings for in-cluster postgresql
 postgresql:
   install: true
-  postgresqlUsername: nmaas
-  postgresqlPassword: nmaas
-  postgresqlDatabase: nmaas
-  persistence:
-    enabled: true
-    size: 8Gi
+  auth:
+    username: nmaas
+    password: nmaas
+    database: nmaas
+    postgresPassword: nmaas
+  primary:
+    persistence:
+      enabled: true
+      size: 8Gi