diff --git a/charts/core-api/templates/deployment.yaml b/charts/core-api/templates/deployment.yaml
index 97ddbf0..0708596 100644
--- a/charts/core-api/templates/deployment.yaml
+++ b/charts/core-api/templates/deployment.yaml
@@ -31,6 +31,17 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
+          env:
+          - name: Database__Host
+            value: '{{ .Values.postgresDatabase }}'
+          - name: Database__Port
+            value: '{{ .Values.postgresUser }}'
+          - name: Database__Database
+            value: '{{ .Values.postgresDatabase }}'
+          - name: Database__username
+            value: '{{ .Values.postgresUser }}'
+          - name: Database__password
+            value: '{{ .Values.postgresPassword }}'
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
diff --git a/charts/core-api/values.yaml b/charts/core-api/values.yaml
index 9a19912..d7d33a4 100644
--- a/charts/core-api/values.yaml
+++ b/charts/core-api/values.yaml
@@ -39,10 +39,11 @@ securityContext: {}
   # runAsNonRoot: true
   # runAsUser: 1000
 
-postgresUser: postgres
-postgresPassword: "postgres"
-postgresDatabase: postgres
-
+postgresHost : "acid-minimal-cluster"
+postgresPort : 5432
+postgresUser: "postgres"
+postgresPassword: "tbXeXzpmPK8l5e3DW6S3IXxzIO9CYCx0d5Ow0q50jgLyx0USEselZuC9JIuJi8Oo"
+postgresDatabase: comissionsapp
 service:
   type: ClusterIP
   port: 8080
diff --git a/charts/postgres/templates/deployment.yaml b/charts/postgres/templates/deployment.yaml
index 29e9b5d..bb5e158 100644
--- a/charts/postgres/templates/deployment.yaml
+++ b/charts/postgres/templates/deployment.yaml
@@ -32,15 +32,11 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
           env:
-          - name: Database__Host
+          - name: POSTGRES_DB
             value: '{{ .Values.postgresDatabase }}'
-          - name: Database__Port
+          - name: POSTGRES_USER
             value: '{{ .Values.postgresUser }}'
-          - name: Database__Database
-            value: '{{ .Values.postgresDatabase }}'
-          - name: Database__username
-            value: '{{ .Values.postgresUser }}'
-          - name: Database__password
+          - name: POSTGRES_PASSWORD
             value: '{{ .Values.postgresPassword }}'
         - name: {{ .Chart.Name }}
           securityContext:
diff --git a/charts/postgres/values.yaml b/charts/postgres/values.yaml
index 63c64b7..86e9104 100644
--- a/charts/postgres/values.yaml
+++ b/charts/postgres/values.yaml
@@ -4,17 +4,16 @@
 
 replicaCount: 1
 
-postgresHost : ""
-postgresPort : 5432
 postgresUser: postgres
 postgresPassword: "postgres"
 postgresDatabase: postgres
 
+
 image:
   repository: postgres
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "14.3-alpine"
+  tag: "16"
 
 imagePullSecrets: []
 nameOverride: ""