diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index 7e4f81cd52eb0791b9f9cea0e8b1f2c4aa6a7483..525cf2e219bd65e3edfade89158b536bd1fc71d8 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -32,7 +32,7 @@
 	<parent>
 		<groupId>de.itvsh.ozg</groupId>
 		<artifactId>goofy</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>1.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>alfa-service</artifactId>
diff --git a/alfa-xdomea/pom.xml b/alfa-xdomea/pom.xml
index 61f04572ae58e69f87f3cb228c4682338f5942a0..a9cd7ff41b85e50447fadb03e0535b1adca8ae52 100644
--- a/alfa-xdomea/pom.xml
+++ b/alfa-xdomea/pom.xml
@@ -32,7 +32,7 @@
 	<parent>
 		<groupId>de.itvsh.ozg</groupId>
 		<artifactId>goofy</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>1.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>alfa-xdomea</artifactId>
diff --git a/goofy-client/pom.xml b/goofy-client/pom.xml
index 0cda8691e2dce048d1d62f5c774a959e535f3019..12c63b3f1c46c5229234d41234f3f98b4d6babd6 100644
--- a/goofy-client/pom.xml
+++ b/goofy-client/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.itvsh.ozg</groupId>
 		<artifactId>goofy</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>1.17.0-SNAPSHOT</version>
 	</parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml
index 28fe2d2e897585e351e34b1582aa06d4ded23936..d8828e90c1595e36866312085376c49d5d71dfad 100644
--- a/goofy-server/pom.xml
+++ b/goofy-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.itvsh.ozg</groupId>
     <artifactId>goofy</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>goofy-server</artifactId>
diff --git a/pom.xml b/pom.xml
index f638626967522113a0fffbb5740fd92d5264d580..dede3f5826ca6b39158c118280e90cf83a47082a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
 	<groupId>de.itvsh.ozg</groupId>
 	<artifactId>goofy</artifactId>
-	<version>1.16.0-SNAPSHOT</version>
+	<version>1.17.0-SNAPSHOT</version>
 	<name>Goofy Parent</name>
 	<packaging>pom</packaging>
 
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