diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml
index 1ccbbc5..187f013 100644
--- a/helm/templates/configmap.yaml
+++ b/helm/templates/configmap.yaml
@@ -4,7 +4,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-configmap" (include "ts-server-boilerplate.fullname" .) }}
+  name: {{ include "ts-server-boilerplate.fullname" . }}
 data:
   REQUEST_PAYLOAD_LIMIT: {{ .Values.env.requestPayloadLimit | quote }}
   RESPONSE_COMPRESSION_ENABLED: {{ .Values.env.responseCompressionEnabled | quote }}
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index e95f67d..862cff4 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -8,7 +8,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ printf "%s-deployment" (include "ts-server-boilerplate.fullname" .) }}
+  name: {{ include "ts-server-boilerplate.fullname" . }}
   labels:
     app: {{ $chartName }}
     component: {{ $chartName }}
@@ -21,14 +21,14 @@ spec:
     matchLabels:
       app: {{ $chartName }}
       release: {{ $releaseName }}
-      run: {{ $releaseName }}-{{ $chartName }}
+      run: {{ include "ts-server-boilerplate.fullname" . }}
       {{- include "ts-server-boilerplate.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
         app: {{ $chartName }}
         release: {{ $releaseName }}
-        run: {{ $releaseName }}-{{ $chartName }}
+        run: {{ include "ts-server-boilerplate.fullname" . }}
         {{- include "ts-server-boilerplate.labels" . | nindent 8 }}
       annotations:
         {{ include "mclabels.annotations" . | nindent 8 }}
@@ -44,7 +44,7 @@ spec:
         - name: {{ $cloudProviderImagePullSecretName | quote }}
     {{- end }}
       containers:
-        - name: {{ $releaseName }}-{{ $chartName }}-deployment
+        - name: {{ include "ts-server-boilerplate.fullname" . }}
           {{- with .Values.image }}
           image: {{ $cloudProviderDockerRegistryUrl }}{{ .repository }}:{{ $imageTag }}
           imagePullPolicy: {{ .pullPolicy | default "IfNotPresent" }}
@@ -84,7 +84,7 @@ spec:
             {{- end }}            
           envFrom:
             - configMapRef:
-                name: {{ printf "%s-configmap" (include "ts-server-boilerplate.fullname" .) }}
+                name: {{ include "ts-server-boilerplate.fullname" . }}
           ports:
             - name: http
               containerPort: {{ .Values.env.targetPort }}
diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
index 94f92f8..3355e5c 100644
--- a/helm/templates/ingress.yaml
+++ b/helm/templates/ingress.yaml
@@ -4,11 +4,11 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ $releaseName }}-{{ $chartName }}-ingress
+  name: {{ include "ts-server-boilerplate.fullname" . }}
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.org/mergeable-ingress-type: "minion"
-    nginx.org/rewrites: 'serviceName={{ $releaseName }}-{{ $chartName }} rewrite=/'    
+    nginx.org/rewrites: 'serviceName={{ include "ts-server-boilerplate.fullname" . }} rewrite=/'    
     nginx.org/location-snippets: |
       if ($request_method = OPTIONS) {
         return 204;
@@ -27,7 +27,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: {{ printf "%s-service" (include "ts-server-boilerplate.fullname" .) }}
+            name: {{ include "ts-server-boilerplate.fullname" . }}
             port:
               number: {{ .Values.env.port }}
     host: {{ .Values.ingress.host | quote }}
diff --git a/helm/templates/route.yaml b/helm/templates/route.yaml
index ab73b56..0ef1def 100644
--- a/helm/templates/route.yaml
+++ b/helm/templates/route.yaml
@@ -5,7 +5,7 @@
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
-  name: {{ $releaseName }}-{{ $chartName }}-route
+  name: {{ include "ts-server-boilerplate.fullname" . }}
   annotations:
     {{- if .Values.route.rewriteTarget }}
     haproxy.router.openshift.io/rewrite-target: {{ .Values.route.rewriteTarget }}
@@ -20,7 +20,7 @@ spec:
   path: {{ .Values.route.path | default "/" }}
   to:
     kind: Service
-    name: {{ printf "%s-service" (include "ts-server-boilerplate.fullname" .) }}
+    name: {{ include "ts-server-boilerplate.fullname" . }}
   {{- if .Values.route.tls.enabled }}
   tls:
     termination: {{ .Values.route.tls.termination | quote }}
diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml
index be44a66..f69c44c 100644
--- a/helm/templates/service.yaml
+++ b/helm/templates/service.yaml
@@ -5,7 +5,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ printf "%s-service" (include "ts-server-boilerplate.fullname" .) }}
+  name: {{ include "ts-server-boilerplate.fullname" . }}
   labels:
     app: {{ $chartName }}
     component: {{ $chartName }}
@@ -26,6 +26,6 @@ spec:
   selector:
     app: {{ $chartName }}
     release: {{ $releaseName }}
-    run: {{ $releaseName }}-{{ $chartName }}
+    run: {{ include "ts-server-boilerplate.fullname" . }}
     {{- include "ts-server-boilerplate.selectorLabels" . | nindent 4 }}
 {{- end }}