diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9041031c548a19d3b6fda2b0df6c368396a94048..36ee9a73c0e655c2ac400f167a2a7fff24ecfcba 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.7] - 2021-06-23
+### Changed
+- Updated Gluon to 0.2.1
+
 ## [0.1.6-bb.6] - 2021-06-22
 ### Changed
 - Update Mattermost to version 5.36.0
diff --git a/chart/Chart.lock b/chart/Chart.lock
index 98d66a85e526c11eb55dc7bf1ea02d1fdc909f87..35d434e7aeed43d661c557b71d6a510672113c60 100644
--- a/chart/Chart.lock
+++ b/chart/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 2.0.9-bb.9
 - name: gluon
   repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
-  version: 0.1.1
-digest: sha256:d5a1399418dd0d20db43fc884acd0ac51b1f8a3272d81d1e2e4650092ec25d87
-generated: "2021-05-28T11:12:03.789056-06:00"
+  version: 0.2.1
+digest: sha256:ba5286a175cabfeaca6ca2a17c46416c8fb5d1e627a0648585045efa1208ca48
+generated: "2021-06-23T11:38:37.671043-06:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index f6dd4afc3e05f1a2bf8524449d83bda603f06718..793b0e61161f62050cabe592eacd273c37c691b7 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mattermost
 type: application
-version: "0.1.6-bb.6"
+version: "0.1.6-bb.7"
 appVersion: "5.36.0"
 description: "Deployment of mattermost"
 keywords:
@@ -20,5 +20,5 @@ dependencies:
     condition: minio.install
     repository: file://./deps/minio
   - name: gluon
-    version: 0.1.1
+    version: 0.2.1
     repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
diff --git a/chart/charts/gluon-0.1.1.tgz b/chart/charts/gluon-0.1.1.tgz
deleted file mode 100644
index b4a4878dae126348cdee9d80977a15121ba59f9f..0000000000000000000000000000000000000000
Binary files a/chart/charts/gluon-0.1.1.tgz and /dev/null differ
diff --git a/chart/charts/gluon-0.2.1.tgz b/chart/charts/gluon-0.2.1.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..3e1f9121d32b63b0ae8c9eb36975045a9153a1e5
Binary files /dev/null and b/chart/charts/gluon-0.2.1.tgz differ
diff --git a/chart/charts/minio-instance-2.0.9-bb.9.tgz b/chart/charts/minio-instance-2.0.9-bb.9.tgz
index 0e2c10f85f103dd00b79ab689d98e96302b9f1c2..6827dd74f8343ce7208e4cf34cf5d4da3fe7eb02 100644
Binary files a/chart/charts/minio-instance-2.0.9-bb.9.tgz and b/chart/charts/minio-instance-2.0.9-bb.9.tgz differ
diff --git a/chart/charts/postgresql-10.3.5.tgz b/chart/charts/postgresql-10.3.5.tgz
index 63a6b8596f4e0d154cc4e70a321d74f5f25df8cf..65fb5c545001934d3e2e6e7b7d624b2ed9331d1d 100644
Binary files a/chart/charts/postgresql-10.3.5.tgz and b/chart/charts/postgresql-10.3.5.tgz differ