diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
index b3c6b0b0..eef924f1 100644
--- a/chart/templates/ingress.yaml
+++ b/chart/templates/ingress.yaml
@@ -27,6 +27,9 @@ metadata:
   {{- .Values.aws.ingress.annotations | toYaml | nindent 4 }}
   {{ end }}
 spec:
+  {{ if .Values.aws.enabled }}
+  ingressClassName: aws
+  {{ end }}
   rules:
     {{ if .Values.localDev.enabled }}
     - host: unguard.kube
diff --git a/chart/values.yaml b/chart/values.yaml
index 020676ad..449b7fa4 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -16,7 +16,6 @@ aws:
   enabled: false
   ingress:
     annotations:
-      kubernetes.io/ingress.class: alb
       alb.ingress.kubernetes.io/target-type: ip
       alb.ingress.kubernetes.io/scheme: internal
       alb.ingress.kubernetes.io/load-balancer-name: "unguard-lb"