diff --git a/Jenkinsfile b/Jenkinsfile
index ec06a286b328e9db37cbb3560af803ce248dce2e..9bb110e4afb5ce6d635a114f7830aa44d82a9536 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -135,7 +135,7 @@ pipeline {
                     HELM_CHART_VERSION = generateHelmChartVersion()
 
                     dir('src/main/helm') {
-                        sh "helm lint -f test-values.yaml"
+                        sh "helm lint -f ../../test/helm-linter-values.yaml"
 
                         sh "helm unittest --helm3 -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."
 
diff --git a/run_helm_test.sh b/run_helm_test.sh
index 7324e7d118cdd0dd4d8815201c07089ea5122d12..5c2ac8a359d9b3be43e39c05eddf49e36d5f2a2d 100755
--- a/run_helm_test.sh
+++ b/run_helm_test.sh
@@ -2,6 +2,6 @@
 
 set -e
 
-helm template  ./src/main/helm/ -f src/test/unit-values.yaml
-helm lint -f src/test/unit-values.yaml ./src/main/helm/
+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 --helm3 -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' .
\ No newline at end of file
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 18cf7b2ccffa80585d82fa23789554ff862f3600..c243a2b78267cbcbca542afa462cf40a2422f85d 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -49,10 +49,7 @@ spec:
   - to:
     - namespaceSelector:
         matchLabels:
-          kubernetes.io/metadata.name: kube-system
-      podSelector:
-        matchLabels:
-          k8s-app: kube-dns
+          kubernetes.io/metadata.name: {{ required "networkPolicy.dnsServerNamespace must be set" (.Values.networkPolicy).dnsServerNamespace }}
     ports:
       - port: 53
         protocol: UDP
diff --git a/src/main/helm/test-values.yaml b/src/test/helm-linter-values.yaml
similarity index 92%
rename from src/main/helm/test-values.yaml
rename to src/test/helm-linter-values.yaml
index e72f46c87bf4c6b6ce3cf960e19effcd09fd53b8..dc7bf7d67561d23925b5ebd3cbac9a491af1ffc8 100644
--- a/src/main/helm/test-values.yaml
+++ b/src/test/helm-linter-values.yaml
@@ -25,4 +25,7 @@
 ozgcloud:
   environment: test
   bezeichner: helm
-  bundesland: sh
\ No newline at end of file
+  bundesland: sh
+
+networkPolicy:
+  dnsServerNamespace: test-dns-server-namespace
\ No newline at end of file
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index 96c857eb6260c8ed088cf1a5fb1d70f8fa39c318..15c3a1ad88d74d6f694f27a7698a81237f91fa1c 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -30,14 +30,23 @@ templates:
   - templates/network_policy.yaml
 tests:
   - it: should match apiVersion
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
     asserts:
       - isAPIVersion:
           of: networking.k8s.io/v1
   - it: should match kind
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
     asserts:
       - isKind:
           of: NetworkPolicy
   - it: validate metadata
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
     asserts:
       - equal:
           path: metadata
@@ -45,6 +54,9 @@ tests:
             name: network-policy-afm-adapter
             namespace: by-helm-test
   - it: validate spec
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
     asserts:
       - equal:
           path: spec
@@ -69,10 +81,7 @@ tests:
             - to:
               - namespaceSelector:
                   matchLabels:
-                    kubernetes.io/metadata.name: kube-system
-                podSelector:
-                  matchLabels:
-                    k8s-app: kube-dns
+                    kubernetes.io/metadata.name: test-dns-namespace
               ports:
                 - port: 53
                   protocol: UDP
@@ -83,6 +92,7 @@ tests:
     set:
       networkPolicy:
         disabled: true
+        dnsServerNamespace: test-dns-namespace
     asserts:
       - hasDocuments:
           count: 0
@@ -91,6 +101,7 @@ tests:
     set:
       networkPolicy:
         disabled: false
+        dnsServerNamespace: test-dns-namespace
     asserts:
       - hasDocuments:
           count: 1
\ No newline at end of file
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
index 68d0ba933ab4e43b823393d929fe052bcc915ec1..4c10588096434157f0e0ce39098dfcb134dec497 100644
--- a/src/test/unit-values.yaml
+++ b/src/test/unit-values.yaml
@@ -35,4 +35,4 @@ routing:
 image:
   repo: docker.ozg-sh.de
   name: intelliform-adapter
-  tag: latest
\ No newline at end of file
+  tag: latest