diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75627e2..38c06eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 6.0.2
+
+- Helm version tagging now utilizes `.Values.image.tag` when set.
+
 # 6.0.1
 
 - Added additional values to separate out `db:prepare` and `db:migrate` jobs and whether they should run:
diff --git a/Chart.yaml b/Chart.yaml
index e172e94..29cef04 100644
--- a/Chart.yaml
+++ b/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: 6.0.1
+version: 6.0.2
 
 # 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/templates/_helpers.tpl b/templates/_helpers.tpl
index b34ff95..6f32cfd 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -47,7 +47,9 @@ Common labels
 helm.sh/chart: {{ include "mastodon.chart" . }}
 {{ include "mastodon.selectorLabels" . }}
 {{ include "mastodon.globalLabels" . }}
-{{- if .Chart.AppVersion }}
+{{- if .Values.image.tag }}
+app.kubernetes.io/version: {{ .Values.image.tag | quote }}
+{{- else if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}