diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
index b34e2579e..a18fd13a3 100644
--- a/charts/kong/CHANGELOG.md
+++ b/charts/kong/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## Unreleased
+
+### Changes
+
+* Align `IngressClass.spec.controller` and Gateway API
+  `CONTROLLER_GATEWAY_API_CONTROLLER_NAME` with `ingressController.ingressClass`
+  when using multiple controllers or a non-default ingress class.
+
 ## 3.2.0
 
 ### Changes
diff --git a/charts/kong/templates/_helpers.tpl b/charts/kong/templates/_helpers.tpl
index 28c202ad3..7ab83aa2e 100644
--- a/charts/kong/templates/_helpers.tpl
+++ b/charts/kong/templates/_helpers.tpl
@@ -502,6 +502,7 @@ The name of the Service which will be used by the controller to update the Ingre
   {{- $_ := set $autoEnv "CONTROLLER_KONG_ADMIN_TLS_SKIP_VERIFY" true -}}
   {{- $_ := set $autoEnv "CONTROLLER_PUBLISH_SERVICE" ( include "kong.controller-publish-service" . ) -}}
   {{- $_ := set $autoEnv "CONTROLLER_INGRESS_CLASS" .Values.ingressController.ingressClass -}}
+  {{- $_ := set $autoEnv "CONTROLLER_GATEWAY_API_CONTROLLER_NAME" (printf "ingress-controllers.konghq.com/-%s" .Values.ingressController.ingressClass) -}}
   {{- $_ := set $autoEnv "CONTROLLER_ELECTION_ID" (printf "kong-ingress-controller-leader-%s" .Values.ingressController.ingressClass) -}}
 
   {{- if .Values.ingressController.admissionWebhook.enabled }}
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 -}}