diff --git a/run_helm_test.sh b/run_helm_test.sh
index 76ae9ac809e2a17d7c58020c0cff75be781f1e48..3e37c7fcde941bda9e3456c45c299dd62c1ecda5 100755
--- a/run_helm_test.sh
+++ b/run_helm_test.sh
@@ -4,4 +4,4 @@ set -e
 
 helm template  ./src/main/helm/ -f src/test/helm-linter-values.yaml
 helm lint -f src/test/helm-linter-values.yaml ./src/main/helm/
-cd src/main/helm && helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' .
\ No newline at end of file
+cd src/main/helm && helm unittest -f '../../test/helm/*.yaml' .
\ No newline at end of file
diff --git a/src/test/helm/deployment_bindings_test.yaml b/src/test/helm/deployment_bindings_test.yaml
index a8019796719356545283c8015c2f5ba731766dab..9b3f68067786e6cdcb5a77c4dd07fced16581305 100644
--- a/src/test/helm/deployment_bindings_test.yaml
+++ b/src/test/helm/deployment_bindings_test.yaml
@@ -25,6 +25,8 @@
 suite: deployment bindings
 templates:
   - templates/deployment.yaml
+set:
+  ozgcloud.environment: test
 tests:
   - it: should have temp-dir volume
     asserts:
diff --git a/src/test/helm/deployment_container_security_context_test.yaml b/src/test/helm/deployment_container_security_context_test.yaml
index 18a7450337149faf441b8fd520fc4883388f1f6e..a68002ce4e4e6bba0792c6dc13ee15133549bba5 100644
--- a/src/test/helm/deployment_container_security_context_test.yaml
+++ b/src/test/helm/deployment_container_security_context_test.yaml
@@ -28,6 +28,8 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
+set:
+  ozgcloud.environment: test
 tests:
   - it: check default values
     asserts:
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index d6952edf6d1fb42b2ab2dcc11321b73d35c7e2d5..e5688f081df983cb484ad12faf57719437655b7f 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -30,6 +30,8 @@ templates:
   - templates/deployment.yaml
   - templates/service_monitor.yaml
   - templates/service.yaml
+set:
+  ozgcloud.environment: test
 tests:
   - it: check default labels
     asserts:
diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml
index c76bf80b818f7ef9e19c301c47699fae83cc7374..fbc35ac562a0fa9aeb4ffae2a198acb173db4cc7 100644
--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -25,6 +25,8 @@
 suite: test environments
 templates:
   - templates/deployment.yaml
+set:
+  ozgcloud.environment: test
 tests:
   - it: check customList
     template: deployment.yaml
@@ -39,8 +41,6 @@ tests:
             name: my_test_environment_name
             value: "A test value"
   - it: check customList test value is not set by default
-    set:
-      ozgcloud.environment: test
     template: deployment.yaml
     asserts:
       - notContains:
diff --git a/src/test/helm/deployment_host_aliases_test.yaml b/src/test/helm/deployment_host_aliases_test.yaml
index 689bf6fd2d5d9eabbb92a6f521397c665bde2f08..5bd226ad13c2cade607f3981f15b3f7ab3bee237 100644
--- a/src/test/helm/deployment_host_aliases_test.yaml
+++ b/src/test/helm/deployment_host_aliases_test.yaml
@@ -28,6 +28,9 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
+
+set:
+  ozgcloud.environment: test
 tests:
   - it: should not set hostAliases
     asserts:
diff --git a/src/test/helm/deployment_imagepull_secret_test.yaml b/src/test/helm/deployment_imagepull_secret_test.yaml
index 2c72debd4fe921192fd925b909f7e6b85c649685..e48100c1bbd73d6d9ec54caa7fbf40a0cbaee231 100644
--- a/src/test/helm/deployment_imagepull_secret_test.yaml
+++ b/src/test/helm/deployment_imagepull_secret_test.yaml
@@ -28,6 +28,8 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
+set:
+  ozgcloud.environment: test
 tests:
   - it: should use default imagePull secret
     asserts:
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index 744cc072737cf7858190c1af10d9be704eb7436e..e945125e67791a5d195ac5d27d420732e995d3b6 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -27,6 +27,8 @@ release:
   name: afm-adapter
 templates:
   - templates/deployment.yaml
