diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 410ca2b..07ca70d 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -234,9 +234,9 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 
 {{- define "valkey.servicename" -}}
 {{- if (index .Values "valkey-cluster").enabled -}}
-{{- printf "%s-valkey-cluster-headless.%s.svc.%s" .Release.Name .Release.Namespace .Values.clusterDomain -}}
+{{- printf "%s-valkey-cluster-headless.%s.svc" .Release.Name .Release.Namespace -}}
 {{- else if (index .Values "valkey").enabled -}}
-{{- printf "%s-valkey-primary.%s.svc.%s" .Release.Name .Release.Namespace .Values.clusterDomain -}}
+{{- printf "%s-valkey-primary.%s.svc" .Release.Name .Release.Namespace -}}
 {{- end -}}
 {{- end -}}
 
diff --git a/unittests/helm/dependency-checks/customization-integrity-valkey-cluster.yaml b/unittests/helm/dependency-checks/customization-integrity-valkey-cluster.yaml
index 6243a41..aceee5c 100644
--- a/unittests/helm/dependency-checks/customization-integrity-valkey-cluster.yaml
+++ b/unittests/helm/dependency-checks/customization-integrity-valkey-cluster.yaml
@@ -87,4 +87,4 @@ tests:
       - documentIndex: 0
         matchRegex:
           path: stringData["configure_gitea.sh"]
-          pattern: nc -vz -w2 gitea-unittests-valkey-cluster-headless.testing.svc.cluster.local 6379
+          pattern: nc -vz -w2 gitea-unittests-valkey-cluster-headless.testing.svc 6379
diff --git a/unittests/helm/dependency-checks/customization-integrity-valkey.yaml b/unittests/helm/dependency-checks/customization-integrity-valkey.yaml
index 27afe1e..17a2dea 100644
--- a/unittests/helm/dependency-checks/customization-integrity-valkey.yaml
+++ b/unittests/helm/dependency-checks/customization-integrity-valkey.yaml
@@ -50,4 +50,4 @@ tests:
       - documentIndex: 0
         matchRegex:
           path: stringData["configure_gitea.sh"]
-          pattern: nc -vz -w2 gitea-unittests-valkey-primary.testing.svc.cluster.local 6379
+          pattern: nc -vz -w2 gitea-unittests-valkey-primary.testing.svc 6379