diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml
index 6cd641e..8b1dd99 100644
--- a/charts/backstage/Chart.yaml
+++ b/charts/backstage/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: 0.8.0
+version: 0.8.1
 
 dependencies:
   - name: common
diff --git a/charts/backstage/README.md b/charts/backstage/README.md
index 3ef25fd..61a1354 100644
--- a/charts/backstage/README.md
+++ b/charts/backstage/README.md
@@ -1,7 +1,7 @@
 
 # Backstage Helm Chart
 
-![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for deploying a Backstage application
 
diff --git a/charts/backstage/templates/backstage-deployment.yaml b/charts/backstage/templates/backstage-deployment.yaml
index da2fb75..6052bae 100644
--- a/charts/backstage/templates/backstage-deployment.yaml
+++ b/charts/backstage/templates/backstage-deployment.yaml
@@ -40,7 +40,7 @@ spec:
             name: {{ .configMapRef }}
         {{- end }}
         {{- if .Values.backstage.extraVolumes }}
-          {{- toYaml .Values.backstage.extraVolumes | nindent 8 }}
+          {{- include "common.tplvalues.render" ( dict "value" .Values.backstage.extraVolumes "context" $ ) | nindent 8 }}
         {{- end }}
         {{- end }}
       {{- if .Values.backstage.image.pullSecrets }}
@@ -118,6 +118,6 @@ spec:
               subPath: {{ .filename }}
             {{- end }}
             {{- if .Values.backstage.extraVolumeMounts }}
-              {{- toYaml .Values.backstage.extraVolumeMounts | nindent 12 }}
+              {{- include "common.tplvalues.render" ( dict "value" .Values.backstage.extraVolumeMounts "context" $ ) | nindent 12 }}
             {{- end }}
           {{- end }}
diff --git a/charts/backstage/templates/serviceaccount.yaml b/charts/backstage/templates/serviceaccount.yaml
index aee3e08..f89f996 100644
--- a/charts/backstage/templates/serviceaccount.yaml
+++ b/charts/backstage/templates/serviceaccount.yaml
@@ -7,12 +7,12 @@ metadata:
   labels:
     app.kubernetes.io/component: backstage
     {{- with .Values.serviceAccount.labels }}
-    {{- toYaml . | trim | nindent 4 }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | trim | nindent 4 }}
     {{- end }}
   {{- if .Values.serviceAccount.annotations }}
   annotations:
     {{- with .Values.serviceAccount.annotations }}
-    {{- toYaml . | trim | nindent 4 }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | trim | nindent 4 }}
     {{- end }}
   {{- end }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}