diff --git a/charts/incubator/kimai/Chart.yaml b/charts/incubator/kimai/Chart.yaml
index 6461fb7f0cf..3cde6634ed6 100644
--- a/charts/incubator/kimai/Chart.yaml
+++ b/charts/incubator/kimai/Chart.yaml
@@ -25,7 +25,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/kimai
   - https://github.com/kevinpapst/kimai2
   - https://github.com/tobybatch/kimai2
-version: 8.0.8
+version: 8.0.9
 annotations:
   truecharts.org/category: productivity
   truecharts.org/SCALE-support: "true"
diff --git a/charts/incubator/kimai/templates/_configmap.tpl b/charts/incubator/kimai/templates/_configmap.tpl
index 16a3cb9551b..0221c217fab 100644
--- a/charts/incubator/kimai/templates/_configmap.tpl
+++ b/charts/incubator/kimai/templates/_configmap.tpl
@@ -16,8 +16,8 @@ kimai-config:
     DB_BASE: {{ .Values.mariadb.mariadbUsername }}
     {{/* Admin credentials */}}
     ADMINMAIL: {{ .Values.kimai.credentials.adminMail }}
-    ADMINPASS: {{ .Values.kimai.credentials.adminPass }}
+    ADMINPASS: {{ .Values.kimai.credentials.adminPass | quote }}
     {{/* Trusted Hosts */}}
     TRUSTED_HOSTS: {{ join "," $trusted_hosts }}
-    memory_limit: 256M
+    memory_limit: "256M"
 {{- end -}}