diff --git a/ozgcloud-elasticsearch-operator/src/main/helm/values.yaml b/ozgcloud-elasticsearch-operator/src/main/helm/values.yaml
index e4b3820a25467fb8faeec61a5b75be8d5ef06c99..f35d5cb136dcbf0dfd1994ce7badbbd8eefd325c 100644
--- a/ozgcloud-elasticsearch-operator/src/main/helm/values.yaml
+++ b/ozgcloud-elasticsearch-operator/src/main/helm/values.yaml
@@ -2,7 +2,3 @@
 image:
   repo: docker.ozg-sh.de
 
-elasticsearch:
-    namespace: elastic-system
-    adminSecretName: ozg-search-cluster-es-elastic-user
-    certificateSecretName: ozg-search-cluster-es-http-ca-internal
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_container_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_container_test.yaml
index 56ca88385cee5f3dc63b022b256f06caa272e0ba..a2ce802ba471d3cdf141cad0ca8a0ed2627383fb 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_container_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_container_test.yaml
@@ -33,6 +33,10 @@ set:
     name: hase
     tag: latest
   imagePullSecret: imagePullSecret
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: validate image type and container image
     asserts:
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_env_customList_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_env_customList_test.yaml
index 0179c95b140f6f2cbdf14fb0ebb7a0576da5f807..49a663bb9a2b058aba7e0f920c5b49bc708e0196 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_env_customList_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_env_customList_test.yaml
@@ -25,9 +25,13 @@
 suite: test environments
 templates:
   - templates/deployment.yaml
+set: 
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: check customList
-    template: deployment.yaml
     set:
       env.customList:
         - name: my_test_environment_name
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_matchlabels_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_matchlabels_test.yaml
index 720c45214a107a9ab442a31619bc1317a15a7933..2a9a1363c8e3a45ec43b9edeaf01560bfcc8949e 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_matchlabels_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_matchlabels_test.yaml
@@ -28,6 +28,11 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
+set: 
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: check matchlabels
     set:
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_metadata_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_metadata_test.yaml
index d39d5767dc076781a3c508315b82af17b4530dc4..ac3b5f3acce32100f3681504437028aaf0e17792 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_metadata_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_metadata_test.yaml
@@ -33,6 +33,11 @@ set:
     name: hase
     tag: latest
   imagePullSecret: imagePullSecret
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
+
 tests:
   - it: check metadata labels
     asserts:
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_pull_secret_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_pull_secret_test.yaml
index 983d2758b0eb06d149ad1b11264cf07890566517..b7da864872833c49a066c7d2a4f662772db6de14 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_pull_secret_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_pull_secret_test.yaml
@@ -28,6 +28,11 @@ release:
   namespace: sh-helm-test
 templates:
   - deployment.yaml
+set: 
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: validate image pull secret resource name
     set:
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_resources_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_resources_test.yaml
index cff78bac3b635d719160aa2fb86d2f956be54862..c6ad869259b723822ff15ca0bbdda13582f45132 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_resources_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_resources_test.yaml
@@ -32,6 +32,10 @@ set:
     name: hase
     tag: latest
   imagePullSecret: imagePullSecret
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: test resources
     set:
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_template_spec_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_template_spec_test.yaml
index 1aa878d93eb858a164a086a07fc90c92918f32fd..e451cbdf643fc33f88174ed50e9c405953028c10 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_template_spec_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_template_spec_test.yaml
@@ -33,6 +33,10 @@ set:
     name: hase
     tag: latest
   imagePullSecret: imagePullSecret  
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: validate serviceaccount name
     asserts:
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_type_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_type_test.yaml
index 8216a628ae690a5d3aca70e17d399dda9d2a11d6..5da0372294deaf7559a883e90f0b477e0903449c 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_type_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_type_test.yaml
@@ -33,6 +33,10 @@ set:
     name: hase
     tag: latest
   imagePullSecret: imagePullSecret
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: validate template type and api Version
     asserts:
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes_test.yaml
index db2cdd14bc48739f580c2aac598d91eeb13c273d..1130519b7dc99e4cdb95c866ba744fe3f05ecead 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes_test.yaml
@@ -34,6 +34,10 @@ set:
     name: hase
     tag: latest
   imagePullSecret: imagePullSecret
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: should create SERVICE_BINDING_ROOT
     asserts:
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/linter_values.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/linter_values.yaml
index a27fd79bc5ea4c8798f61c9b947854d90c9166a3..1054323861607423a1e515c062455cc4c9c30509 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/linter_values.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/linter_values.yaml
@@ -5,3 +5,7 @@ image:
 
 imagePullSecret: "docker-secret"
 
+elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
\ No newline at end of file
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role_test.yaml
index 9604c57257fe009fdb987fb9ab9ca673da1c1344..e24ec69b623056400e8b6155d8c0c481e8aabfe5 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role_test.yaml
@@ -28,6 +28,11 @@ release:
   namespace: test-namespace
 templates:
   - templates/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role.yaml
+set: 
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: should have apiVersion
     asserts: 
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_rolebinding_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_rolebinding_test.yaml
index 9cde6cc508e89f8f45d7f5afa55737d94783c826..84c52750bb38435c3002ae3af11b23a9b44d5da0 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_rolebinding_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_rolebinding_test.yaml
@@ -28,6 +28,11 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_rolebinding.yaml
+set: 
+  elasticsearch:
+    namespace: elastic-system
+    adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-http-ca-internal
 tests:
   - it: should have apiVersion
     asserts: