diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
index b34e2579e..5c6658126 100644
--- a/charts/kong/CHANGELOG.md
+++ b/charts/kong/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+### Changes
+
+* Align `IngressClass.spec.controller` with `ingressController.ingressClass`
+  when using multiple controllers or a non-default ingress class.
+
 ## 3.2.0
 
 ### Changes
diff --git a/charts/kong/templates/ingress-class.yaml b/charts/kong/templates/ingress-class.yaml
index 076a0cfe9..659085ad3 100644
--- a/charts/kong/templates/ingress-class.yaml
+++ b/charts/kong/templates/ingress-class.yaml
@@ -29,5 +29,5 @@ metadata:
   labels:
   {{- include "kong.metaLabels" . | nindent 4 }}
 spec:
-  controller: ingress-controllers.konghq.com/kong
+  controller: ingress-controllers.konghq.com/{{ .Values.ingressController.ingressClass }}
 {{- end -}}