diff --git a/replicant/Chart.yaml b/replicant/Chart.yaml
index f6e501a..1f18d5a 100644
--- a/replicant/Chart.yaml
+++ b/replicant/Chart.yaml
@@ -4,5 +4,5 @@ description: Official Helm chart for Replicant
 
 type: application
 
-version: 0.2.4
+version: 0.2.5
 appVersion: "v0.2.2"
diff --git a/replicant/templates/_helpers.tpl b/replicant/templates/_helpers.tpl
index 28874bf..b68e02f 100644
--- a/replicant/templates/_helpers.tpl
+++ b/replicant/templates/_helpers.tpl
@@ -13,8 +13,8 @@ helm.sh/chart: {{ include "replicant.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.additionalLabels }}
-{{ toYaml .Values.additionalLabels }}
+{{- with .Values.additionalLabels }}
+{{ toYaml . }}
 {{- end }}
 {{- end }}
 
diff --git a/replicant/templates/configmap.yaml b/replicant/templates/configmap.yaml
index a823249..ffe9d34 100644
--- a/replicant/templates/configmap.yaml
+++ b/replicant/templates/configmap.yaml
@@ -7,8 +7,8 @@ metadata:
   labels:
     {{- include "replicant.labels" . | nindent 4 }}
 data:
-  {{- if .Values.environmentVariables }}
-  {{- toYaml .Values.environmentVariables | nindent 2 }}
+  {{- with .Values.environmentVariables }}
+  {{- toYaml . | nindent 2 }}
   {{- end }}
   {{- if .Values.googleApplicationCredentials }}
   GOOGLE_APPLICATION_CREDENTIALS: "/secrets/key.json"
diff --git a/replicant/values.yaml b/replicant/values.yaml
index 23ba2a0..58be253 100644
--- a/replicant/values.yaml
+++ b/replicant/values.yaml
@@ -7,6 +7,8 @@ image:
 
 serviceAccount:
   create: true
+#  annotations:
+#    iam.gke.io/gcp-service-account: replicant@tammert.iam.gserviceaccount.com #GKE Workload Identity
 
 environmentVariables:
   REPLICANT_CONFIG: "/config/replicant.yaml"