diff --git a/assets/auto-deploy-app/templates/ingress.yaml b/assets/auto-deploy-app/templates/ingress.yaml
index c0c66b6674b6ce596dbe160a0e6c8dde524bb6d4..f14d438b40db3a8cbd6d688d7ae4088288edf750 100644
--- a/assets/auto-deploy-app/templates/ingress.yaml
+++ b/assets/auto-deploy-app/templates/ingress.yaml
@@ -12,8 +12,10 @@ metadata:
   labels:
 {{ include "sharedlabels" . | indent 4 }}
   annotations:
-{{- if not (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") }}
-    kubernetes.io/ingress.class: {{ .Values.ingress.className | quote }}
+{{- if not (or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress")
+               (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class"))
+}}
+    kubernetes.io/ingress.class: {{ .Values.ingress.className | default "nginx" | quote }}
 {{- end }}
 {{- if .Values.ingress.annotations }}
 {{ toYaml .Values.ingress.annotations | indent 4 }}
@@ -46,8 +48,11 @@ metadata:
 
 {{- end }}
 spec:
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
-  ingressClassName: {{ .Values.ingress.className | quote }}
+{{- if and (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress")
+           (or (hasKey .Values.ingress "className")
+               (not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class")))
+}}
+  ingressClassName: {{ .Values.ingress.className | default "nginx" | quote }}
 {{- end }}
 {{- if .Values.ingress.tls.enabled }}
   tls:
diff --git a/assets/auto-deploy-app/values.yaml b/assets/auto-deploy-app/values.yaml
index 2f4b01f59f5d747c7bad26c600d688605c9dbccd..c23b9595b4f3eb3a4001cf15a2120f8c697d455f 100644
--- a/assets/auto-deploy-app/values.yaml
+++ b/assets/auto-deploy-app/values.yaml
@@ -80,7 +80,7 @@ ingress:
     acme: true
     secretName: ""
     useDefaultSecret: false
-  className: nginx
+  # className: nginx
   modSecurity:
     enabled: false
     secRuleEngine: "DetectionOnly"
@@ -90,6 +90,7 @@ ingress:
     #     action: ""
   canary:
     weight:
+  annotations: {}
 prometheus:
   metrics: false
 livenessProbe: