diff --git a/charts/shc/templates/ingress.yaml b/charts/shc/templates/ingress.yaml
index d140ea1..d098845 100644
--- a/charts/shc/templates/ingress.yaml
+++ b/charts/shc/templates/ingress.yaml
@@ -6,7 +6,9 @@ metadata:
   name: {{ .Values.service.name }}
   namespace: {{ .Values.global.namespace | default .Release.Namespace }}
   annotations:
-    {{- toYaml .Values.service.ingress.annotations | nindent 4 }}
+    {{- range $key, $value := .Values.service.ingress.annotations}}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
     {{- if .Values.service.tls.enabled }}
     tls/enabled: "true"
     {{- end }}
diff --git a/charts/shc/values.yaml b/charts/shc/values.yaml
index 8122c06..886f501 100644
--- a/charts/shc/values.yaml
+++ b/charts/shc/values.yaml
@@ -153,15 +153,14 @@ service:
     adminHost: admin.example.com
     backendHost: backend.example.com
     className: nginx # nginx, alb, traefik
-
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    service.kubernetes.io/load-balancer-type: "External"
-    # Example AWS ALB internal configuration
-    # alb.ingress.kubernetes.io/scheme: "internal"
-    # alb.ingress.kubernetes.io/security-groups: "sg-12345678"
-    # alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:region:account-id:certificate/cert-id"
+    annotations:
+      # kubernetes.io/ingress.class: nginx
+      # nginx.ingress.kubernetes.io/ssl-redirect: "false"
+      # service.kubernetes.io/load-balancer-type: "External"
+      # Example AWS ALB internal configuration
+      # alb.ingress.kubernetes.io/scheme: "internal"
+      # alb.ingress.kubernetes.io/security-groups: "sg-12345678"
+      # alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:region:account-id:certificate/cert-id"
 
   # TLS Configuration
   tls:
diff --git a/charts/she/templates/ingress.yaml b/charts/she/templates/ingress.yaml
index 89c324d..ad27dc4 100644
--- a/charts/she/templates/ingress.yaml
+++ b/charts/she/templates/ingress.yaml
@@ -6,7 +6,9 @@ metadata:
   name: {{ .Values.service.name }}
   namespace: {{ .Values.global.namespace | default .Release.Namespace }}
   annotations:
-    {{- toYaml .Values.service.ingress.annotations | nindent 4 }}
+    {{- range $key, $value := .Values.service.ingress.annotations}}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
     {{- if .Values.service.tls.enabled }}
     tls/enabled: "true"
     {{- end }}
diff --git a/charts/she/values.yaml b/charts/she/values.yaml
index 3ebcb09..dc7739d 100644
--- a/charts/she/values.yaml
+++ b/charts/she/values.yaml
@@ -207,15 +207,14 @@ service:
     adminHost: admin.example.com
     backendHost: backend.example.com
     className: nginx # nginx, alb, traefik
-
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    service.kubernetes.io/load-balancer-type: "External"
-    # Example AWS ALB internal configuration
-    # alb.ingress.kubernetes.io/scheme: "internal"
-    # alb.ingress.kubernetes.io/security-groups: "sg-12345678"
-    # alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:region:account-id:certificate/cert-id"
+    annotations:
+      # kubernetes.io/ingress.class: nginx
+      # nginx.ingress.kubernetes.io/ssl-redirect: "false"
+      # service.kubernetes.io/load-balancer-type: "External"
+      # Example AWS ALB internal configuration
+      # alb.ingress.kubernetes.io/scheme: "internal"
+      # alb.ingress.kubernetes.io/security-groups: "sg-12345678"
+      # alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:region:account-id:certificate/cert-id"
 
   # TLS Configuration
   tls: