diff --git a/CHANGELOG.md b/CHANGELOG.md
index 192ea76586d264c00afcd938cc6b8ee7162e1529..ffd2865ae45c9024a6dd8a8ffafcb0b80440c7dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 > Format: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ---
+## [6.0.0-bb.6] - 2022-06-28
+### Changed
+- Updated bb base to 2.0.0
+- Updated gluon to 0.2.10
+
 ## [6.0.0-bb.5] - 2022-01-31
 ### Modified
 - Modified cypress tests and added gluon library
diff --git a/README.md b/README.md
index 0f09a4e701d86ec9702a820b7e69cae69e7bcdca..2b9404e95631dacc40fe001da5cd29c4702a7a57 100644
--- a/README.md
+++ b/README.md
@@ -32,18 +32,48 @@ helm install flux-podinfo chart/
 |-----|------|---------|-------------|
 | podinfo.enabled | bool | `true` |  |
 | podinfo.git.repo | string | `"https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/podinfo"` |  |
-| podinfo.git.tag | string | `"6.0.0-bb.1"` |  |
+| podinfo.git.tag | string | `"6.0.0-bb.5"` |  |
 | podinfo.git.path | string | `"chart"` |  |
 | podinfo.flux | object | `{}` |  |
 | podinfo.ingress.gateway | string | `""` |  |
+| podinfo.values.bbtests.enabled | bool | `true` |  |
+| podinfo.values.bbtests.cypress.envs.cypress_url | string | `"https://podinfo.bigbang.dev"` |  |
+| podinfo.values.bbtests.scripts.envs.URL | string | `"https://podinfo.bigbang.dev"` |  |
 | networkPolicies.enabled | bool | `false` |  |
+| jaeger.enabled | bool | `false` |  |
+| kiali.enabled | bool | `false` |  |
+| clusterAuditor.enabled | bool | `false` |  |
+| gatekeeper.enabled | bool | `false` |  |
+| kyverno.enabled | bool | `false` |  |
+| tempo.enabled | bool | `false` |  |
+| promtail.enabled | bool | `false` |  |
+| loki.enabled | bool | `false` |  |
+| eckoperator.enabled | bool | `false` |  |
+| logging.enabled | bool | `false` |  |
+| fluentbit.enabled | bool | `false` |  |
+| monitoring.enabled | bool | `false` |  |
+| twistlock.enabled | bool | `false` |  |
+| addons.argocd.enabled | bool | `false` |  |
+| addons.authservice.enabled | bool | `false` |  |
+| addons.gitlab.enabled | bool | `false` |  |
+| addons.gitlabRunner.enabled | bool | `false` |  |
+| addons.anchore.enabled | bool | `false` |  |
+| addons.sonarqube.enabled | bool | `false` |  |
+| addons.minioOperator.enabled | bool | `false` |  |
+| addons.minio.enabled | bool | `false` |  |
+| addons.mattermostoperator.enabled | bool | `false` |  |
+| addons.mattermost.enabled | bool | `false` |  |
+| addons.nexus.enabled | bool | `false` |  |
+| addons.velero.enabled | bool | `false` |  |
+| addons.keycloak.enabled | bool | `false` |  |
+| addons.vault.enabled | bool | `false` |  |
 
 ## Contributing
 
 Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in contributing.
 # podinfo
 
-![Version: 6.0.0-bb.5](https://img.shields.io/badge/Version-6.0.0--bb.5-informational?style=flat-square) ![AppVersion: 6.0.0](https://img.shields.io/badge/AppVersion-6.0.0-informational?style=flat-square)
+![Version: 6.0.0-bb.6](https://img.shields.io/badge/Version-6.0.0--bb.6-informational?style=flat-square) ![AppVersion: 6.0.0](https://img.shields.io/badge/AppVersion-6.0.0-informational?style=flat-square)
 
 Podinfo Helm chart for Kubernetes
 
@@ -158,7 +188,8 @@ helm install podinfo chart/
 | bbtests.enabled | bool | `false` |  |
 | bbtests.cypress.artifacts | bool | `true` |  |
 | bbtests.cypress.envs.cypress_url | string | `"http://{{ template \"podinfo.fullname\" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.externalPort }}"` |  |
+| bbtests.scripts.envs.URL | string | `"http://{{ template \"podinfo.fullname\" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.externalPort }}"` |  |
 
 ## Contributing
 
-Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in contributing.
\ No newline at end of file
+Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in contributing.
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 695123d58d7c0e88c3a3eaf908b0e0b7e458d799..ae733d185cb47bc636efd70d38c238989b170d0e 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 6.0.0-bb.5
+version: 6.0.0-bb.6
 appVersion: 6.0.0
 name: podinfo
 engine: gotpl
@@ -13,5 +13,5 @@ sources:
 kubeVersion: ">=1.19.0-0"
 dependencies:
 - name: gluon
-  version: "0.2.5"
+  version: "0.2.10"
   repository: "oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon"
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.5.tgz b/chart/charts/gluon-0.2.5.tgz
deleted file mode 100644
index 6d16053a8c22a18120b4e1ab4ca15bf9891d60c4..0000000000000000000000000000000000000000
Binary files a/chart/charts/gluon-0.2.5.tgz and /dev/null differ
diff --git a/chart/requirements.lock b/chart/requirements.lock
index db5f4088edca9a73373a3bde7d4863bd04a42382..d48a389802c4d43e1139090373526625c1adc6de 100644
--- a/chart/requirements.lock
+++ b/chart/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: gluon
   repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
-  version: 0.2.5
-digest: sha256:40b90f0f05abb5c6f7a01cd114b81042fc141f390fda38ae48c2f933876dc7b7
-generated: "2022-01-31T11:34:46.7457354-07:00"
+  version: 0.2.10
+digest: sha256:10de93396e275c5f10a0919340e333b9e4b011f2fc63a5b43c9e91e49800d8bc
+generated: "2022-06-28T12:41:30.054039-06:00"
diff --git a/chart/templates/tests/cache.yaml b/chart/templates/tests/cache.yaml
index 6b97627b38d6588e101e6e280d792f3dc851a045..26441392488c7ad7942d26126faaf7bc42976fed 100644
--- a/chart/templates/tests/cache.yaml
+++ b/chart/templates/tests/cache.yaml
@@ -18,7 +18,7 @@ spec:
   {{- end }}
   containers:
     - name: curl
-      image: "registry1.dso.mil/ironbank/big-bang/base:1.0.0"
+      image: "registry1.dso.mil/ironbank/big-bang/base:2.0.0"
       command:
         - sh
         - -c
diff --git a/chart/templates/tests/tls.yaml b/chart/templates/tests/tls.yaml
index bb5d06001ddff1cc97e0eb2e791ca4193a578148..77480ac912843070d476a88f9833b3e1cfe6ad8f 100644
--- a/chart/templates/tests/tls.yaml
+++ b/chart/templates/tests/tls.yaml
@@ -18,7 +18,7 @@ spec:
   {{- end }}
   containers:
     - name: curl
-      image: registry1.dso.mil/ironbank/big-bang/base
+      image: registry1.dso.mil/ironbank/big-bang/base:2.0.0
       command:
         - sh
         - -c