diff --git a/Jenkinsfile b/Jenkinsfile
index 2af7a9304b48e56509f1d1f7fed212ac567b777c..9edda920bedb7610d9a100fbd474faeaa3efd8af 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -137,6 +137,9 @@ pipeline {
                             sh "helm lint -f test-values.yaml"
                             sh "helm lint -f dataport-values.yaml"
 
+                            sh "helm template . -f test-values.yaml -n sh-helm-test --dry-run"
+                            sh "helm template . -f dataport-values.yaml -n sh-helm-test --dry-run"
+
                             sh "helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."
 
                             sh "helm package --version=${HELM_CHART_VERSION} ."
diff --git a/src/main/helm/dataport-values.yaml b/src/main/helm/dataport-values.yaml
index d34a6c235ba84331f662e8244062465f7f78542f..91cfaf93f0fdc6522bc42f8b1f1171fab7bdabc2 100644
--- a/src/main/helm/dataport-values.yaml
+++ b/src/main/helm/dataport-values.yaml
@@ -23,7 +23,6 @@
 #
 cluster_env: dataport
 baseUrl: test.ozg-sh.de
-
 kop:
   environment: test
   bezeichner: helm
\ No newline at end of file
diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index d2f2f6c28a546f7f80ac3dff35667c2d0c12ee21..aecae6e6c99432817bd82c858d21d0d17ad56213 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -26,14 +26,8 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  {{- if eq (.Values).cluster_env "dataport" }}
-  {{- with .Values.ingressAnnotations }}
-  annotations: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- else }}
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-  {{- end }}
   name: {{ include "app.name" . }}
   namespace: {{ include "app.namespace" . }}
 spec:
diff --git a/src/main/helm/test-values.yaml b/src/main/helm/test-values.yaml
index e5d00fa6320ef075ae9fc641c52939d57efc8203..85d7890c14096da150041aaf4164121d19b8a106 100644
--- a/src/main/helm/test-values.yaml
+++ b/src/main/helm/test-values.yaml
@@ -21,9 +21,7 @@
 # Die sprachspezifischen Genehmigungen und Beschränkungen
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
-
-baseUrl: test.by.ozg-cloud.de
-
+baseUrl: test.sh.ozg-cloud.de
 kop:
   environment: test
   bezeichner: helm
\ No newline at end of file
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 25f0e575029bcc0ac958db8350e0382b52f5b69c..de14ffd6710eb8a541e6ce9f2edc6da252dea8b2 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -23,7 +23,7 @@
 #
 cluster_env: ""
 
-baseUrl: test.by.ozg-cloud.de
+baseUrl: test.sh.ozg-cloud.de
 
 image:
   repo: docker.ozg-sh.de
@@ -43,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
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index 795d3f77033ef85faae1e5ae92f0b0e8cfc53fc2..70290fea51b754e5afad5b89d5fb0c98cc7594b5 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -25,7 +25,7 @@
 suite: test deployment
 release:
   name: intelliform-adapter
-  namespace: by-helm-test
+  namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
   - templates/service_monitor.yaml
@@ -44,4 +44,4 @@ tests:
           value: kop
       - equal:
           path: metadata.labels.[app.kubernetes.io/namespace]
-          value: by-helm-test
+          value: sh-helm-test
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index 11441f69daab06575a2accdec94a98f63ed76c45..588505e7ed340abef50404ea1ec69a6848fbc8d4 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -48,7 +48,7 @@ tests:
           value: 250Mi
   - it: test default resources
     release:
-      namespace: by-helm-test
+      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 27c9e2084a82835aae25f905bf264017056df3e3..7705a4af992be0edfd6f80ee41e6c220a35a4906 100644
--- a/src/test/helm/deployment_routing-strategy.yaml
+++ b/src/test/helm/deployment_routing-strategy.yaml
@@ -25,7 +25,7 @@
 suite: test deployment
 release:
   name: intelliform-adapter
-  namespace: by-helm-test
+  namespace: sh-helm-test
 templates:
   - deployment.yaml
 set:
diff --git a/src/test/helm/deployment_test.yaml b/src/test/helm/deployment_test.yaml
index 0c182ce9731dc599c99f1ab8454a2f9314a0088f..02ab7be03b1f0d6d1640dec5eaaec3ad01c908ad 100644
--- a/src/test/helm/deployment_test.yaml
+++ b/src/test/helm/deployment_test.yaml
@@ -25,7 +25,7 @@
 suite: test deployment
 release:
   name: intelliform-adapter
-  namespace: by-helm-test
+  namespace: sh-helm-test
 templates:
   - deployment.yaml
 tests:
diff --git a/src/test/helm/ingress_test.yaml b/src/test/helm/ingress_test.yaml
index 80fe6cab175442302cc02bde2d32e435ae55fa8f..0ec5a6754e954628adef91be0558eec7915d225b 100644
--- a/src/test/helm/ingress_test.yaml
+++ b/src/test/helm/ingress_test.yaml
@@ -25,7 +25,7 @@
 suite: test ingress creation
 release:
   name: intelliform-adapter
-  namespace: by-helm-test
+  namespace: sh-helm-test
 templates:
   - templates/ingress.yaml
 tests:
@@ -39,7 +39,7 @@ tests:
           value: intelliform-adapter
       - equal:
           path: metadata.namespace
-          value: by-helm-test
+          value: sh-helm-test
   - it: should match service port number
     asserts:
       - equal:
@@ -63,10 +63,10 @@ tests:
     asserts:
       - equal:
           path: spec.rules[0].host
-          value: helm-afm.test.by.ozg-cloud.de
+          value: helm-afm.test.sh.ozg-cloud.de
       - equal:
           path: spec.tls[0].hosts[0]
-          value: helm-afm.test.by.ozg-cloud.de
+          value: helm-afm.test.sh.ozg-cloud.de
 
 
   - it: should create fs host
@@ -75,7 +75,7 @@ tests:
     asserts:
       - equal:
           path: spec.rules[0].host
-          value: helm-fs.test.by.ozg-cloud.de
+          value: helm-fs.test.sh.ozg-cloud.de
       - equal:
           path: spec.tls[0].hosts[0]
-          value: helm-fs.test.by.ozg-cloud.de
+          value: helm-fs.test.sh.ozg-cloud.de
diff --git a/src/test/helm/service_monitor_test.yaml b/src/test/helm/service_monitor_test.yaml
index 600c3f3a21a9c6754fe332f25f76f402f97372e0..e20b931986f88f3d9c21a322109738238ef31b5f 100644
--- a/src/test/helm/service_monitor_test.yaml
+++ b/src/test/helm/service_monitor_test.yaml
@@ -25,7 +25,7 @@
 suite: test deployment
 release:
   name: afm-adapter
-  namespace: by-helm-test
+  namespace: sh-helm-test
 templates:
   - templates/service_monitor.yaml
 tests:
@@ -60,7 +60,7 @@ tests:
     asserts:
       - contains:
           path: spec.namespaceSelector.matchNames
-          content: by-helm-test
+          content: sh-helm-test
   - it: selector should contain the component label with the value afm-adapter-service
     asserts:
       - equal:
@@ -73,4 +73,4 @@ tests:
           value: afm-adapter
       - equal:
           path: spec.selector.matchLabels.[app.kubernetes.io/namespace]
-          value: by-helm-test
+          value: sh-helm-test
diff --git a/src/test/helm/service_test.yaml b/src/test/helm/service_test.yaml
index 04b386829581befddefe0add807cb8c65ad7217e..f9680d60e2a5a8b75f9f2ab35274f58d2e0808ca 100644
--- a/src/test/helm/service_test.yaml
+++ b/src/test/helm/service_test.yaml
@@ -25,7 +25,7 @@
 suite: test deployment
 release:
   name: afm-adapter
-  namespace: by-helm-test
+  namespace: sh-helm-test
 templates:
   - templates/service.yaml
 tests:
@@ -74,5 +74,5 @@ tests:
           value: afm-adapter
       - equal:
           path: spec.selector.[app.kubernetes.io/namespace]
-          value: by-helm-test
+          value: sh-helm-test
   
\ No newline at end of file
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
index da77a1e5ba9bfbaa2b888143cf60626d05bad52b..5a2a0cc181ef8e12441e7c16295bc6169c0aa296 100644
--- a/src/test/unit-values.yaml
+++ b/src/test/unit-values.yaml
@@ -22,9 +22,10 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-baseUrl: test.by.ozg-cloud.de
+baseUrl: test.sh.ozg-cloud.de
 
 kop:
+  bundesland: sh
   environment: test
   bezeichner: helm