diff --git a/charts/snyk-broker/templates/_helpers.tpl b/charts/snyk-broker/templates/_helpers.tpl
index 7c7dabe..aa0644a 100644
--- a/charts/snyk-broker/templates/_helpers.tpl
+++ b/charts/snyk-broker/templates/_helpers.tpl
@@ -107,6 +107,6 @@ Create the name of the broker service to use
 {{- if not .Values.disableSuffixes -}}
 {{ .Values.scmType }}-broker-service-{{ .Release.Name }}
 {{- else }}
-{{ .Values.scmType}}-broker-service
+{{ .Values.scmType }}-broker-service
 {{- end -}}
 {{- end -}}
\ No newline at end of file
diff --git a/charts/snyk-broker/templates/broker_deployment.yaml b/charts/snyk-broker/templates/broker_deployment.yaml
index 37dd5b8..4897bbc 100644
--- a/charts/snyk-broker/templates/broker_deployment.yaml
+++ b/charts/snyk-broker/templates/broker_deployment.yaml
@@ -315,7 +315,7 @@ spec:
             - name: PORT
               value: {{ .Values.deployment.container.containerPort | squote }}
             - name: BROKER_CLIENT_URL
-              value: "http://{{ include "snyk-broker.brokerServiceName" . }}:{{ .Values.service.port }}"
+              value: "http://{{ include "snyk-broker.brokerServiceName" . | trim }}:{{ .Values.service.port }}"
             - name: BROKER_CLIENT_VALIDATION_URL
               value: http://cra-service{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}:{{ .Values.deployment.container.crSnykPort | toString }}/healthcheck
           {{- end }}
diff --git a/charts/snyk-broker/templates/broker_ingress.yaml b/charts/snyk-broker/templates/broker_ingress.yaml
index d7b50e9..c5b658e 100644
--- a/charts/snyk-broker/templates/broker_ingress.yaml
+++ b/charts/snyk-broker/templates/broker_ingress.yaml
@@ -50,7 +50,7 @@ spec:
             backend:
               {{- if $ingressApiIsStable }}
               service:
-                name: {{ include "snyk-broker.brokerServiceName" $ }}
+                name: {{ include "snyk-broker.brokerServiceName" $ | trim }}
                 port:
                   number: {{ $servicePort }}
               {{- else }}
@@ -64,11 +64,11 @@ spec:
           - backend:
               {{- if $ingressApiIsStable }}
               service:
-                name: {{ include "snyk-broker.brokerServiceName" . }}
+                name: {{ include "snyk-broker.brokerServiceName" . | trim }}
                 port:
                   number: {{ $servicePort }}
               {{- else }}
-              serviceName: {{ include "snyk-broker.brokerServiceName" . }}
+              serviceName: {{ include "snyk-broker.brokerServiceName" . | trim }}
               servicePort: {{ $servicePort }}
               {{- end }}
             {{- if $ingressPath }}
diff --git a/charts/snyk-broker/templates/broker_service.yaml b/charts/snyk-broker/templates/broker_service.yaml
index d5bc1c1..96d70d9 100644
--- a/charts/snyk-broker/templates/broker_service.yaml
+++ b/charts/snyk-broker/templates/broker_service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "snyk-broker.brokerServiceName" . | nindent 4 }}
+  name: {{ include "snyk-broker.brokerServiceName" . | trim | nindent 4 }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "snyk-broker.labels" . | nindent 4 }}