diff --git a/charts/mobile-api/Chart.yaml b/charts/mobile-api/Chart.yaml
index d736059..0844b10 100644
--- a/charts/mobile-api/Chart.yaml
+++ b/charts/mobile-api/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: mobile-api
 description: Helm chart for mobile-api app
 type: application
-version: 0.0.6
+version: 0.0.7
 appVersion: "0.0.31"
 keywords:
 - mobile-api
diff --git a/charts/mobile-api/templates/ingress.yaml b/charts/mobile-api/templates/ingress.yaml
index ea5fb62..d9dff84 100644
--- a/charts/mobile-api/templates/ingress.yaml
+++ b/charts/mobile-api/templates/ingress.yaml
@@ -11,9 +11,11 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "mobile-api.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
+  {{- if .Values.ingress.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
+    {{- range $key, $val := .Values.ingress.annotations }}
+    {{ $key }}: {{ $val | quote }}
+    {{- end }}
   {{- end }}
 spec:
   {{- if .Values.ingress.tls }}
diff --git a/charts/routing/Chart.yaml b/charts/routing/Chart.yaml
index 6a06113..71bc3fa 100644
--- a/charts/routing/Chart.yaml
+++ b/charts/routing/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: routing
 description: Helm chart for routing app
 type: application
-version: 0.0.6
+version: 0.0.7
 appVersion: "1.11.1"
 keywords:
 - routing
diff --git a/charts/routing/templates/ingress.yaml b/charts/routing/templates/ingress.yaml
index a49ee9b..7ddc1a5 100644
--- a/charts/routing/templates/ingress.yaml
+++ b/charts/routing/templates/ingress.yaml
@@ -11,9 +11,11 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "routing.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
+  {{- if .Values.ingress.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
+    {{- range $key, $val := .Values.ingress.annotations }}
+    {{ $key }}: {{ $val | quote }}
+    {{- end }}
   {{- end }}
 spec:
   {{- if .Values.ingress.tls }}