diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1e9a2f3488077b2b1de42950d1a3e30c1ba8f53..ddf519048b0d2505145b68ab90161015bce83ae1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [0.1.6-bb.6] - 2021-06-21
+### Changed
+- Changed test NP to lock down for only k3d
+
 ## [0.1.6-bb.5] - 2021-06-21
 ### Fixed
 - NetworkPolicy blocking an init container, added policy to allow postgres egress for the init container
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 68c86b66e6defa85d56269316eb5e000ded4ed89..97ae12774f97fdddf8834ce3efe62cb84b13742d 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mattermost
 type: application
-version: "0.1.6-bb.5"
+version: "0.1.6-bb.6"
 appVersion: "5.34.2"
 description: "Deployment of mattermost"
 keywords:
diff --git a/chart/templates/bigbang/networkpolicies/allow-test-egress.yaml b/chart/templates/bigbang/networkpolicies/allow-test-egress.yaml
index 974182bd8bdb3e389e1b0e94f75ac732d8dd3847..03c49daeb04954a4cf6441ab9293edc571c7d6af 100644
--- a/chart/templates/bigbang/networkpolicies/allow-test-egress.yaml
+++ b/chart/templates/bigbang/networkpolicies/allow-test-egress.yaml
@@ -14,12 +14,7 @@ spec:
   egress:
   - to:
     - ipBlock:
-        cidr: {{ .Values.networkPolicies.controlPlaneCidr }}
-        {{- if eq .Values.networkPolicies.controlPlaneCidr "0.0.0.0/0" }}
-        # ONLY Block requests to cloud metadata IP
-        except:
-        - 169.254.169.254/32
-        {{- end }}
+        cidr: 172.16.0.0/12
   policyTypes:
   - Egress
 {{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 418fd1ede2f88899fc3bbc60c6e73d4b9e31baca..3c5b37c4ff727110f91cd313b07bd112ed21e4c3 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -23,7 +23,6 @@ networkPolicies:
   ingressLabels:
     app: istio-ingressgateway
     istio: ingressgateway
-  controlPlaneCidr: 0.0.0.0/0
 
 sso:
   enabled: false