diff --git a/charts/focalboard/Chart.yaml b/charts/focalboard/Chart.yaml
index 21abd355..203d418b 100644
--- a/charts/focalboard/Chart.yaml
+++ b/charts/focalboard/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: focalboard
 description: Focalboard Server
 type: application
-version: 0.5.0
+version: 0.5.1
 appVersion: "0.6.7"
 keywords:
   - focalboard
diff --git a/charts/focalboard/templates/ingress.yaml b/charts/focalboard/templates/ingress.yaml
index 8a2c30cc..e3057777 100644
--- a/charts/focalboard/templates/ingress.yaml
+++ b/charts/focalboard/templates/ingress.yaml
@@ -18,6 +18,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
diff --git a/charts/focalboard/values.yaml b/charts/focalboard/values.yaml
index 3077d3be..bb7ece9d 100644
--- a/charts/focalboard/values.yaml
+++ b/charts/focalboard/values.yaml
@@ -43,6 +43,7 @@ service:
 
 ingress:
   enabled: false
+  className: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"