+set:
+  ozgcloud.environment: test
 tests:
   - it: test resources
     set:
diff --git a/src/test/helm/deployment_routing-strategy.yaml b/src/test/helm/deployment_routing-strategy.yaml
index ff18c1c83bbbc4eaf837fea1d2c8d0bce3f279af..72d2046884e5cc96194448ef52daad3c170ee969 100644
--- a/src/test/helm/deployment_routing-strategy.yaml
+++ b/src/test/helm/deployment_routing-strategy.yaml
@@ -30,6 +30,7 @@ templates:
   - deployment.yaml
 set:
   image.tag: latest
+  ozgcloud.environment: test
 tests:
   - it: validate default routing values without questions.yaml
     asserts:
diff --git a/src/test/helm/deployment_service_account_test.yaml b/src/test/helm/deployment_service_account_test.yaml
index 43aa6fcf59131f1fd9f4e0530a60b14551f89c9b..1c3b8a40130177ef415443d82574265202f89243 100644
--- a/src/test/helm/deployment_service_account_test.yaml
+++ b/src/test/helm/deployment_service_account_test.yaml
@@ -28,6 +28,9 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
+
+set:
+  ozgcloud.environment: test
 tests:
   - it: should use afm-adapter service account name
     set:
diff --git a/src/test/helm/deployment_springProfile_test.yaml b/src/test/helm/deployment_springProfile_test.yaml
index dcdccb8008eea2ea7e84b4a49e8dd81aa524a37b..446ce8f43177fd6f67bb53b780d2159c5edc228d 100644
--- a/src/test/helm/deployment_springProfile_test.yaml
+++ b/src/test/helm/deployment_springProfile_test.yaml
@@ -27,6 +27,7 @@ release:
   name: if-adapter
 templates:
   - templates/deployment.yaml
+
 tests:
   - it: should override spring profiles
     set:
@@ -40,6 +41,8 @@ tests:
             name: spring_profiles_active
             value: oc,stage,ea
   - it: should generate spring profiles
+    set:
+      ozgcloud.environment: test
     asserts:
       - isKind:
           of: Deployment
diff --git a/src/test/helm/deployment_test.yaml b/src/test/helm/deployment_test.yaml
index ca8169b68401d2b65038514a34145a36917e54b7..7edba4d797ab8fb1484784d4d1cef9079f627eb6 100644
--- a/src/test/helm/deployment_test.yaml
+++ b/src/test/helm/deployment_test.yaml
@@ -28,6 +28,8 @@ release:
   namespace: sh-helm-test
 templates:
   - deployment.yaml
+set:
+  ozgcloud.environment: test
 tests:
   - it: validate image type and container image
     asserts:
diff --git a/src/test/helm/ingress-create-or-not.yaml b/src/test/helm/ingress-create-or-not.yaml
index 7bf967dda4211df292b300c73a6c3f8265a4320a..fa92ab46b56c118237bd47ad6f9ef891d9278777 100644
--- a/src/test/helm/ingress-create-or-not.yaml
+++ b/src/test/helm/ingress-create-or-not.yaml
@@ -25,6 +25,11 @@
 suite: test ingress creation dependent from values
 templates:
   - templates/ingress.yaml
+
+set:
+  ozgcloud:
+    bezeichner: helm
+    
 tests:
   - it: create ingress by config
     set:
diff --git a/src/test/helm/ingress-nginx-tests.yaml b/src/test/helm/ingress-nginx-tests.yaml
index ea2c487475851f878d53a5b4b33805f0c385c760..7aa49a0ee4325ae682f15af24a40140d13e6707d 100644
--- a/src/test/helm/ingress-nginx-tests.yaml
+++ b/src/test/helm/ingress-nginx-tests.yaml
@@ -25,6 +25,11 @@
 suite: test ingress options
 templates:
   - templates/ingress.yaml
