diff --git a/charts/substreams-sink/Chart.yaml b/charts/substreams-sink/Chart.yaml
index 25e0156..847b77c 100644
--- a/charts/substreams-sink/Chart.yaml
+++ b/charts/substreams-sink/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/substreams-sink/templates/_helpers.tpl b/charts/substreams-sink/templates/_helpers.tpl
index ebb5e3b..479f72a 100644
--- a/charts/substreams-sink/templates/_helpers.tpl
+++ b/charts/substreams-sink/templates/_helpers.tpl
@@ -13,9 +13,10 @@ If release name contains chart name it will be used as a full name.
 {{- define "substreams-sink.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else if .Values.nameOverride }}
+{{- $baseName := default .Chart.Name .Values.nameOverride }}
 {{- else }}
-{{- $baseName := default .Chart.Name .Values.nameOverride -}}
-{{- $name := .Release.Name -}}
+{{- $name := .Release.Name }}
 {{- if and .Values.sinkType (not .Values.fullnameOverride) }}
 {{- $name = printf "%s-%s" $name .Values.sinkType -}}
 {{- end }}