diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dbc0a3bef66e35ac3637b98de0b24bc6f1eec2a..35f6dc61918802f807cee4340886674a320bbb8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 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).
 
 ---
+## [18.1.1-bb.6] - 2022-06-28
+### Updated
+- Updated bb base image to 2.0.0
+- Updated gluon to 0.2.10
+
 ## [18.1.1-bb.5] - 2022-06-27
 ### Updated
 - Updated pgchecker initContainer to use IronBank postgres image instead of busybox
diff --git a/README.md b/README.md
index be13749fb32383650383e06362dac3ca12b9ee8c..13a2c717794e5fffba49f51f488b1cd9d7faf5b5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # keycloak
 
-![Version: 18.1.1-bb.5](https://img.shields.io/badge/Version-18.1.1--bb.5-informational?style=flat-square) ![AppVersion: 18.0.1-legacy](https://img.shields.io/badge/AppVersion-18.0.1--legacy-informational?style=flat-square)
+![Version: 18.1.1-bb.6](https://img.shields.io/badge/Version-18.1.1--bb.6-informational?style=flat-square) ![AppVersion: 18.0.1-legacy](https://img.shields.io/badge/AppVersion-18.0.1--legacy-informational?style=flat-square)
 
 Open Source Identity and Access Management For Modern Applications and Services
 
@@ -238,7 +238,7 @@ helm install keycloak chart/
 | networkPolicies.smtpPort | int | `587` |  |
 | openshift | bool | `false` |  |
 | bbtests.enabled | bool | `false` |  |
-| bbtests.image | string | `"registry1.dso.mil/ironbank/big-bang/base:1.18.0"` |  |
+| bbtests.image | string | `"registry1.dso.mil/ironbank/big-bang/base:2.0.0"` |  |
 | bbtests.cypress.artifacts | bool | `true` |  |
 | bbtests.cypress.envs.cypress_url | string | `"https://keycloak-http.keycloak.svc.cluster.local:8443"` |  |
 | bbtests.cypress.envs.cypress_username | string | `"admin"` |  |
diff --git a/chart/Chart.lock b/chart/Chart.lock
index 017dc3a1f867675cb628d5970892cf85e56d12d4..d6ac3ce1b3b9d4d20fb9fb976ae3fb12401ab9a2 100644
--- a/chart/Chart.lock
+++ b/chart/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 10.3.13
 - name: gluon
   repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
-  version: 0.2.9
-digest: sha256:827dc5c57726e7219f9f0855994c6cccf8f819d5e673c5adce6351f0ac991139
-generated: "2022-05-27T11:33:49.569986986-06:00"
+  version: 0.2.10
+digest: sha256:c722da5449dc99b8c7ff29f0b8233261151aebe481dcf0c901c25fc873ef4337
+generated: "2022-06-28T12:16:40.788556-06:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index b605ec00be177d5de25617761efdd6508e49e711..953b705d5cb6d9f756c99075bf14d2540f11b741 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: keycloak
-version: 18.1.1-bb.5
+version: 18.1.1-bb.6
 appVersion: 18.0.1-legacy
 description: Open Source Identity and Access Management For Modern Applications and Services
 keywords:
@@ -27,7 +27,7 @@ dependencies:
     repository: file://./deps/postgresql
     condition: postgresql.enabled
   - name: gluon
-    version: "0.2.9"
+    version: "0.2.10"
     repository: "oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon"
 annotations:
   bigbang.dev/applicationVersions: |
diff --git a/chart/charts/gluon-0.2.10.tgz b/chart/charts/gluon-0.2.10.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..cc3d602937a96cd353f62f03b95a43975931d686
Binary files /dev/null and b/chart/charts/gluon-0.2.10.tgz differ
diff --git a/chart/charts/gluon-0.2.9.tgz b/chart/charts/gluon-0.2.9.tgz
deleted file mode 100644
index 7ebc680ac0c29e107b6c703984983eccf12e28d4..0000000000000000000000000000000000000000
Binary files a/chart/charts/gluon-0.2.9.tgz and /dev/null differ
diff --git a/chart/charts/postgresql-10.3.13.tgz b/chart/charts/postgresql-10.3.13.tgz
index be22239e43eab7daa11e4f02a15f32586ca05ff9..30be67013a2eee5721472ab11ccb211db5e2fb6f 100644
Binary files a/chart/charts/postgresql-10.3.13.tgz and b/chart/charts/postgresql-10.3.13.tgz differ
diff --git a/chart/deps/postgresql/values.yaml b/chart/deps/postgresql/values.yaml
index be2d690d486fce17a7c4b6f8ed9d3b4c7d5fdc64..50579d78384218f6ef0bc88117514887205fab44 100644
--- a/chart/deps/postgresql/values.yaml
+++ b/chart/deps/postgresql/values.yaml
@@ -52,7 +52,7 @@ volumePermissions:
   image:
     registry: registry1.dso.mil
     repository: ironbank/big-bang/base
-    tag: 1.18.0
+    tag: 2.0.0
     pullSecrets:
       - private-registry
     ## Specify a imagePullPolicy
diff --git a/chart/values.yaml b/chart/values.yaml
index dd587ec269ae52b88b961eda6dced7f40bdc7ac2..f4bd868cfb81691e0da7b38fff5ccef6080b83f5 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -504,7 +504,7 @@ postgresql:
   #   image:
   #     registry: registry1.dso.mil
   #     repository: ironbank/big-bang/base
-  #     tag: 1.0.0
+  #     tag: 2.0.0
   #   pullSecrets:
   #     - private-registry
   #   securityContext:
@@ -663,7 +663,7 @@ openshift: false
 
 bbtests:
   enabled: false
-  image: "registry1.dso.mil/ironbank/big-bang/base:1.18.0"
+  image: "registry1.dso.mil/ironbank/big-bang/base:2.0.0"
   cypress:
     artifacts: true
     envs: