diff --git a/library/common/templates/classes/_service.tpl b/library/common/templates/classes/_service.tpl
index d9076a6fa7..c63ab9b933 100644
--- a/library/common/templates/classes/_service.tpl
+++ b/library/common/templates/classes/_service.tpl
@@ -5,6 +5,9 @@ within the common library.
 {{- define "common.classes.service" -}}
 {{- $values := .commonService -}}
 {{- $serviceName := include "common.names.fullname" . -}}
+{{- if hasKey $values "nameSuffix" -}}
+  {{- $serviceName = (printf "%v-%v" $serviceName $values.nameSuffix) -}}
+{{ end -}}
 {{- $svcType := $values.type | default "" -}}
 apiVersion: v1
 kind: Service