diff --git a/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
index d70d00413..9ea5df0a6 100644
--- a/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
@@ -26,6 +26,7 @@
 {{- range .Values.controlplane.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $controlIngressName := printf "%s-controlplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -42,19 +43,19 @@ metadata:
     {{- $controlLabels | nindent 2 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
diff --git a/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
index 20788d85f..c270b59d7 100644
--- a/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
@@ -26,6 +26,7 @@
 {{- range .Values.dataplane.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $dataIngressName := printf "%s-dataplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -42,19 +43,19 @@ metadata:
     {{- $dataLabels | nindent 2 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
diff --git a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
index a5209ebbf..48be90a56 100644
--- a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
@@ -29,6 +29,7 @@
 {{- range .Values.runtime.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $controlIngressName := printf "%s-runtime-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -45,19 +46,19 @@ metadata:
     {{- $controlLabels | nindent 2 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
diff --git a/charts/tractusx-connector/templates/ingress-controlplane.yaml b/charts/tractusx-connector/templates/ingress-controlplane.yaml
index ee490510f..29bbc5c8c 100644
--- a/charts/tractusx-connector/templates/ingress-controlplane.yaml
+++ b/charts/tractusx-connector/templates/ingress-controlplane.yaml
@@ -29,6 +29,7 @@
 {{- range .Values.controlplane.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $controlIngressName := printf "%s-controlplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -45,19 +46,19 @@ metadata:
     {{- $controlLabels | nindent 2 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
diff --git a/charts/tractusx-connector/templates/ingress-dataplane.yaml b/charts/tractusx-connector/templates/ingress-dataplane.yaml
index 14e88bff9..32a05241c 100644
--- a/charts/tractusx-connector/templates/ingress-dataplane.yaml
+++ b/charts/tractusx-connector/templates/ingress-dataplane.yaml
@@ -29,6 +29,7 @@
 {{- range .Values.dataplane.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $dataIngressName := printf "%s-dataplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -45,19 +46,19 @@ metadata:
     {{- $dataLabels | nindent 2 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec: