diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
index c84cc0bfa..fa37868b5 100755
--- a/charts/common/Chart.yaml
+++ b/charts/common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: Common chartbuilding components and helpers, based on incubator/common
 type: library
-version: 0.0.4
+version: 0.0.5
 appVersion: 0.0.0
 home: https://helm.sh
 sources:
diff --git a/charts/common/README.md b/charts/common/README.md
index 0c04be6a7..163da4597 100755
--- a/charts/common/README.md
+++ b/charts/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
+![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
 
 Common chartbuilding components and helpers, based on incubator/common
 
diff --git a/charts/common/templates/_metadata.yaml b/charts/common/templates/_metadata.tpl
similarity index 100%
rename from charts/common/templates/_metadata.yaml
rename to charts/common/templates/_metadata.tpl
diff --git a/charts/common/templates/_metadata_labels.tpl b/charts/common/templates/_metadata_labels.tpl
index 62109df64..402141f7e 100755
--- a/charts/common/templates/_metadata_labels.tpl
+++ b/charts/common/templates/_metadata_labels.tpl
@@ -8,5 +8,7 @@ helm.sh/chart: {{ template "common.chartref" . }}
 app.kubernetes.io/app: {{ template "common.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
 app.kubernetes.io/instance: {{ .Release.Name | quote }}
-app.kubernetes.io/version: {{ .Release.Version | quote }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
 {{- end -}}