diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index 374c0ac57f2964ec534aaac29a92384f312f08c4..da1a9789fb1dc5410f6fb8cf5a65bc58d201eeda 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -35,8 +35,8 @@ metadata:
   name: {{ include "app.name" . }}
   namespace: {{ include "app.namespace" . }}
 spec:
-  {{- if ne (.Values).cluster_env "dataport"}}
-  ingressClassName: nginx
+  {{- if and (.Values.ingress).className (ne (.Values).cluster_env "dataport") }}
+  ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
   rules:
     - http:
diff --git a/src/test/helm/deployment_defaults_annotaion_test.yaml b/src/test/helm/deployment_defaults_annotaion_test.yaml
index b310cbf8c7526eff7f784f6ba7862e869dca8cbf..d6e0e9326efbcf9be4203d604b13971435e6b0a2 100644
--- a/src/test/helm/deployment_defaults_annotaion_test.yaml
+++ b/src/test/helm/deployment_defaults_annotaion_test.yaml
@@ -36,9 +36,8 @@ tests:
       - equal:
           path: metadata.annotations.[cert-manager.io/cluster-issuer]
           value: letsencrypt-prod
-      - equal:
+      - isNull:
           path: spec.ingressClassName
-          value: nginx
       - equal:
           path: spec.tls[0].secretName
           value: helm-goofy-tls
diff --git a/src/test/helm/ingress-nginx-tests.yaml b/src/test/helm/ingress-nginx-tests.yaml
index c7edb23088e27c5997a1689c5cfd9473992e1d18..2e897d49e43ecbe692ca4d40770e6ddc0603dfae 100644
--- a/src/test/helm/ingress-nginx-tests.yaml
+++ b/src/test/helm/ingress-nginx-tests.yaml
@@ -29,11 +29,8 @@ release:
 templates:
   - templates/ingress.yaml
 tests:
-  - it: should create ingress tls/ingressClass
+  - it: should create ingress tls
     asserts:
-      - equal:
-          path: spec.ingressClassName
-          value: nginx
       - equal:
           path: spec.tls[0].secretName
           value: helm-goofy-tls
@@ -72,4 +69,15 @@ tests:
     asserts:
       - equal:
           path: metadata.annotations.[nginx.ingress.kubernetes.io/proxy-body-size]
-          value: 42m
\ No newline at end of file
+          value: 42m
+  - it: should not set ingressClassName
+    asserts:
+      - isNull:
+          path: spec.ingressClassName
+  - it: should set ingressClassName
+    set:
+      ingress.className: nginx
+    asserts:
+      - equal:
+          path: spec.ingressClassName
+          value: nginx
\ No newline at end of file