diff --git a/contrib/chart/backstage/README.md b/contrib/chart/backstage/README.md
index 7d04a2cf1e..40bb2666bc 100644
--- a/contrib/chart/backstage/README.md
+++ b/contrib/chart/backstage/README.md
@@ -129,6 +129,16 @@ For the CA, create a `configMap` named `<release name>-<chart name>-postgres-ca`
 kubectl create configmap my-company-backstage-postgres-ca --from-file=ca.crt"
 ```
 
+or disable CA mount
+
+```yaml
+backend:
+  postgresCertMountEnabled: false
+
+lighthouse:
+  postgresCertMountEnabled: false
+```
+
 > Where the release name contains the chart name "backstage" then only the release name will be used.
 
 Now install the helm chart:
diff --git a/contrib/chart/backstage/templates/_helpers.tpl b/contrib/chart/backstage/templates/_helpers.tpl
index 5d49ba6975..123d4dba5b 100644
--- a/contrib/chart/backstage/templates/_helpers.tpl
+++ b/contrib/chart/backstage/templates/_helpers.tpl
@@ -214,7 +214,7 @@ Postgres port for the backend
 {{- .Values.postgresql.service.port }}
 {{- else if .Values.appConfig.backend.database.connection.port -}}
 {{- .Values.appConfig.backend.database.connection.port }}
-{{ else }}
+{{- else -}}
 5432
 {{- end -}}
 {{- end -}}
diff --git a/contrib/chart/backstage/templates/backend-deployment.yaml b/contrib/chart/backstage/templates/backend-deployment.yaml
index 7009a22de0..4059ee3cc9 100644
--- a/contrib/chart/backstage/templates/backend-deployment.yaml
+++ b/contrib/chart/backstage/templates/backend-deployment.yaml
@@ -49,7 +49,7 @@ spec:
                   name: {{ include "backend.postgresql.passwordSecret" .}}
                   key: postgresql-password
           volumeMounts:
-            {{- if .Values.postgresql.enabled }}
+            {{- if .Values.backend.postgresCertMountEnabled }}
             - name: postgres-ca
               mountPath: {{ include "backstage.backend.postgresCaDir" . }}
             {{- end }}
@@ -58,7 +58,7 @@ spec:
               subPath: {{ include "backstage.appConfigFilename" . }}
 
       volumes:
-        {{- if .Values.postgresql.enabled }}
+        {{- if .Values.backend.postgresCertMountEnabled }}
         - name: postgres-ca
           configMap:
             name: {{ include "backstage.fullname" . }}-postgres-ca
diff --git a/contrib/chart/backstage/templates/lighthouse-deployment.yaml b/contrib/chart/backstage/templates/lighthouse-deployment.yaml
index 6104d4e73c..849c48d7a6 100644
--- a/contrib/chart/backstage/templates/lighthouse-deployment.yaml
+++ b/contrib/chart/backstage/templates/lighthouse-deployment.yaml
@@ -51,14 +51,18 @@ spec:
                   name: {{ include "lighthouse.postgresql.passwordSecret" . }}
                   key: postgresql-password
 
+          {{- if .Values.lighthouse.postgresCertMountEnabled }}
           volumeMounts:
             - name: postgres-ca
               mountPath: {{ include "backstage.lighthouse.postgresCaDir" . }}
+          {{- end }}
 
+      {{- if .Values.lighthouse.postgresCertMountEnabled }}
       volumes:
         - name: postgres-ca
           configMap:
             name: {{ include "backstage.fullname" . }}-postgres-ca
+      {{- end }}
 
       {{- if .Values.global.nodeSelector }}
       nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 8 }}
diff --git a/contrib/chart/backstage/templates/postgresql-password-backend-secret.yaml b/contrib/chart/backstage/templates/postgresql-password-backend-secret.yaml
index e53369adb9..a71cef7b21 100644
--- a/contrib/chart/backstage/templates/postgresql-password-backend-secret.yaml
+++ b/contrib/chart/backstage/templates/postgresql-password-backend-secret.yaml
@@ -13,18 +13,3 @@ metadata:
 data:
   postgresql-password: {{ .Values.appConfig.backend.database.connection.password | b64enc }}
 {{- end }}
-{{- if not .Values.postgresql.enabled }}
----
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ include "lighthouse.postgresql.passwordSecret" . }}
-  labels:
-    release: {{ .Release.Name }}
-  annotations:
-    "helm.sh/hook": "pre-install,pre-upgrade"
-    "helm.sh/hook-delete-policy": "before-hook-creation"
-data:
-  postgresql-password: {{ .Values.lighthouse.database.connection.password | b64enc }}
-{{- end }}
diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
index e21148b04b..645de91313 100644
--- a/contrib/chart/backstage/values.yaml
+++ b/contrib/chart/backstage/values.yaml
@@ -28,6 +28,7 @@ backend:
     pullPolicy: IfNotPresent
   containerPort: 7000
   serviceType: ClusterIP
+  postgresCertMountEnabled: true
   resources:
     requests:
       memory: 512Mi
@@ -43,6 +44,7 @@ lighthouse:
     pullPolicy: IfNotPresent
   containerPort: 3003
   serviceType: ClusterIP
+  postgresCertMountEnabled: true
   resources:
     requests:
       memory: 128Mi