diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbedbf2c..d3cd0c51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## In Development
+* Add support for providing `ingressClassName`. (#336) (by @mamercad)
 * Add an experimental GitHu/K3s Lint and End-to-End testing workflow. (#243) (by @mamercad)
 * Set `st2client` resources by `values.yaml`. (#337) (by @mamercad)
 * Switch to the official `bats` Docker image for e2e tests. (#338)
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
index 53e7caa3..cc25e61d 100644
--- a/templates/ingress.yaml
+++ b/templates/ingress.yaml
@@ -17,6 +17,9 @@ metadata:
       {{- toYaml .Values.ingress.annotations | nindent 4 }}
     {{- end }}
 spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
   - host: {{ .host }}
diff --git a/values.yaml b/values.yaml
index b039ff87..dfc96d3e 100644
--- a/values.yaml
+++ b/values.yaml
@@ -289,6 +289,7 @@ ingress:
   # - secretName: chart-example-tls
   #   hosts:
   #     - chart-example.test
+  # ingressClassName: nginx-ingress
 
 ##
 ## NOTE: there used to be a secrets.st2 section here. These values have moved into st2.* above. Please update your values.