diff --git a/templates/server-network-policy.yaml b/templates/server-network-policy.yaml
index 0879d5b9a..1061a5b27 100644
--- a/templates/server-network-policy.yaml
+++ b/templates/server-network-policy.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.openshift }}
+{{- if eq (.Values.server.networkPolicy.enabled | toString) "true"  }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
diff --git a/test/unit/server-network-policy.bats b/test/unit/server-network-policy.bats
index 0df89fcb4..07ca2b60c 100755
--- a/test/unit/server-network-policy.bats
+++ b/test/unit/server-network-policy.bats
@@ -2,7 +2,7 @@
 
 load _helpers
 
-@test "server/network-policy: OpenShift - disabled by default" {
+@test "server/network-policy: disabled by default" {
   cd `chart_dir`
   local actual=$( (helm template \
       --show-only templates/server-network-policy.yaml  \
@@ -11,12 +11,12 @@ load _helpers
   [ "${actual}" = "false" ]
 }
 
-@test "server/network-policy: OpenShift - enabled if OpenShift" {
+@test "server/network-policy: enabled by server.networkPolicy.enabled" {
   cd `chart_dir`
   local actual=$( (helm template \
-      --set 'global.openshift=true' \
+      --set 'server.networkPolicy.enabled=true' \
       --show-only templates/server-network-policy.yaml  \
       . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
-}
\ No newline at end of file
+}
diff --git a/values.yaml b/values.yaml
index 1a5554283..6fa43b5c8 100644
--- a/values.yaml
+++ b/values.yaml
@@ -298,6 +298,10 @@ server:
   #   beta.kubernetes.io/arch: amd64
   nodeSelector: null
 
+  # Enables network policy for server pods
+  networkPolicy:
+    enabled: false
+
   # Priority class for server pods
   priorityClassName: ""