diff --git a/charts/zora-saas/Chart.yaml b/charts/zora-saas/Chart.yaml
index f4d816c..b319c01 100644
--- a/charts/zora-saas/Chart.yaml
+++ b/charts/zora-saas/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: zora-saas
 description: A Helm chart to deploy Zora SaaS on Kubernetes
 type: application
-version: 0.3.2
-appVersion: "v0.3.2"
+version: 0.4.0-rc1
+appVersion: "v0.4.0-rc1"
diff --git a/charts/zora-saas/templates/admin/deployment.yaml b/charts/zora-saas/templates/admin/deployment.yaml
index 8184cf3..07faf87 100644
--- a/charts/zora-saas/templates/admin/deployment.yaml
+++ b/charts/zora-saas/templates/admin/deployment.yaml
@@ -32,12 +32,13 @@ spec:
           securityContext:
             {{- toYaml .Values.admin.securityContext | nindent 12 }}
           image: "{{ .Values.admin.image.repository }}:{{ .Values.admin.image.tag | default .Chart.AppVersion }}"
-          args:
-            - --database={{ .Values.mongo.database }}
           envFrom:
             - secretRef:
-                name: {{ .Values.mongo.secret }}
+                name: {{ .Values.database.secret }}
                 optional: false
+            - secretRef:
+                optional: false
+                name: {{ .Values.admin.secretName }}
           imagePullPolicy: {{ .Values.admin.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/zora-saas/templates/deployment.yaml b/charts/zora-saas/templates/deployment.yaml
index d3a1556..0762d88 100644
--- a/charts/zora-saas/templates/deployment.yaml
+++ b/charts/zora-saas/templates/deployment.yaml
@@ -35,7 +35,6 @@ spec:
           args:
             - --log-level={{ .Values.log.level }}
             - --log-encoding={{ .Values.log.encoding }}
-            - --database={{ .Values.mongo.database }}
             - --read-timeout={{ .Values.readTimeout }}
             - --write-timeout={{ .Values.writeTimeout }}
             {{- if .Values.scheduleValidation }}
@@ -44,8 +43,11 @@ spec:
             - --block-new-users={{ .Values.blockNewUsers }}
           envFrom:
             - secretRef:
-                name: {{ .Values.mongo.secret }}
+                name: {{ .Values.database.secret }}
                 optional: false
+            - secretRef:
+                optional: false
+                name: {{ .Values.secretName }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/zora-saas/templates/ui/deployment.yaml b/charts/zora-saas/templates/ui/deployment.yaml
index f3b1c08..0d4b8dc 100644
--- a/charts/zora-saas/templates/ui/deployment.yaml
+++ b/charts/zora-saas/templates/ui/deployment.yaml
@@ -41,8 +41,6 @@ spec:
                 optional: false
                 name: {{ .Values.ui.secretName }}
           env:
-            - name: NEXTAUTH_URL_INTERNAL
-              value: http://127.0.0.1:4200
             - name: SAAS_URL
             {{- if .Values.proxy.enabled }}
               value: "https://saas-proxy.{{ .Release.Namespace }}.svc:{{ .Values.proxy.port }}/zora"
diff --git a/charts/zora-saas/values-dev.yaml b/charts/zora-saas/values-dev.yaml
index fc342aa..b7ed465 100644
--- a/charts/zora-saas/values-dev.yaml
+++ b/charts/zora-saas/values-dev.yaml
@@ -14,12 +14,10 @@ resources:
     memory: 15Mi
 imagePullSecrets:
   - name: zora-saas-registry-cred
-mongo:
-  database: "zora-saas-dev"
 log:
   level: debug
 proxy:
   enabled: false
 grafanaDashboard:
   enabled: false
-blockNewUsers: true
+blockNewUsers: false
diff --git a/charts/zora-saas/values-hml.yaml b/charts/zora-saas/values-hml.yaml
index f280376..5598b50 100644
--- a/charts/zora-saas/values-hml.yaml
+++ b/charts/zora-saas/values-hml.yaml
@@ -14,8 +14,6 @@ resources:
     memory: 15Mi
 imagePullSecrets:
   - name: zora-saas-registry-cred
-mongo:
-  database: "zora-saas-hml"
 log:
   level: info
 proxy:
diff --git a/charts/zora-saas/values-prod.yaml b/charts/zora-saas/values-prod.yaml
index f7a874d..75df0cc 100644
--- a/charts/zora-saas/values-prod.yaml
+++ b/charts/zora-saas/values-prod.yaml
@@ -31,8 +31,6 @@ resources:
     memory: 200Mi
 imagePullSecrets:
   - name: zora-saas-registry-cred
-mongo:
-  database: "zora-saas-prod"
 log:
   level: debug
 readTimeout: "30s"
diff --git a/charts/zora-saas/values.yaml b/charts/zora-saas/values.yaml
index 72c0505..8904e28 100644
--- a/charts/zora-saas/values.yaml
+++ b/charts/zora-saas/values.yaml
@@ -5,6 +5,11 @@ image:
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
+# This secret must contains
+# - OAUTH_DOMAIN - The hostname for the login server
+# - OAUTH_AUDIENCE - The audience used by the SaaS API
+# - OAUTH_CLIENT_ID - The Operator authentication client ID
+secretName: "zora-saas-credentials"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -108,10 +113,13 @@ ui:
     repository: ghcr.io/undistro/zora-ui-saas
     pullPolicy: IfNotPresent
     tag: ""
-  # This secret must contains GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET,
-  #   GITHUB_ID, GITHUB_SECRET,
-  #   AZURE_AD_CLIENT_ID, AZURE_AD_CLIENT_SECRET, AZURE_AD_TENANT_ID
-  #   and NEXTAUTH_SECRET
+  # This secret must contains
+  # - AUTH0_SECRET - used to encrypt the cookies sent to the clients
+  # - AUTH0_BASE_URL - The base url for the application, this will be used for setting up the login callback (e.g. https://localhost:3000)
+  # - AUTH0_ISSUER_BASE_URL - The base url for the login oauth server (https://<auth server>)
+  # - AUTH0_CLIENT_ID - The UI authentication client ID
+  # - AUTH0_CLIENT_SECRET - The UI authentication secret
+  # - AUTH0_AUDIENCE - The audience used by the SaaS API
   secretName: "zora-saas-ui-credentials"
   podAnnotations: {}
   podSecurityContext:
@@ -136,10 +144,8 @@ ui:
   tolerations: []
   affinity: {}
 
-mongo:
-  # This secret must contains MONGODB_URI data
-  secret: mongodb-connection
-  database: "test"
+database:
+  secret: postgres-credentials
 
 scheduleValidation: false
 
@@ -166,6 +172,10 @@ admin:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
+  # This secret must contains
+  # - OAUTH_DOMAIN - The hostname for the login server
+  # - OAUTH_AUDIENCE - The audience used by the Monitoring API
+  secretName: "zora-admin-credentials"
   podAnnotations: {}
   podSecurityContext:
     fsGroup: 2000