diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 7f09b17533bdf51e513aa1b01141e92e25353036..7f1461cb90b3db7ce5e5fc8535a41e52fe592527 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -9,7 +9,7 @@ description: |-
 
 type: application
 
-version: 2.0.9-bb.4
+version: 2.0.9-bb.5
 
 appVersion: RELEASE.2020-11-19T23-48-16Z
 
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
index f415bbf27ff03843993d5dd0fdaad712eb3844b2..8e7b94ff7ea3dd4960fa32bb0e52095aed6b178e 100644
--- a/chart/templates/_helpers.tpl
+++ b/chart/templates/_helpers.tpl
@@ -60,3 +60,11 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create the name of the service used to access the UI
+*/}}
+{{- define "minio.serviceName" -}}
+{{- default (include "minio.fullname" .) .Values.service.nameOverride }}
+{{- end }}
+
diff --git a/chart/templates/minio-vs.yaml b/chart/templates/minio-vs.yaml
index 8d96f72b9fad942d0a02fc4c8d0dd9a5a23b40ab..29e214f066f57a831609200f4bc92efe7ba824d7 100644
--- a/chart/templates/minio-vs.yaml
+++ b/chart/templates/minio-vs.yaml
@@ -15,7 +15,7 @@ spec:
             prefix: /minio/prometheus/metrics
       route:
         - destination:
-            host: {{ include "minio.fullname" . }}
+            host: {{ include "minio.serviceName" . }}
             port:
               number: {{ .Values.service.port }}
       fault:
@@ -28,7 +28,7 @@ spec:
             prefix: /
       route:
         - destination:
-            host: {{ include "minio.fullname" . }}
+            host: {{ include "minio.serviceName" . }}
             port:
               number: {{ .Values.service.port }}
 {{- end }}
diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml
index e095e9932f2a814160647fa823ace17adf211a9f..c64299dadda0e70d55b29c980fa6b91f978c54bb 100644
--- a/chart/templates/service.yaml
+++ b/chart/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.nameOverride | default (include "minio.fullname" .) }}
+  name: {{ include "minio.serviceName" . }}
   labels:
     {{- include "minio.labels" . | nindent 4 }}
 spec: