diff --git a/charts/keep/Chart.yaml b/charts/keep/Chart.yaml
index 831adb8..8465614 100644
--- a/charts/keep/Chart.yaml
+++ b/charts/keep/Chart.yaml
@@ -4,7 +4,7 @@ version: 0.1.8
 description: Keep Helm Chart
 type: application
 icon: https://platform.keephq.dev/_next/image?url=%2Fkeep.png&w=48&q=75
-appVersion: 0.23.0
+appVersion: 0.24.0
 deprecated: false
 annotations:
   app: keep
diff --git a/charts/keep/templates/keep-backend.yaml b/charts/keep/templates/keep-backend.yaml
index d6437a5..8f235db 100644
--- a/charts/keep/templates/keep-backend.yaml
+++ b/charts/keep/templates/keep-backend.yaml
@@ -18,7 +18,15 @@ spec:
     metadata:
       {{- with .Values.backend.podAnnotations }}
       annotations:
-        {{- toYaml . | nindent 8 }}
+        {{- if .Values.backend.podAnnotations }}
+        {{- range $key, $value := .Values.backend.podAnnotations }}
+        {{- if kindIs "string" $value }}
+        {{ $key }}: {{ tpl $value $ | quote }}
+        {{- else }}
+        {{ $key }}: {{ $value | toYaml | nindent 8 }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
       {{- end }}
       labels:
         {{- include "keep.selectorLabels" . | nindent 8 }}
@@ -52,8 +60,8 @@ spec:
               {{- else if .configMapKeyRef }}
               valueFrom:
                 configMapKeyRef:
-                  name: {{ tpl (.configMapName | toString) $ }}
-                  key: {{ tpl (.configMapKey | toString) $ }}
+                  name: {{ tpl (.configMapKeyRef.name | toString) $ }}
+                  key: {{ tpl (.configMapKeyRef.key | toString) $ }}
               {{- else if .fieldRef }}
               valueFrom:
                 fieldRef:
@@ -134,4 +142,4 @@ spec:
         {{- with .Values.backend.extraVolumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file