diff --git a/charts/refinery/templates/NOTES.txt b/charts/refinery/templates/NOTES.txt
index ff2d5a47..51bc74ca 100644
--- a/charts/refinery/templates/NOTES.txt
+++ b/charts/refinery/templates/NOTES.txt
@@ -1,2 +1,6 @@
+{{- if .Values.ingressClassName }}
+{{- fail "value for .Values.ingressClassName cannot be set" }}
+{{ end }}
+
 Honeycomb refinery is setup and configured to refine events that are sent through it. You should see data flowing
 within a few minutes at https://ui.honeycomb.io
diff --git a/charts/refinery/templates/ingress-grpc.yaml b/charts/refinery/templates/ingress-grpc.yaml
index d3789f50..ade3eae3 100644
--- a/charts/refinery/templates/ingress-grpc.yaml
+++ b/charts/refinery/templates/ingress-grpc.yaml
@@ -25,8 +25,8 @@ spec:
       secretName: {{ .secretName }}
     {{- end }}
   {{- end }}
-  {{- if .Values.ingress.className }}
-  ingressClassName: {{ .Values.ingress.className }}
+  {{- if .Values.grpcIngress.className }}
+  ingressClassName: {{ .Values.grpcIngress.className }}
   {{- end }}
   rules:
     {{- range .Values.grpcIngress.hosts }}
diff --git a/charts/refinery/templates/ingress.yaml b/charts/refinery/templates/ingress.yaml
index ed6e877c..6537dfb2 100644
--- a/charts/refinery/templates/ingress.yaml
+++ b/charts/refinery/templates/ingress.yaml
@@ -25,8 +25,8 @@ spec:
       secretName: {{ .secretName }}
     {{- end }}
   {{- end }}
-  {{- if .Values.ingressClassName }}
-  ingressClassName: {{ .Values.ingressClassName }}
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
diff --git a/charts/refinery/values.yaml b/charts/refinery/values.yaml
index 6c8e7129..693b2e41 100644
--- a/charts/refinery/values.yaml
+++ b/charts/refinery/values.yaml
@@ -209,6 +209,7 @@ ingress:
   #  - secretName: refinery-tls
   #    hosts:
   #      - refinery.local
+  className: ""
 
 grpcIngress:
   enabled: false
@@ -223,6 +224,7 @@ grpcIngress:
   #  - secretName: refinery-tls
   #    hosts:
   #      - refinery.local
+  className: ""
 
 # Setup autoscaling for refinery
 # When autoscaling events occur, trace sharding will be recomputed. This will result in traces with missing spans being