diff --git a/guacamole/Chart.yaml b/guacamole/Chart.yaml
index c20e3c9..10201b8 100644
--- a/guacamole/Chart.yaml
+++ b/guacamole/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.1.6
+version: 0.1.7
 
 # 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/guacamole/templates/_helpers.tpl b/guacamole/templates/_helpers.tpl
index 8bc21c2..8c7f890 100644
--- a/guacamole/templates/_helpers.tpl
+++ b/guacamole/templates/_helpers.tpl
@@ -55,9 +55,9 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Create the name of the service account to use
 */}}
 {{- define "guacamole.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "guacamole.fullname" .) .Values.serviceAccount.name }}
+{{- if .Values.guacamole.serviceAccount.create }}
+{{- default (include "guacamole.fullname" .) .Values.guacamole.serviceAccount.name }}
 {{- else }}
-{{- default "default" .Values.serviceAccount.name }}
+{{- default "default" .Values.guacamole.serviceAccount.name }}
 {{- end }}
 {{- end }}