diff --git a/charts/pg-db/README.md b/charts/pg-db/README.md
index 1971486d..c98770da 100644
--- a/charts/pg-db/README.md
+++ b/charts/pg-db/README.md
@@ -42,6 +42,7 @@ The chart can be customized using the following configurable parameters:
 | `port`                            | PostgreSQL port                                                                                                                                                                                         | `5432`                                                       |
 | `postgresVersion`                 | PostgreSQL container version tag                                                                                                                                                                        | `16`                                                         |
 | `pause`                           | Stop PostgreSQL Database safely                                                                                                                                                                         | `false`                                                      |
+| `clusterServiceDNSSuffix`         | The (non-standard) cluster domain to be used as a suffix of the Service safely                                                                                                                          | `""`                                                         |
 | `unmanaged`                       | Start cluster and don't manage it (cross cluster replication)                                                                                                                                           | `false`                                                      |
 | `standby.enabled`                 | Switch/start PostgreSQL Database in standby mode                                                                                                                                                        | `false`                                                      |
 | `standby.host`                    | Host address of the primary cluster this standby cluster connects to                                                                                                                                    | ``                                                           |
diff --git a/charts/pg-db/templates/cluster.yaml b/charts/pg-db/templates/cluster.yaml
index b966e478..8a0de5e6 100644
--- a/charts/pg-db/templates/cluster.yaml
+++ b/charts/pg-db/templates/cluster.yaml
@@ -23,6 +23,9 @@ metadata:
 spec:
   crVersion: {{ .Values.crVersion }}
   {{- include "pg-database.initContainer" .Values | indent 2 }}
+  {{- if .Values.clusterServiceDNSSuffix }}
+  clusterServiceDNSSuffix: {{ .Values.clusterServiceDNSSuffix }}
+  {{- end }}
   {{- if .Values.metadata }}
   metadata: {{ .Values.metadata | toYaml | nindent 4 }}
   {{- end }}
@@ -404,7 +407,7 @@ spec:
 
   pmm:
     enabled: {{ .Values.pmm.enabled }}
-    image: {{ .Values.pmm.image.repository }}:{{ .Values.pmm.image.tag }}
+    image: "{{ .Values.pmm.image.repository }}:{{ .Values.pmm.image.tag }}"
     {{- if .Values.pmm.imagePullPolicy }}
     imagePullPolicy: {{ .Values.pmm.imagePullPolicy | default "Always" }}
     {{- end }}
diff --git a/charts/pg-db/values.yaml b/charts/pg-db/values.yaml
index 7cc9a075..4a5c3f6d 100644
--- a/charts/pg-db/values.yaml
+++ b/charts/pg-db/values.yaml
@@ -48,6 +48,7 @@ repository: docker.io/percona/percona-distribution-postgresql
 image: docker.io/percona/percona-distribution-postgresql:17.7-2
 imagePullPolicy: Always
 postgresVersion: 17
+# clusterServiceDNSSuffix: cluster.local
 # port: 5432
 pause: false
 unmanaged: false
diff --git a/charts/pg-operator/crds/crd.yaml b/charts/pg-operator/crds/crd.yaml
index f6f31645..f6e99102 100644
--- a/charts/pg-operator/crds/crd.yaml
+++ b/charts/pg-operator/crds/crd.yaml
@@ -7795,6 +7795,8 @@ spec:
                     are enabled
                   rule: (has(self.enabled) && self.enabled == false) || (has(self.pgbackrest.repos)
                     && size(self.pgbackrest.repos) > 0)
+              clusterServiceDNSSuffix:
+                type: string
               crVersion:
                 description: |-
                   Version of the operator. Update this to new version after operator
@@ -36731,6 +36733,9 @@ spec:
                     description: Enable tracking latest restorable time
                     type: boolean
                 type: object
+              clusterServiceDNSSuffix:
+                description: K8SPG-694
+                type: string
               config:
                 properties:
                   files: