diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1e9a2f3488077b2b1de42950d1a3e30c1ba8f53..9041031c548a19d3b6fda2b0df6c368396a94048 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-22
+### Changed
+- Update Mattermost to version 5.36.0
+
 ## [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..f6dd4afc3e05f1a2bf8524449d83bda603f06718 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: mattermost
 type: application
-version: "0.1.6-bb.5"
-appVersion: "5.34.2"
+version: "0.1.6-bb.6"
+appVersion: "5.36.0"
 description: "Deployment of mattermost"
 keywords:
   - Mattermost
diff --git a/chart/templates/bigbang/networkpolicies/allow-external-filestore.yaml b/chart/templates/bigbang/networkpolicies/allow-external-filestore.yaml
deleted file mode 100644
index 738b7a3ca51485d8ac5e97cf07eadcb616455c44..0000000000000000000000000000000000000000
--- a/chart/templates/bigbang/networkpolicies/allow-external-filestore.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-{{- if and .Values.networkPolicies.enabled (not .Values.minio.install) }}
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-external-filestore-egress
-  namespace: {{ .Release.Namespace }}
-spec:
-  podSelector:
-    matchLabels:
-      app: mattermost
-  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 }}
diff --git a/chart/templates/bigbang/networkpolicies/allow-external-postgres.yaml b/chart/templates/bigbang/networkpolicies/allow-external-postgres.yaml
index 1e43c65604fda38959d6490d9b97251fc0569317..265a0e581a1ef7d28b57e7ff7d61e1bad03fe896 100644
--- a/chart/templates/bigbang/networkpolicies/allow-external-postgres.yaml
+++ b/chart/templates/bigbang/networkpolicies/allow-external-postgres.yaml
@@ -1,25 +1,6 @@
 {{- if and .Values.networkPolicies.enabled (not .Values.postgresql.install) }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
-metadata:
-  name: allow-external-postgres-egress
-  namespace: {{ .Release.Namespace }}
-spec:
-  podSelector:
-    matchLabels:
-      app: mattermost
-  policyTypes:
-  - Egress
-  egress:
-  - to:
-    - ipBlock:
-        cidr: 0.0.0.0/0
-        # ONLY Block requests to AWS metadata IP
-        except:
-        - 169.254.169.254/32
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
 metadata:
   name: allow-external-postgres-egress-upgrade
   namespace: {{ .Release.Namespace }}
diff --git a/chart/templates/bigbang/networkpolicies/allow-sso-egress.yaml b/chart/templates/bigbang/networkpolicies/allow-mattermost-egress.yaml
similarity index 79%
rename from chart/templates/bigbang/networkpolicies/allow-sso-egress.yaml
rename to chart/templates/bigbang/networkpolicies/allow-mattermost-egress.yaml
index 217238b5e9622e216d3fcc0486e02c6d093ccf67..931746c375fb18452f05409693066de5c82a07ae 100644
--- a/chart/templates/bigbang/networkpolicies/allow-sso-egress.yaml
+++ b/chart/templates/bigbang/networkpolicies/allow-mattermost-egress.yaml
@@ -1,8 +1,8 @@
-{{- if and .Values.networkPolicies.enabled .Values.sso.enabled }}
+{{- if .Values.networkPolicies.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: allow-sso-egress
+  name: allow-mattermost-egress
   namespace: {{ .Release.Namespace }}
 spec:
   podSelector:
diff --git a/chart/values.yaml b/chart/values.yaml
index 418fd1ede2f88899fc3bbc60c6e73d4b9e31baca..636b50a1923fdaa1631374f90cde44960de22ccd 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -36,7 +36,7 @@ sso:
 # Repo and image tag 
 image:
   name: registry1.dso.mil/ironbank/opensource/mattermost/mattermost
-  tag: 5.34.2
+  tag: 5.36.0
   imagePullPolicy: IfNotPresent
 
 global: