diff --git a/Jenkinsfile b/Jenkinsfile
index a7f13d3dc3744b26dfcac42a283490d8a9eccbd9..af6fbccf364ea343309b20ca02ce02e776abc1db 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -131,7 +131,7 @@ pipeline {
                     dir('src/main/helm') {
                         sh "helm lint -f test-values.yaml"
 
-                        sh "helm unittest -f '../../test/helm/*.yaml' ."
+                        sh "helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."
 
                         sh "helm package --version=${HELM_CHART_VERSION} ."
 
@@ -250,7 +250,7 @@ Void setNewProvisioningVersion(String environment) {
 
         envVersions.versions.afm_adapter.image.tag = IMAGE_TAG
         envVersions.versions.fs_adapter.image.tag = IMAGE_TAG
-        envVersions.charts.intelliform_adapter.version = HELM_CHART_VERSION
+        // envVersions.charts.intelliform_adapter.version = HELM_CHART_VERSION
 
 
         writeYaml file: envFile, data: envVersions, overwrite: true
diff --git a/common/pom.xml b/common/pom.xml
index 0cb4676653831abfbff979924b43b26e01199cde..8b1029aac916c9fd1cb96f119223f9d930333a4b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -32,7 +32,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.25.0</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>common</artifactId>
diff --git a/formsolutions-adapter/pom.xml b/formsolutions-adapter/pom.xml
index 44a2bac9406060bea82f4b0d24de0e0cd66e883e..085f27c37e3f7475ae0029e711c553019ccd6760 100644
--- a/formsolutions-adapter/pom.xml
+++ b/formsolutions-adapter/pom.xml
@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/forwarder/pom.xml b/forwarder/pom.xml
index 261e4bc343d8060ecc3302c38e05c0808b19aeff..f20278dc3821d6e4b4d0222a92d1e54ba8aa430b 100644
--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml
index e337082f140fd5f2b95d829ec338f5bbb1d20ad8..5f95b26720e0babfb20c5a1eae5b77c7ab29678a 100644
--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -33,7 +33,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index b51eba22f3162298ca06de65e58c0aa35311e45c..4ee5b8d570618e4edb9d2b37cc55e3e5d1a5428f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
 <!--
-
     Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
     Ministerpräsidenten des Landes Schleswig-Holstein
     Staatskanzlei
@@ -30,12 +29,12 @@
 	<artifactId>parent</artifactId>
 	<name>Eingangs Adapter - Parent</name>
 	<packaging>pom</packaging>
-	<version>0.25.0-SNAPSHOT</version>
+	<version>0.26.0-SNAPSHOT</version>
 
 	<parent>
 		<groupId>de.itvsh.kop.common</groupId>
 		<artifactId>kop-common-parent</artifactId>
-		<version>1.2.1</version>
+		<version>1.3.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -51,11 +50,11 @@
 	<properties>
 		<mapstruct.version>1.4.2.Final</mapstruct.version>
 
-		<pluto.version>0.31.0</pluto.version>
+		<pluto.version>1.1.0</pluto.version>
 
 		<jsoup.version>1.14.3</jsoup.version>
 		<xmlschema.version>2.3.0</xmlschema.version>
-		<kop.license.version>1.3.0-SNAPSHOT</kop.license.version>
+		<kop.license.version>1.3.0</kop.license.version>
 
 		<!-- plugins -->
 		<jaxb2-plugin.version>0.14.0</jaxb2-plugin.version>
diff --git a/router/pom.xml b/router/pom.xml
index 9592b098164a880bf707f87c051f31296acc9190..da8ec73a25cd2f2c10f678237b4eeb434684acc5 100644
--- a/router/pom.xml
+++ b/router/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/semantik-adapter/pom.xml b/semantik-adapter/pom.xml
index 8c3f9da05e936000ca60b431d65b53b9801005b7..01a886456a5af85dbf7e039ab88d67b2c260a8ec 100644
--- a/semantik-adapter/pom.xml
+++ b/semantik-adapter/pom.xml
@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>semantik-adapter</artifactId>
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index db0d7ca50f41352f3573dedbabfaeb72f7cf95d7..1fdd289fff80a710a0cce64eca60f66734539e48 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -48,7 +48,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end }}
 {{- end }}
 
-
 {{- define "app.envSpringProfiles" }}
 {{- if (.Values.env).overrideSpringProfiles -}}
 {{ printf "%s" (.Values.env).overrideSpringProfiles }}
@@ -57,12 +56,10 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 {{- end -}}
 
-
 {{- define "app.kopEnvironment" -}}
 {{- required "Environment muss angegeben sein" (.Values.kop).environment -}}
 {{- end -}}
 
-
 {{- define "app.kopBezeichner" -}}
 {{ $length := len (.Values.kop).bezeichner }}
 {{- if ge 27 $length -}}
@@ -72,7 +69,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 {{- end -}}
 
-
 {{- define "app.resources" }}
 {{- if eq (include "app.kopEnvironment" . ) "prod" }}
   limits:
@@ -91,32 +87,10 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end }}
 {{- end -}}
 
-
 {{- define "app.ingress.host" }}
-{{- if .Values.ingress.overrideHost }}
-{{- printf "%s" ( trimPrefix "https://" .Values.ingress.overrideHost ) }}
-{{- else }}
-
-{{- if eq (include "app.kopEnvironment" . ) "prod" }}
-{{- if eq (.Values.image).name "formsolutions-adapter" }}
-{{- printf "%s.fs.ozg-sh.de" (include "app.kopBezeichner" .) }}
-{{- else }}
-{{- printf "%s.afm.ozg-sh.de" (include "app.kopBezeichner" .) }}
-{{- end }}
-
-{{- else if eq (include "app.kopEnvironment" . ) "stage" }}
-{{- if eq (.Values.image).name "formsolutions-adapter" }}
-{{- printf "%s.stage.fs.ozg-sh.de" (include "app.kopBezeichner" .) }}
-{{- else }}
-{{- printf "%s.stage.afm.ozg-sh.de" (include "app.kopBezeichner" .) }}
-{{- end }}
-
-{{- else }}
 {{- if eq (.Values.image).name "formsolutions-adapter" }}
-{{- printf "%s-fs.%s.ozg-sh.de" (include "app.kopBezeichner" .)  (include "app.kopEnvironment" . ) }}
+{{- printf "%s-fs.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
 {{- else }}
-{{- printf "%s-afm.%s.ozg-sh.de" (include "app.kopBezeichner" .) (include "app.kopEnvironment" . ) }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- printf "%s-afm.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
 {{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index 330b9d3e7b914d480e99b4a69df385f5a03a0e37..aecae6e6c99432817bd82c858d21d0d17ad56213 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -26,12 +26,14 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  {{- with .Values.ingressAnnotations }}
-  annotations: {{- toYaml . | nindent 4 }}
-  {{- end }}
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
   name: {{ include "app.name" . }}
   namespace: {{ include "app.namespace" . }}
 spec:
+  {{- if ne (.Values).cluster_env "dataport"}}
+  ingressClassName: nginx
+  {{- end }}
   rules:
     - http:
         paths:
@@ -46,4 +48,7 @@ spec:
   tls:
     - hosts:
       - {{ include "app.ingress.host" . }}
+      {{- if ne (.Values).cluster_env "dataport" }}
+      secretName: {{ .Values.kop.bezeichner }}-{{ include "app.name" . }}-tls
+      {{- end }}
 {{- end -}}
\ No newline at end of file
diff --git a/src/main/helm/test-values.yaml b/src/main/helm/test-values.yaml
index 315c15a39dbd1ae230a7ccd991bbab36fa2b4abc..1e4309e077377914c09dbce38f5a2c045ae040ca 100644
--- a/src/main/helm/test-values.yaml
+++ b/src/main/helm/test-values.yaml
@@ -21,7 +21,7 @@
 # Die sprachspezifischen Genehmigungen und Beschränkungen
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
-
 kop:
   environment: test
-  bezeichner: helm
\ No newline at end of file
+  bezeichner: helm
+  bundesland: sh
\ No newline at end of file
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 9777e18eb34ae803ade6cd9fd612258dd22dfc5e..cba43cd643088076f6c5c2a2ce36601b9e06edd1 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -21,6 +21,9 @@
 # Die sprachspezifischen Genehmigungen und Beschränkungen
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
+cluster_env: ""
+
+baseUrl: test.sh.ozg-cloud.de
 
 image:
   repo: docker.ozg-sh.de
@@ -40,11 +43,6 @@ image:
 #    cpu: 100m # [default: 100m]
 #    memory: 250Mi # [default: 250Mi]
 
-ingressAnnotations:
-  kubernetes.io/ingress.class: traefik
-  traefik.ingress.kubernetes.io/router.entrypoints: websecure
-  traefik.ingress.kubernetes.io/router.tls: "true"
-
 imageCredentials:
   registry: docker.ozg-sh.de
   username: kop
@@ -59,7 +57,3 @@ routing:
   targetPlutoName: pluto
 #  fallbackStrategy: DENY
 #  routingStrategy: SINGLE
-
-# kop:
-#   environment: dev
-#   bezeichner: helm
\ No newline at end of file
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index 9202e61ed4fc32ddd3bdce8b64729d0c96454cec..70290fea51b754e5afad5b89d5fb0c98cc7594b5 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -32,8 +32,6 @@ templates:
   - templates/service.yaml
 tests:
   - it: check default labels
-    set:
-      kop.environment: dev
     asserts:
       - equal:
           path: metadata.labels.[app.kubernetes.io/instance]
diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml
index 525c2c98a76c4231495dc0520660d858d3ec525e..51fc54a9d7a2dafbed105d7cb8b2694f4ce7414a 100644
--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -29,7 +29,6 @@ tests:
   - it: check customList
     template: deployment.yaml
     set:
-      kop.environment: test
       env.customList:
         - name: my_test_environment_name
           value: "A test value"
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index 854c1486fe0604fdf0f2ed1d3f1f6086bcbc65e0..588505e7ed340abef50404ea1ec69a6848fbc8d4 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -30,7 +30,7 @@ templates:
 tests:
   - it: test resources for prod environment
     release:
-      namespace: sh-name-prod
+      namespace: sh-helm-prod
     set:
       kop.environment: prod
     asserts:
@@ -48,9 +48,7 @@ tests:
           value: 250Mi
   - it: test default resources
     release:
-      namespace: sh-name-dev
-    set:
-      kop.environment: dev
+      namespace: sh-helm-test
     asserts:
       - equal:
           path: spec.template.spec.containers[0].resources.limits.cpu
diff --git a/src/test/helm/deployment_routing-strategy.yaml b/src/test/helm/deployment_routing-strategy.yaml
index cfc5b45f44f9750a773183eed9d071b193e8af98..7705a4af992be0edfd6f80ee41e6c220a35a4906 100644
--- a/src/test/helm/deployment_routing-strategy.yaml
+++ b/src/test/helm/deployment_routing-strategy.yaml
@@ -32,8 +32,6 @@ set:
   image.tag: latest
 tests:
   - it: validate default routing values without questions.yaml
-    set:
-      kop.environment: test
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -47,7 +45,6 @@ tests:
             value: DENY
   - it: validate routing infos
     set:
-      kop.environment: test
       routing.routingStrategy: MULTI
       routing.fallbackStrategy: FUNDSTELLE
     asserts:
diff --git a/src/test/helm/deployment_springProfile_test.yaml b/src/test/helm/deployment_springProfile_test.yaml
index 36d372f7372dfc45f3e5135f2cc6a6c95ad72ccd..dcdccb8008eea2ea7e84b4a49e8dd81aa524a37b 100644
--- a/src/test/helm/deployment_springProfile_test.yaml
+++ b/src/test/helm/deployment_springProfile_test.yaml
@@ -30,7 +30,6 @@ templates:
 tests:
   - it: should override spring profiles
     set:
-      kop.environment: test
       env.overrideSpringProfiles: oc,stage,ea
     asserts:
       - isKind:
@@ -41,8 +40,6 @@ tests:
             name: spring_profiles_active
             value: oc,stage,ea
   - it: should generate spring profiles
-    set:
-      kop.environment: test
     asserts:
       - isKind:
           of: Deployment
diff --git a/src/test/helm/deployment_test.yaml b/src/test/helm/deployment_test.yaml
index 0ef307b73378c16c6dc806dfe6118e1a7d00f6c5..02ab7be03b1f0d6d1640dec5eaaec3ad01c908ad 100644
--- a/src/test/helm/deployment_test.yaml
+++ b/src/test/helm/deployment_test.yaml
@@ -30,9 +30,6 @@ templates:
   - deployment.yaml
 tests:
   - it: validate image type and container image
-    set:
-      kop.environment: test
-      image.tag: latest
     asserts:
       - isKind:
           of: Deployment
@@ -40,9 +37,6 @@ tests:
           path: spec.template.spec.containers[0].image
           value: docker.ozg-sh.de/intelliform-adapter:latest
   - it: validate image pull secret resource name
-    set:
-      kop.environment: test
-      image.tag: latest
     asserts:
       - equal:
           path: spec.template.spec.imagePullSecrets[0].name
diff --git a/src/test/helm/image-pull-secret-test.yaml b/src/test/helm/image-pull-secret-test.yaml
index 76641b50b6700d80d80814b00859edbef71ada00..423d6268f8fea790bd466277a96f93c9594600a7 100644
--- a/src/test/helm/image-pull-secret-test.yaml
+++ b/src/test/helm/image-pull-secret-test.yaml
@@ -28,8 +28,6 @@ templates:
 release:
   name: intelliform-adaptero
   namespace: helm-test
-set:
-  image.name: intelliform-adapter
 tests:
   - it: should match basic data
     asserts:
diff --git a/src/test/helm/ingress-create-or-not.yaml b/src/test/helm/ingress-create-or-not.yaml
index 0f97df76002f928f105bf0a11d6614e976499bb2..7bf967dda4211df292b300c73a6c3f8265a4320a 100644
--- a/src/test/helm/ingress-create-or-not.yaml
+++ b/src/test/helm/ingress-create-or-not.yaml
@@ -29,8 +29,6 @@ tests:
   - it: create ingress by config
     set:
       ingress.enabled: true
-      kop.environment: dev
-      kop.bezeichner: unit
     asserts:
       - isKind:
           of: Ingress
@@ -41,9 +39,6 @@ tests:
       - hasDocuments:
           count: 0
   - it: ingress should be created by default
-    set:
-      kop.environment: dev
-      kop.bezeichner: unit
     asserts:
       - isKind:
           of: Ingress
diff --git a/src/test/helm/ingress-nginx-tests.yaml b/src/test/helm/ingress-nginx-tests.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..22163d74ee2a09b9cb9fd3445d7fd68430e6a9fd
--- /dev/null
+++ b/src/test/helm/ingress-nginx-tests.yaml
@@ -0,0 +1,72 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test ingress options
+templates:
+  - templates/ingress.yaml
+tests:
+  - it: should create afm ingress tls/ingressClass
+    release:
+      name: afm-adapter
+    asserts:
+      - equal:
+          path: spec.ingressClassName
+          value: nginx
+      - equal:
+          path: spec.tls[0].secretName
+          value: helm-afm-adapter-tls
+  - it: should create afm ingress tls/ingressClass
+    release:
+      name: fs-adapter
+    set:
+      image.name: formsolutions-adapter
+    asserts:
+      - equal:
+          path: spec.ingressClassName
+          value: nginx
+      - equal:
+          path: spec.tls[0].secretName
+          value: helm-fs-adapter-tls
+
+  - it: should not create afm ingress tls/ingressClass
+    release:
+      name: afm-adapter
+    set:
+      cluster_env: dataport
+    asserts:
+      - isNull:
+          path: spec.ingressClassName
+      - isNull:
+          path: spec.tls[0].secretName
+  - it: should not create afm ingress tls/ingressClass
+    release:
+      name: fs-adapter
+    set:
+      image.name: formsolutions-adapter
+      cluster_env: dataport
+    asserts:
+      - isNull:
+          path: spec.ingressClassName
+      - isNull:
+          path: spec.tls[0].secretName
\ No newline at end of file
diff --git a/src/test/helm/ingress_test.yaml b/src/test/helm/ingress_test.yaml
index 8a8a059c85c66d95331bee77d8a9f0d77cf8dfbe..0ec5a6754e954628adef91be0558eec7915d225b 100644
--- a/src/test/helm/ingress_test.yaml
+++ b/src/test/helm/ingress_test.yaml
@@ -30,9 +30,6 @@ templates:
   - templates/ingress.yaml
 tests:
   - it: should match basic data
-    set:
-      kop.environment: dev
-      kop.bezeichner: unit
     asserts:
       - containsDocument:
           kind: Ingress
@@ -44,140 +41,41 @@ tests:
           path: metadata.namespace
           value: sh-helm-test
   - it: should match service port number
-    set:
-      kop.environment: dev
-      kop.bezeichner: unit
     asserts:
       - equal:
           path: spec.rules[0].http.paths[0].backend.service.port.number
           value: 8080
   - it: should match service name
-    set:
-      kop.environment: dev
-      kop.bezeichner: unit
     asserts:
       - equal:
           path: spec.rules[0].http.paths[0].backend.service.name
           value: intelliform-adapter
   - it: should match service path
-    set:
-      kop.environment: dev
-      kop.bezeichner: unit
     asserts:
       - isEmpty:
           path: spec.rules[0].http.paths[0].path
   - it: should match service pathType
-    set:
-      kop.environment: dev
-      kop.bezeichner: unit
     asserts:
       - equal:
           path: spec.rules[0].http.paths[0].pathType
           value: ImplementationSpecific
-  - it: should create afm dev host
-    set:
-      kop.environment: dev
-      kop.bezeichner: unit
-    asserts:
-      - equal:
-          path: spec.rules[0].host
-          value: unit-afm.dev.ozg-sh.de
-      - equal:
-          path: spec.tls[0].hosts[0]
-          value: unit-afm.dev.ozg-sh.de
-  - it: should create afm test host
-    set:
-      kop.environment: test
-      kop.bezeichner: unit
-    asserts:
-      - equal:
-          path: spec.rules[0].host
-          value: unit-afm.test.ozg-sh.de
-      - equal:
-          path: spec.tls[0].hosts[0]
-          value: unit-afm.test.ozg-sh.de
-  - it: should create afm prod host
-    set:
-      kop.environment: prod
-      kop.bezeichner: unit
-    asserts:
-      - equal:
-          path: spec.rules[0].host
-          value: unit.afm.ozg-sh.de
-      - equal:
-          path: spec.tls[0].hosts[0]
-          value: unit.afm.ozg-sh.de
-  - it: should create afm stage host
-    set:
-      kop.environment: stage
-      kop.bezeichner: unit
-    asserts:
-      - equal:
-          path: spec.rules[0].host
-          value: unit.stage.afm.ozg-sh.de
-      - equal:
-          path: spec.tls[0].hosts[0]
-          value: unit.stage.afm.ozg-sh.de
-  - it: should set host
-    release:
-      namespace: sh-unit-stage
-    set:
-      ingress.overrideHost: https://host.dev.ozg-sh.de
-      kop.environment: dev
-      kop.bezeichner: unit
+  - it: should create afm host
     asserts:
       - equal:
           path: spec.rules[0].host
-          value: host.dev.ozg-sh.de
+          value: helm-afm.test.sh.ozg-cloud.de
       - equal:
           path: spec.tls[0].hosts[0]
-          value: host.dev.ozg-sh.de
+          value: helm-afm.test.sh.ozg-cloud.de
 
-  - it: should create fs dev host
-    set:
-      image.name: formsolutions-adapter
-      kop.environment: dev
-      kop.bezeichner: unit
-    asserts:
-      - equal:
-          path: spec.rules[0].host
-          value: unit-fs.dev.ozg-sh.de
-      - equal:
-          path: spec.tls[0].hosts[0]
-          value: unit-fs.dev.ozg-sh.de
-  - it: should create fs test host
-    set:
-      image.name: formsolutions-adapter
-      kop.environment: test
-      kop.bezeichner: unit
-    asserts:
-      - equal:
-          path: spec.rules[0].host
-          value: unit-fs.test.ozg-sh.de
-      - equal:
-          path: spec.tls[0].hosts[0]
-          value: unit-fs.test.ozg-sh.de
-  - it: should create fs prod host
-    set:
-      image.name: formsolutions-adapter
-      kop.environment: prod
-      kop.bezeichner: unit
-    asserts:
-      - equal:
-          path: spec.rules[0].host
-          value: unit.fs.ozg-sh.de
-      - equal:
-          path: spec.tls[0].hosts[0]
-          value: unit.fs.ozg-sh.de
-  - it: should create fs stage host
+
+  - it: should create fs host
     set:
       image.name: formsolutions-adapter
-      kop.environment: stage
-      kop.bezeichner: unit
     asserts:
       - equal:
           path: spec.rules[0].host
-          value: unit.stage.fs.ozg-sh.de
+          value: helm-fs.test.sh.ozg-cloud.de
       - equal:
           path: spec.tls[0].hosts[0]
-          value: unit.stage.fs.ozg-sh.de
\ No newline at end of file
+          value: helm-fs.test.sh.ozg-cloud.de
diff --git a/src/test/helm/deployment_defaults_annotaion_test.yaml b/src/test/unit-values.yaml
similarity index 60%
rename from src/test/helm/deployment_defaults_annotaion_test.yaml
rename to src/test/unit-values.yaml
index 83a5be81612ac53c174a363cddb6f26359a7a0fa..5a2a0cc181ef8e12441e7c16295bc6169c0aa296 100644
--- a/src/test/helm/deployment_defaults_annotaion_test.yaml
+++ b/src/test/unit-values.yaml
@@ -22,26 +22,23 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-suite: test deployment
-release:
+baseUrl: test.sh.ozg-cloud.de
+
+kop:
+  bundesland: sh
+  environment: test
+  bezeichner: helm
+
+routing:
+  targetPlutoName: pluto
+
+image:
+  repo: docker.ozg-sh.de
   name: intelliform-adapter
-  namespace: sh-helm-test
-templates:
-  - templates/ingress.yaml
-tests:
-  - it: check ingress annotaions if traefik v2
-    set:
-      kop.environment: dev
-      kop.bezeichner: helm
-    asserts:
-      - isKind:
-          of: Ingress
-      - equal:
-          path: metadata.annotations.[kubernetes.io/ingress.class]
-          value: traefik
-      - equal:
-          path: metadata.annotations.[traefik.ingress.kubernetes.io/router.entrypoints]
-          value: websecure
-      - equal:
-          path: metadata.annotations.[traefik.ingress.kubernetes.io/router.tls]
-          value: "true"
+  tag: latest
+
+imageCredentials:
+  registry: docker.ozg-sh.de
+  username: kop
+  password:  
+  email: webmaster@ozg-sh.de
\ No newline at end of file