+
+set:
+  ozgcloud:
+    bezeichner: helm
+    
 tests:
   - it: should create afm ingress tls
     release:
diff --git a/src/test/helm/ingress_test.yaml b/src/test/helm/ingress_test.yaml
index e5086079b97d4b11763d648d70352412d4e8d7ac..87c314c030a5eb3053c2874230628185b4fd831d 100644
--- a/src/test/helm/ingress_test.yaml
+++ b/src/test/helm/ingress_test.yaml
@@ -28,6 +28,9 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/ingress.yaml
+set:
+  ozgcloud:
+    bezeichner: helm
 tests:
   - it: should match basic data
     asserts:
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
deleted file mode 100644
index 4c10588096434157f0e0ce39098dfcb134dec497..0000000000000000000000000000000000000000
--- a/src/test/unit-values.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# 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.
-#
-
-baseUrl: test.sh.ozg-cloud.de
-
-ozgcloud:
-  bundesland: sh
-  environment: test
-  bezeichner: helm
-
-routing:
-  targetVorgangManagerName: vorgang-manager
-
-image:
-  repo: docker.ozg-sh.de
-  name: intelliform-adapter
-  tag: latest
diff --git a/xta-adapter/run_helm_test.sh b/xta-adapter/run_helm_test.sh
index 8cfc42013cc858b0d2f5afc2c43b12eb56b68bab..9a57c3aa8f89a760772338f83d79796e04c242cb 100755
--- a/xta-adapter/run_helm_test.sh
+++ b/xta-adapter/run_helm_test.sh
@@ -2,6 +2,6 @@
 
 set -e
 
-helm template  ./src/main/helm/ -f src/main/helm/test-values.yaml
-helm lint -f src/test/helm/values/unit-values.yaml ./src/main/helm/
-cd src/main/helm && helm unittest -f '../../test/helm/*.yaml' -v '../../test/helm/values/unit-values.yaml' .
\ No newline at end of file
+helm template  ./src/main/helm/ -f src/test/helm-linter-values.yaml
+helm lint -f src/test/helm-linter-values.yaml ./src/main/helm/
+cd src/main/helm && helm unittest -f '../../test/helm/*.yaml'  .
diff --git a/xta-adapter/src/main/helm/test-values.yaml b/xta-adapter/src/test/helm-linter-values.yaml
similarity index 100%
rename from xta-adapter/src/main/helm/test-values.yaml
rename to xta-adapter/src/test/helm-linter-values.yaml
diff --git a/xta-adapter/src/test/helm/cronjob_service_account_test.yaml b/xta-adapter/src/test/helm/cronjob_service_account_test.yaml
index 933e2c64f494bff262c48c680a46df70239662bd..b84278f12a2b95b750f3dbe657f66f0e54d46bbf 100644
--- a/xta-adapter/src/test/helm/cronjob_service_account_test.yaml
+++ b/xta-adapter/src/test/helm/cronjob_service_account_test.yaml
@@ -28,6 +28,8 @@ templates:
 release:
   name: xta-adapter
   namespace: helm-test
+set: 
+  ozgcloud.environment: test
 tests:
   - it: should use service account with default name
     set:
diff --git a/xta-adapter/src/test/helm/values/unit-values.yaml b/xta-adapter/src/test/helm/values/unit-values.yaml
deleted file mode 100644
index fe20e41e9122cdb398e01905ee0fe53db2463cdc..0000000000000000000000000000000000000000
--- a/xta-adapter/src/test/helm/values/unit-values.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# 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.
-#
-
-ozgcloud:
-  bundesland: sh
-  environment: test
-  bezeichner: helm
\ No newline at end of file
diff --git a/xta-adapter/src/test/helm/xta_adapter_bindings_test.yaml b/xta-adapter/src/test/helm/xta_adapter_bindings_test.yaml
index ef1560522dcf450be3069f560c9aaa04bc7bb52b..959b0b824e88969cbc4012198b340d64836e5c61 100644
--- a/xta-adapter/src/test/helm/xta_adapter_bindings_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_bindings_test.yaml
@@ -25,6 +25,8 @@
 suite: xta-adapter bindings
 templates:
   - templates/xta_adapter_cronjob.yaml
