diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9041031c548a19d3b6fda2b0df6c368396a94048..9c3a1abe76616a42ce82c64ba3aa3be2bba760cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
+## [0.1.6-bb.7] - 2021-07-08
+### Changed
+- Update Mattermost to version 5.36.1
 
 ## [0.1.6-bb.6] - 2021-06-22
 ### Changed
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index f6dd4afc3e05f1a2bf8524449d83bda603f06718..a2aa83f69d5d225c0e421ab310fbdf1f0cfd0940 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: mattermost
 type: application
-version: "0.1.6-bb.6"
-appVersion: "5.36.0"
+version: "0.1.6-bb.7"
+appVersion: "5.36.1"
 description: "Deployment of mattermost"
 keywords:
   - Mattermost
diff --git a/chart/values.yaml b/chart/values.yaml
index 636b50a1923fdaa1631374f90cde44960de22ccd..b0f475f007896f3421c4262384a6d3b9abde28ba 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.36.0
+  tag: 5.36.1
   imagePullPolicy: IfNotPresent
 
 global: