diff --git a/charts/gha-runner-scale-set/templates/_helpers.tpl b/charts/gha-runner-scale-set/templates/_helpers.tpl
index 0aaa221b..d2b6f19b 100644
--- a/charts/gha-runner-scale-set/templates/_helpers.tpl
+++ b/charts/gha-runner-scale-set/templates/_helpers.tpl
@@ -11,8 +11,12 @@ gha-rs
 {{- end }}
 
 {{- define "gha-runner-scale-set.scale-set-name" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride -}}
+{{- else -}}
 {{ .Values.runnerScaleSetName | default .Release.Name }}
 {{- end }}
+{{- end }}
 
 {{/*
 Create a default fully qualified app name.