+set:
+  ozgcloud.environment: test
 tests:
   - it: should have temp-dir volume
     asserts:
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml
index 4667b03c48c34279b76865a0913a69758f745bbf..2172150bbbaa94bd8d3237f5afe77b78f1259bfa 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml
@@ -28,6 +28,9 @@ templates:
 release:
   name: xta-adapter
   namespace: helm-test
+set:
+  ozgcloud.environment: dev  
+  
 tests:
   - it: validate basic data 
     template: xta_adapter_cronjob.yaml
@@ -70,7 +73,6 @@ tests:
     template: xta_adapter_cronjob.yaml
     set:
       image.name: xta-adapter
-      ozgcloud.environment: dev
     asserts:
       - equal:
           path: spec.schedule
@@ -79,7 +81,6 @@ tests:
     template: xta_adapter_cronjob.yaml
     set:
       image.name: xta-adapter
-      ozgcloud.environment: dev
     asserts:
     - equal:
         path: spec.jobTemplate.spec.template.spec.containers[0].image
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_dummy_probes_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_dummy_probes_test.yaml
index 0a3ef9a964538609c475ec585b624d12892fc984..93637305c8f873e3557b93817da786ea391e32aa 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_dummy_probes_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_dummy_probes_test.yaml
@@ -28,6 +28,8 @@ templates:
 release:
   name: xta-adapter
   namespace: helm-test
+set:
+  ozgcloud.environment: test
 tests:
   - it: check dummy livenessProbe default disabled
     template: xta_adapter_cronjob.yaml
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
index 5e4ca8ae1ee9d03f4c10c05eab3596eb9f47d013..45eb29fa69debf6962737e66509cc2c2c807ad29 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
@@ -28,6 +28,8 @@ templates:
 release:
   name: xta-adapter
   namespace: helm-test
+set: 
+  ozgcloud.environment: test
 tests:
   - it: check default env
     template: xta_adapter_cronjob.yaml
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_image_pull_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_image_pull_test.yaml
index d74e945ac83c43e56c43f2065615719c412c9432..bf1fb21e365ad092aceaa9829bfcb9520e65012d 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_image_pull_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_image_pull_test.yaml
@@ -28,8 +28,12 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/xta_adapter_cronjob.yaml
+set: 
+  ozgcloud.environment: dev
+  
 tests:
   - it: should use default imagePull secret
+    set:
     asserts:
       - equal:
           path: spec.jobTemplate.spec.template.spec.imagePullSecrets[0].name
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_resources_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_resources_test.yaml
index 198021ea113204629eca21b78cc1b6fa373a28c9..02efe39637d3eeb149ffa8322d8f0e5d2e149f20 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_resources_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_resources_test.yaml
@@ -28,6 +28,8 @@ templates:
 release:
   name: xta-adapter
   namespace: helm-test
+set: 
+  ozgcloud.environment: dev
 tests:
   - it: check resources
     template: xta_adapter_cronjob.yaml
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_volumes_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_volumes_test.yaml
index 95013323f05525f8a9d21ee106f3a9b0f29d5169..6acac9f4f2a7376cef9ca583eb3e82ae9cec76ec 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_volumes_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_volumes_test.yaml
@@ -28,6 +28,8 @@ templates:
 release:
   name: xta-adapter
   namespace: helm-test
+set: 
+  ozgcloud.environment: dev
 tests:
   - it: check volume mounts
     template: xta_adapter_cronjob.yaml