diff --git a/contrib/helm/charts/probo/templates/ingress.yaml b/contrib/helm/charts/probo/templates/ingress.yaml
index c9e992410..a98c0dbcc 100644
--- a/contrib/helm/charts/probo/templates/ingress.yaml
+++ b/contrib/helm/charts/probo/templates/ingress.yaml
@@ -33,9 +33,8 @@ spec:
             pathType: {{ .pathType }}
             backend:
               service:
-                name: {{ include "probo.fullname" $ }}
-                port:
-                  number: {{ $.Values.service.port }}
+                name: {{ default (include "probo.fullname" $) .backend.service.name }}
+                port: {{ default $.Values.service.port .backend.service.port.number }}
           {{- end }}
     {{- end }}
 {{- end }}
diff --git a/contrib/helm/charts/probo/templates/postgresql-demo-app.yml b/contrib/helm/charts/probo/templates/postgresql-demo-app.yml
index 09b5a3022..b9aa6ecf4 100644
--- a/contrib/helm/charts/probo/templates/postgresql-demo-app.yml
+++ b/contrib/helm/charts/probo/templates/postgresql-demo-app.yml
@@ -20,7 +20,7 @@ spec:
             - name: POSTGRES_USER
               value: {{ .Values.postgresql.auth.postgresUser }}
             - name: POSTGRES_PASSWORD
-              value: {{ .Values.postgresql.auth.postgresPassword }}
+              value: {{ .Values.postgresql.auth.postgresPassword | quote }}
             - name: POSTGRES_DB
               value: {{ .Values.postgresql.auth.database }}
           ports:
@@ -62,7 +62,7 @@ data:
 
     psql -v ON_ERROR_STOP=1 -U $POSTGRES_USER <<-EOF
     ALTER USER probod WITH SUPERUSER;
-    ALTER USER probod PASSWORD 'probod';
+    ALTER USER probod PASSWORD '{{ .Values.postgresql.auth.postgresPassword }}';
     GRANT ALL PRIVILEGES ON DATABASE probod TO probod;
     CREATE DATABASE probod_test;
     GRANT ALL PRIVILEGES ON DATABASE probod_test TO probod;