diff --git a/charts/element-web/templates/ingress.yaml b/charts/element-web/templates/ingress.yaml
index 797265e..1df9b06 100644
--- a/charts/element-web/templates/ingress.yaml
+++ b/charts/element-web/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "element-web.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
+{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
 {{- if $v1Ingress -}}
 apiVersion: networking.k8s.io/v1
 {{- else -}}
@@ -17,6 +17,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+{{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+{{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
diff --git a/charts/element-web/values.yaml b/charts/element-web/values.yaml
index 74536b9..930e10e 100644
--- a/charts/element-web/values.yaml
+++ b/charts/element-web/values.yaml
@@ -88,6 +88,10 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
+  ## Set the name of the IngressClass cluster resource (optional)
+  ## https://kubernetes.io/docs/reference/kubernetes-api/service-resources/ingress-v1/#IngressSpec
+  #className: can-be-anything
+
 ## Resource configuration for the application.
 ##
 resources: {}
diff --git a/charts/funkwhale/templates/ingress.yaml b/charts/funkwhale/templates/ingress.yaml
index cb96290..5443dfe 100644
--- a/charts/funkwhale/templates/ingress.yaml
+++ b/charts/funkwhale/templates/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "funkwhale.fullname" . -}}
-{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
+{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
 {{- if $v1Ingress -}}
 apiVersion: networking.k8s.io/v1
 {{- else -}}
@@ -19,6 +19,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+{{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}
diff --git a/charts/funkwhale/values.yaml b/charts/funkwhale/values.yaml
index d3c9ccb..713454a 100644
--- a/charts/funkwhale/values.yaml
+++ b/charts/funkwhale/values.yaml
@@ -30,6 +30,10 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
+  ## Set the name of the IngressClass cluster resource (optional)
+  ## https://kubernetes.io/docs/reference/kubernetes-api/service-resources/ingress-v1/#IngressSpec
+  #className: can-be-anything
+
 postgresql:
   ## If you already have a Postgresql service you'd like to use, set
   ## this to false and adjust the host to use your existing service.
diff --git a/charts/matrix-media-repo/templates/ingress.yaml b/charts/matrix-media-repo/templates/ingress.yaml
index e8ef4dd..cddbaf1 100644
--- a/charts/matrix-media-repo/templates/ingress.yaml
+++ b/charts/matrix-media-repo/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "matrix-media-repo.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
+{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
 {{- if $v1Ingress -}}
 apiVersion: networking.k8s.io/v1
 {{- else -}}
@@ -17,6 +17,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+{{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+{{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
diff --git a/charts/matrix-media-repo/values.yaml b/charts/matrix-media-repo/values.yaml
index a51eec3..20f6841 100644
--- a/charts/matrix-media-repo/values.yaml
+++ b/charts/matrix-media-repo/values.yaml
@@ -151,6 +151,10 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
+  ## Set the name of the IngressClass cluster resource (optional)
+  ## https://kubernetes.io/docs/reference/kubernetes-api/service-resources/ingress-v1/#IngressSpec
+  #className: can-be-anything
+
 ## Resource configuration for the application.
 ##
 resources: {}
diff --git a/charts/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml
index 6797149..c856968 100644
--- a/charts/matrix-synapse/templates/ingress.yaml
+++ b/charts/matrix-synapse/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "matrix-synapse.fullname" . -}}
 {{- $wkName := include "matrix-synapse.externalname" (dict "global" . "external" "wellknown-lighttpd") -}}
-{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
+{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
 {{- if $v1Ingress -}}
 apiVersion: networking.k8s.io/v1
 {{- else -}}
diff --git a/charts/netbox/templates/ingress.yaml b/charts/netbox/templates/ingress.yaml
index 4a82e30..fdf04b9 100644
--- a/charts/netbox/templates/ingress.yaml
+++ b/charts/netbox/templates/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "netbox.fullname" . -}}
-{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
+{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
 {{- if $v1Ingress -}}
 apiVersion: networking.k8s.io/v1
 {{- else -}}
@@ -19,6 +19,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+{{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}
diff --git a/charts/netbox/values.yaml b/charts/netbox/values.yaml
index 18ee581..8021c65 100644
--- a/charts/netbox/values.yaml
+++ b/charts/netbox/values.yaml
@@ -37,6 +37,10 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
+  ## Set the name of the IngressClass cluster resource (optional)
+  ## https://kubernetes.io/docs/reference/kubernetes-api/service-resources/ingress-v1/#IngressSpec
+  #className: can-be-anything
+
 postgresql:
   enabled: true
 
diff --git a/charts/radosgw/templates/ingress.yaml b/charts/radosgw/templates/ingress.yaml
index 60a8623..665d0c8 100644
--- a/charts/radosgw/templates/ingress.yaml
+++ b/charts/radosgw/templates/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "radosgw.fullname" . -}}
-{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
+{{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
 {{- if $v1Ingress -}}
 apiVersion: networking.k8s.io/v1
 {{- else -}}
@@ -16,6 +16,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+{{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}
diff --git a/charts/radosgw/values.yaml b/charts/radosgw/values.yaml
index 86704c0..840c5b9 100644
--- a/charts/radosgw/values.yaml
+++ b/charts/radosgw/values.yaml
@@ -41,6 +41,10 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
+  ## Set the name of the IngressClass cluster resource (optional)
+  ## https://kubernetes.io/docs/reference/kubernetes-api/service-resources/ingress-v1/#IngressSpec
+  #className: can-be-anything
+
 resources: {}
   # limits:
   #   cpu: 100m