diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85a4ad3577efd9aac05781bf6b622c5cdff2dd2b..c2d4c165b7e9f37a4ededa2bc860b923cbb2cac7 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.2] - 2021-06-02
+### Changed
+- Restricted test policy to just cluster
+
 ## [0.1.6-bb.1] - 2021-06-01
 ### Changed
 - Moved tests to gluon library
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 85984aa0d9f3a6706d0f2c15f00cbeedc5ed07a1..325f3891efc656facbcc97dde2535f5fc8fd25ad 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mattermost
 type: application
-version: "0.1.6-bb.1"
+version: "0.1.6-bb.2"
 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 1a9b59b404f39730dd6b18a1d3f18160ea0a6b85..853d928ccaa7b15aa055c58ba8a27c2a3e352572 100644
--- a/chart/templates/bigbang/networkpolicies/allow-test-egress.yaml
+++ b/chart/templates/bigbang/networkpolicies/allow-test-egress.yaml
@@ -1,9 +1,7 @@
 {{- $bbtests := .Values.bbtests | default dict -}}
-{{- $cypress := $bbtests.cypress | default dict -}}
 {{- $enabled := (hasKey $bbtests "enabled") -}}
-{{- $artifacts := (hasKey $cypress "artifacts") -}}
-{{- if and $enabled $artifacts }}
-{{- if and .Values.networkPolicies.enabled .Values.bbtests.enabled .Values.bbtests.cypress.artifacts }}
+{{- if $enabled }}
+{{- if and .Values.networkPolicies.enabled .Values.bbtests.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -16,11 +14,6 @@ spec:
   policyTypes:
   - Egress
   egress:
-  - to:
-    - ipBlock:
-        cidr: 0.0.0.0/0
-        # ONLY Block requests to AWS metadata IP
-        except:
-          - 169.254.169.254/32
+  - {}
 {{- end }}
 {{- end }}