diff --git a/charts/hivemq-platform/templates/_helpers.tpl b/charts/hivemq-platform/templates/_helpers.tpl
index 5a0d95ba..e4bc43e6 100644
--- a/charts/hivemq-platform/templates/_helpers.tpl
+++ b/charts/hivemq-platform/templates/_helpers.tpl
@@ -498,7 +498,7 @@ Usage: {{ include "hivemq-platform.validate-hivemq-listener-name-services" . }}
 {{- $services := .Values.services }}
 {{- range $service := $services }}
   {{- if and ($service.exposed) (hasKey $service "hivemqListenerName") (and (not (eq $service.type "mqtt")) (not (eq $service.type "websocket"))) }}
-    {{- fail (printf "Service type `%s` with container port `%d` is using `hivemqListenerName` value. HiveMQ listener names are only supported by MQTT and WebSocket services" $service.type (int64 $service.containerPort)) }}
+    {{- fail (printf "\nService type `%s` with container port `%d` is using `hivemqListenerName` value. HiveMQ listener names are only supported by MQTT and WebSocket services" $service.type (int64 $service.containerPort)) }}
   {{- end }}
 {{- end }}
 {{- end -}}
@@ -512,10 +512,10 @@ Usage: {{ include "hivemq-platform.validate-external-traffic-policy" . }}
 {{- $services := .Values.services }}
 {{- range $service := $services }}
   {{- if and ($service.exposed) (hasKey $service "externalTrafficPolicy") (not (hasKey $service "serviceType")) }}
-    {{- fail (printf "Service type `%s` with container port `%d` is using `externalTrafficPolicy` value but `serviceType` value is not defined. Service type value is mandatory when using external traffic policy" $service.type (int64 $service.containerPort)) }}
+    {{- fail (printf "\nService type `%s` with container port `%d` is using `externalTrafficPolicy` value but `serviceType` value is not defined. Service type value is mandatory when using external traffic policy" $service.type (int64 $service.containerPort)) }}
   {{- end }}
   {{- if and ($service.exposed) (hasKey $service "externalTrafficPolicy") (hasKey $service "serviceType") (and (not (eq $service.serviceType "NodePort")) (not (eq $service.serviceType "LoadBalancer")) )  }}
-    {{- fail (printf "Service type `%s` with container port `%d` is using `externalTrafficPolicy` value. External traffic policy is only supported by NodePort and LoadBalancer service types" $service.serviceType (int64 $service.containerPort)) }}
+    {{- fail (printf "\nService type `%s` with container port `%d` is using `externalTrafficPolicy` value. External traffic policy is only supported by NodePort and LoadBalancer service types" $service.serviceType (int64 $service.containerPort)) }}
   {{- end }}
 {{- end }}
 {{- end -}}
diff --git a/charts/hivemq-platform/tests/services/hivemq_control_center_services_test.yaml b/charts/hivemq-platform/tests/services/hivemq_control_center_services_test.yaml
index 377d0bfb..bc2c24f8 100644
--- a/charts/hivemq-platform/tests/services/hivemq_control_center_services_test.yaml
+++ b/charts/hivemq-platform/tests/services/hivemq_control_center_services_test.yaml
@@ -155,7 +155,7 @@ tests:
           hivemqListenerName: foobar
     asserts:
       - failedTemplate:
-          errorMessage: Service type `control-center` with container port `8081` is using `hivemqListenerName` value. HiveMQ listener names are only supported by MQTT and WebSocket services
+          errorPattern: Service type `control-center` with container port `8081` is using `hivemqListenerName` value. HiveMQ listener names are only supported by MQTT and WebSocket services
 
   - it: with a Control Center service disabled and HiveMQ listener name enabled, validation succeeds
     set:
diff --git a/charts/hivemq-platform/tests/services/hivemq_metrics_services_test.yaml b/charts/hivemq-platform/tests/services/hivemq_metrics_services_test.yaml
index 65b49562..fbbc3260 100644
--- a/charts/hivemq-platform/tests/services/hivemq_metrics_services_test.yaml
+++ b/charts/hivemq-platform/tests/services/hivemq_metrics_services_test.yaml
@@ -982,7 +982,7 @@ tests:
           hivemqListenerName: foobar
     asserts:
       - failedTemplate:
-          errorMessage: Service type `metrics` with container port `9399` is using `hivemqListenerName` value. HiveMQ listener names are only supported by MQTT and WebSocket services
+          errorPattern: Service type `metrics` with container port `9399` is using `hivemqListenerName` value. HiveMQ listener names are only supported by MQTT and WebSocket services
 
   - it: with a Metrics service disabled and HiveMQ listener name enabled, validation succeeds
     set:
diff --git a/charts/hivemq-platform/tests/services/hivemq_rest_api_services_test.yaml b/charts/hivemq-platform/tests/services/hivemq_rest_api_services_test.yaml
index bffb39d6..d704f139 100644
--- a/charts/hivemq-platform/tests/services/hivemq_rest_api_services_test.yaml
+++ b/charts/hivemq-platform/tests/services/hivemq_rest_api_services_test.yaml
@@ -157,7 +157,7 @@ tests:
           hivemqListenerName: foobar
     asserts:
       - failedTemplate:
-          errorMessage: Service type `rest-api` with container port `8888` is using `hivemqListenerName` value. HiveMQ listener names are only supported by MQTT and WebSocket services
+          errorPattern: Service type `rest-api` with container port `8888` is using `hivemqListenerName` value. HiveMQ listener names are only supported by MQTT and WebSocket services
 
   - it: with a REST API service disabled and HiveMQ listener name enabled, validation succeeds
     set: