diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed19c0c9d79a6ee664c4aa8327a5f6e9c9a31b8f..f3fdc6c0501197dd804cb2eac1da5fb64ec14a76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [8.6.2-bb.0] (2024-12-16)
+
+### Changed
+
+- ironbank/gitlab/gitlab/gitlab-webservice (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/certificates (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitaly (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-mailroom (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse (source) 17.6.1 -> 17.6.2
+- registry1.dso.mil/ironbank/gitlab/gitlab/kubectl (source) 17.6.1 -> 17.6.2
+
 ## [8.6.1-bb.0] (2024-12-06)
 
 ### Changed
diff --git a/README.md b/README.md
index 5d8caca81a8abf910b4fe88b637156760835cec0..decebb1bda821ffbdd7f0622763a92686636410d 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 <!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. -->
 # gitlab
 
-![Version: 8.6.1-bb.0](https://img.shields.io/badge/Version-8.6.1--bb.0-informational?style=flat-square) ![AppVersion: 17.6.1](https://img.shields.io/badge/AppVersion-17.6.1-informational?style=flat-square) ![Maintenance Track: bb_integrated](https://img.shields.io/badge/Maintenance_Track-bb_integrated-green?style=flat-square)
+![Version: 8.6.2-bb.0](https://img.shields.io/badge/Version-8.6.2--bb.0-informational?style=flat-square) ![AppVersion: 17.6.2](https://img.shields.io/badge/AppVersion-17.6.2-informational?style=flat-square) ![Maintenance Track: bb_integrated](https://img.shields.io/badge/Maintenance_Track-bb_integrated-green?style=flat-square)
 
 GitLab is the most comprehensive AI-powered DevSecOps Platform.
 
 ## Upstream References
+
 - <https://about.gitlab.com/>
 
 - <https://gitlab.com/gitlab-org/charts/gitlab>
@@ -27,7 +28,7 @@ The [upstream chart's release notes](https://gitlab.com/gitlab-org/charts/gitlab
 
 Install Helm
 
-https://helm.sh/docs/intro/install/
+<https://helm.sh/docs/intro/install/>
 
 ## Deployment
 
@@ -48,7 +49,7 @@ helm install gitlab chart/
 | global.image | object | `{}` |  |
 | global.pod.labels | object | `{}` |  |
 | global.edition | string | `"ee"` |  |
-| global.gitlabVersion | string | `"17.6.1"` |  |
+| global.gitlabVersion | string | `"17.6.2"` |  |
 | global.application.create | bool | `false` |  |
 | global.application.links | list | `[]` |  |
 | global.application.allowClusterRoles | bool | `true` |  |
@@ -362,7 +363,7 @@ helm install gitlab chart/
 | global.workhorse.tls.enabled | bool | `false` |  |
 | global.webservice.workerTimeout | int | `60` |  |
 | global.certificates.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/certificates"` |  |
-| global.certificates.image.tag | string | `"17.6.1"` |  |
+| global.certificates.image.tag | string | `"17.6.2"` |  |
 | global.certificates.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | global.certificates.init.securityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | global.certificates.init.securityContext.runAsUser | int | `65534` |  |
@@ -399,13 +400,13 @@ helm install gitlab chart/
 | global.certificates.customCAs[29].secret | string | `"ca-certs-dod-trust-anchors-self-signed"` |  |
 | global.certificates.customCAs[30].secret | string | `"ca-certs-eca"` |  |
 | global.kubectl.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/kubectl"` |  |
-| global.kubectl.image.tag | string | `"17.6.1"` |  |
+| global.kubectl.image.tag | string | `"17.6.2"` |  |
 | global.kubectl.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | global.kubectl.securityContext.runAsUser | int | `65534` |  |
 | global.kubectl.securityContext.fsGroup | int | `65534` |  |
 | global.kubectl.securityContext.seccompProfile.type | string | `"RuntimeDefault"` |  |
 | global.gitlabBase.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base"` |  |
-| global.gitlabBase.image.tag | string | `"17.6.1"` |  |
+| global.gitlabBase.image.tag | string | `"17.6.2"` |  |
 | global.gitlabBase.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | global.serviceAccount.enabled | bool | `true` |  |
 | global.serviceAccount.create | bool | `true` |  |
@@ -682,7 +683,6 @@ helm install gitlab chart/
 | prometheus.serverFiles."prometheus.yml".scrape_configs[4].relabel_configs[6].target_label | string | `"kubernetes_name"` |  |
 | redis.global.imagePullSecrets[0] | string | `"private-registry"` |  |
 | redis.install | bool | `true` |  |
-| redis.image.tag | string | `"6.2.16-debian-12-r1"` |  |
 | redis.auth.existingSecret | string | `"gitlab-redis-secret"` |  |
 | redis.auth.existingSecretKey | string | `"secret"` |  |
 | redis.auth.usePasswordFiles | bool | `true` |  |
@@ -791,7 +791,7 @@ helm install gitlab chart/
 | registry.resources.requests.cpu | string | `"200m"` |  |
 | registry.resources.requests.memory | string | `"1024Mi"` |  |
 | registry.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry"` |  |
-| registry.image.tag | string | `"17.6.1"` |  |
+| registry.image.tag | string | `"17.6.2"` |  |
 | registry.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | registry.ingress.enabled | bool | `false` |  |
 | registry.metrics.enabled | bool | `true` |  |
@@ -851,7 +851,7 @@ helm install gitlab chart/
 | gitlab.toolbox.replicas | int | `1` |  |
 | gitlab.toolbox.antiAffinityLabels.matchLabels.app | string | `"gitaly"` |  |
 | gitlab.toolbox.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox"` |  |
-| gitlab.toolbox.image.tag | string | `"17.6.1"` |  |
+| gitlab.toolbox.image.tag | string | `"17.6.2"` |  |
 | gitlab.toolbox.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | gitlab.toolbox.init.resources.requests.cpu | string | `"200m"` |  |
 | gitlab.toolbox.init.resources.requests.memory | string | `"200Mi"` |  |
@@ -888,7 +888,7 @@ helm install gitlab chart/
 | gitlab.gitlab-exporter.resources.requests.memory | string | `"200Mi"` |  |
 | gitlab.gitlab-exporter.capabilities.drop[0] | string | `"ALL"` |  |
 | gitlab.gitlab-exporter.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter"` |  |
-| gitlab.gitlab-exporter.image.tag | string | `"17.6.1"` |  |
+| gitlab.gitlab-exporter.image.tag | string | `"17.6.2"` |  |
 | gitlab.gitlab-exporter.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | gitlab.gitlab-exporter.metrics.enabled | bool | `true` |  |
 | gitlab.gitlab-exporter.metrics.port | int | `9168` |  |
@@ -910,7 +910,7 @@ helm install gitlab chart/
 | gitlab.migrations.resources.requests.cpu | string | `"500m"` |  |
 | gitlab.migrations.resources.requests.memory | string | `"1.5G"` |  |
 | gitlab.migrations.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox"` |  |
-| gitlab.migrations.image.tag | string | `"17.6.1"` |  |
+| gitlab.migrations.image.tag | string | `"17.6.2"` |  |
 | gitlab.migrations.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | gitlab.migrations.securityContext.runAsUser | int | `1000` |  |
 | gitlab.migrations.securityContext.runAsGroup | int | `1000` |  |
@@ -934,14 +934,14 @@ helm install gitlab chart/
 | gitlab.webservice.resources.requests.cpu | string | `"300m"` |  |
 | gitlab.webservice.resources.requests.memory | string | `"2.5G"` |  |
 | gitlab.webservice.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice"` |  |
-| gitlab.webservice.image.tag | string | `"17.6.1"` |  |
+| gitlab.webservice.image.tag | string | `"17.6.2"` |  |
 | gitlab.webservice.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | gitlab.webservice.workhorse.resources.limits.cpu | string | `"600m"` |  |
 | gitlab.webservice.workhorse.resources.limits.memory | string | `"2.5G"` |  |
 | gitlab.webservice.workhorse.resources.requests.cpu | string | `"600m"` |  |
 | gitlab.webservice.workhorse.resources.requests.memory | string | `"2.5G"` |  |
 | gitlab.webservice.workhorse.image | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse"` |  |
-| gitlab.webservice.workhorse.tag | string | `"17.6.1"` |  |
+| gitlab.webservice.workhorse.tag | string | `"17.6.2"` |  |
 | gitlab.webservice.workhorse.pullSecrets[0].name | string | `"private-registry"` |  |
 | gitlab.webservice.workhorse.metrics.enabled | bool | `true` |  |
 | gitlab.webservice.workhorse.metrics.serviceMonitor.enabled | bool | `true` |  |
@@ -952,7 +952,7 @@ helm install gitlab chart/
 | gitlab.webservice.metrics.serviceMonitor.enabled | bool | `true` |  |
 | gitlab.webservice.helmTests.enabled | bool | `false` |  |
 | gitlab.sidekiq.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq"` |  |
-| gitlab.sidekiq.image.tag | string | `"17.6.1"` |  |
+| gitlab.sidekiq.image.tag | string | `"17.6.2"` |  |
 | gitlab.sidekiq.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | gitlab.sidekiq.init.resources.limits.cpu | string | `"200m"` |  |
 | gitlab.sidekiq.init.resources.limits.memory | string | `"200Mi"` |  |
@@ -970,7 +970,7 @@ helm install gitlab chart/
 | gitlab.sidekiq.containerSecurityContext.runAsGroup | int | `1000` |  |
 | gitlab.sidekiq.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | gitlab.gitaly.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitaly"` |  |
-| gitlab.gitaly.image.tag | string | `"17.6.1"` |  |
+| gitlab.gitaly.image.tag | string | `"17.6.2"` |  |
 | gitlab.gitaly.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | gitlab.gitaly.init.resources.limits.cpu | string | `"200m"` |  |
 | gitlab.gitaly.init.resources.limits.memory | string | `"200Mi"` |  |
@@ -990,7 +990,7 @@ helm install gitlab chart/
 | gitlab.gitaly.containerSecurityContext.runAsGroup | int | `1000` |  |
 | gitlab.gitaly.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | gitlab.gitlab-shell.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell"` |  |
-| gitlab.gitlab-shell.image.tag | string | `"17.6.1"` |  |
+| gitlab.gitlab-shell.image.tag | string | `"17.6.2"` |  |
 | gitlab.gitlab-shell.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | gitlab.gitlab-shell.init.resources.limits.cpu | string | `"200m"` |  |
 | gitlab.gitlab-shell.init.resources.limits.memory | string | `"200Mi"` |  |
@@ -1008,15 +1008,15 @@ helm install gitlab chart/
 | gitlab.gitlab-shell.containerSecurityContext.runAsGroup | int | `1000` |  |
 | gitlab.gitlab-shell.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | gitlab.mailroom.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-mailroom"` |  |
-| gitlab.mailroom.image.tag | string | `"17.6.1"` |  |
+| gitlab.mailroom.image.tag | string | `"17.6.2"` |  |
 | gitlab.mailroom.image.pullSecrets[0].name | string | `"private-registry"` |  |
 | gitlab.mailroom.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | gitlab.gitlab-pages.service.customDomains.type | string | `"ClusterIP"` |  |
 | gitlab.gitlab-pages.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages"` |  |
-| gitlab.gitlab-pages.image.tag | string | `"17.6.1"` |  |
+| gitlab.gitlab-pages.image.tag | string | `"17.6.2"` |  |
 | gitlab.gitlab-pages.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | gitlab.praefect.image.repository | string | `"registry1.dso.mil/ironbank/gitlab/gitlab/gitaly"` |  |
-| gitlab.praefect.image.tag | string | `"17.6.1"` |  |
+| gitlab.praefect.image.tag | string | `"17.6.2"` |  |
 | gitlab.praefect.init.resources.limits.cpu | string | `"200m"` |  |
 | gitlab.praefect.init.resources.limits.memory | string | `"200Mi"` |  |
 | gitlab.praefect.init.resources.requests.cpu | string | `"200m"` |  |
@@ -1147,4 +1147,3 @@ Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in
 ---
 
 _This file is programatically generated using `helm-docs` and some BigBang-specific templates. The `gluon` repository has [instructions for regenerating package READMEs](https://repo1.dso.mil/big-bang/product/packages/gluon/-/blob/master/docs/bb-package-readme.md)._
-
diff --git a/chart/CHANGELOG.md b/chart/CHANGELOG.md
index dba20ff8451c898c9b2fbcca30e94d08103962eb..1b399cb6c50a8bbea976f12424282fa5f675f6c9 100644
--- a/chart/CHANGELOG.md
+++ b/chart/CHANGELOG.md
@@ -2,6 +2,10 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 8.6.2 (2024-12-10)
+
+No changes.
+
 ## 8.6.1 (2024-11-26)
 
 No changes.
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 50394a761ba66172b50c2c2f9c8ecb490ceec2b7..6ad2fc358d8f3d24c7db24145bddc8ca889090ac 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,8 +1,8 @@
 ---
 apiVersion: v1
 name: gitlab
-version: 8.6.1-bb.0
-appVersion: v17.6.1
+version: 8.6.2-bb.0
+appVersion: 17.6.2
 description: GitLab is the most comprehensive AI-powered DevSecOps Platform.
 keywords:
 - gitlab
@@ -16,7 +16,7 @@ maintainers:
 annotations:
   bigbang.dev/maintenanceTrack: bb_integrated
   bigbang.dev/applicationVersions: |
-    - Gitlab: 17.6.1
+    - Gitlab: 17.6.2
   bigbang.dev/upstreamReleaseNotesMarkdown: |
     The [upstream chart's release notes](https://gitlab.com/gitlab-org/charts/gitlab/-/blob/master/CHANGELOG.md) may help when reviewing this package.
   helm.sh/images: |
@@ -27,29 +27,29 @@ annotations:
       condition: redis.install
       image: registry1.dso.mil/ironbank/bitnami/redis:7.4.1
     - name: alpine-certificates
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/certificates:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/certificates:17.6.2
     - name: cfssl-self-sign
       condition: shared-secrets.enabled
       image: registry1.dso.mil/ironbank/gitlab/gitlab/cfssl-self-sign:1.6.1
     - name: gitaly
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly:17.6.2
     - name: gitlab-container-registry
       condition: registry.enabled
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry:17.6.2
     - name: gitlab-shell
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell:17.6.2
     - name: gitlab-sidekiq
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq:17.6.2
     - name: gitlab-toolbox
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox:17.6.2
     - name: gitlab-webservice
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice:17.6.2
     - name: gitlab-workhorse
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse:17.6.2
     - name: gitlab-pages
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages:17.6.2
     - name: kubectl
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:17.6.2
     - name: mc
       image: registry1.dso.mil/ironbank/opensource/minio/mc:RELEASE.2024-10-02T08-27-28Z
     - name: minio
@@ -61,10 +61,10 @@ annotations:
       condition: upgradeCheck.enabled
       image: registry1.dso.mil/ironbank/redhat/ubi/ubi9:9.5
     - name: gitlab-base
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base:17.6.2
     - name: gitlab-exporter
       condition: gitlab.gitlab-exporter.enabled
-      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:17.6.1
+      image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:17.6.2
     - name: bbtests
       condition: bbtests.enabled
       image: registry1.dso.mil/bigbang-ci/gitlab-tester:0.0.4
diff --git a/chart/Kptfile b/chart/Kptfile
index 58a33bdcc1bc255e84359e23b857184b42a07c21..fe17518eee203d22dc763314a273d34acc345920 100644
--- a/chart/Kptfile
+++ b/chart/Kptfile
@@ -5,7 +5,7 @@ metadata:
 upstream:
   type: git
   git:
-    commit: 0a325d09171fcfa4a3e828052cb273f148a8ff04
+    commit: ab71e4ad9180756fb8dd2186018309bec6621ceb
     repo: https://gitlab.com/gitlab-org/charts/gitlab
     directory: /
-    ref: v8.6.1
+    ref: v8.6.2
diff --git a/chart/charts/gitlab/charts/geo-logcursor/Chart.yaml b/chart/charts/gitlab/charts/geo-logcursor/Chart.yaml
index 521189fdafac3e36e847ea1c58f3e2ac9cd3f1e9..bfec38fdf3d0a17166bf3c6f32c66ee457ea92da 100644
--- a/chart/charts/gitlab/charts/geo-logcursor/Chart.yaml
+++ b/chart/charts/gitlab/charts/geo-logcursor/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: geo-logcursor
-version: 8.6.1
-appVersion: v17.6.1
+version: 8.6.2
+appVersion: v17.6.2
 description: GitLab Geo logcursor
 keywords:
 - gitlab
diff --git a/chart/charts/gitlab/charts/gitaly/Chart.yaml b/chart/charts/gitlab/charts/gitaly/Chart.yaml
index 011719826a03bf7f5dd0e34e348f73daad67d231..40838e5aac48b986d50ed23f0cd31af2026708c4 100644
--- a/chart/charts/gitlab/charts/gitaly/Chart.yaml
+++ b/chart/charts/gitlab/charts/gitaly/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: gitaly
-version: 8.6.1
-appVersion: 17.6.1
+version: 8.6.2
+appVersion: 17.6.2
 description: Git RPC service for handling all the git calls made by GitLab
 keywords:
 - gitlab
diff --git a/chart/charts/gitlab/charts/gitlab-exporter/Chart.yaml b/chart/charts/gitlab/charts/gitlab-exporter/Chart.yaml
index 45d9a87a0f1b4240f33e1a5721f15ae6ac67d5bd..5f1b742ea9498b3cf1566c73e3d2e7f059133b15 100644
--- a/chart/charts/gitlab/charts/gitlab-exporter/Chart.yaml
+++ b/chart/charts/gitlab/charts/gitlab-exporter/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: gitlab-exporter
-version: 8.6.1
+version: 8.6.2
 appVersion: 15.0.0
 description: Exporter for GitLab Prometheus metrics (e.g. CI, pull mirrors)
 keywords:
diff --git a/chart/charts/gitlab/charts/gitlab-pages/Chart.yaml b/chart/charts/gitlab/charts/gitlab-pages/Chart.yaml
index 5b6b1e47edda2d1d141561a849d63c78a3c6509f..967e62f7bea91580d0cabd1f172741f71163e0ac 100644
--- a/chart/charts/gitlab/charts/gitlab-pages/Chart.yaml
+++ b/chart/charts/gitlab/charts/gitlab-pages/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: gitlab-pages
-version: 8.6.1
-appVersion: 17.6.1
+version: 8.6.2
+appVersion: 17.6.2
 description: Daemon for serving static websites from GitLab projects
 keywords:
 - gitlab
diff --git a/chart/charts/gitlab/charts/gitlab-shell/Chart.yaml b/chart/charts/gitlab/charts/gitlab-shell/Chart.yaml
index b05e62cf635ec7e69fe438f19f1960c68cfd7993..f94e4719aaa65eaa146fb275d6ef76972af14a61 100644
--- a/chart/charts/gitlab/charts/gitlab-shell/Chart.yaml
+++ b/chart/charts/gitlab/charts/gitlab-shell/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: gitlab-shell
-version: 8.6.1
+version: 8.6.2
 appVersion: 14.39.0
 description: sshd for Gitlab
 keywords:
diff --git a/chart/charts/gitlab/charts/kas/Chart.yaml b/chart/charts/gitlab/charts/kas/Chart.yaml
index da9ed96bca8ec9590d16f237b1ced05beea37d19..a2b0837b51f5f477c383d04a3c80bf5a7f01b3aa 100644
--- a/chart/charts/gitlab/charts/kas/Chart.yaml
+++ b/chart/charts/gitlab/charts/kas/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: kas
-version: 8.6.1
-appVersion: 17.6.1
+version: 8.6.2
+appVersion: 17.6.2
 description: GitLab Agent Server
 keywords:
 - agent
diff --git a/chart/charts/gitlab/charts/mailroom/Chart.yaml b/chart/charts/gitlab/charts/mailroom/Chart.yaml
index 0d158ca9377d323bde0ab6d9f6fc2e9a42957ff8..0d3e8225411344ea7caa744401e0792a3cbc8116 100644
--- a/chart/charts/gitlab/charts/mailroom/Chart.yaml
+++ b/chart/charts/gitlab/charts/mailroom/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: mailroom
-version: 8.6.1
-appVersion: v17.6.1
+version: 8.6.2
+appVersion: v17.6.2
 description: Handling incoming emails
 keywords:
 - gitlab
diff --git a/chart/charts/gitlab/charts/migrations/Chart.yaml b/chart/charts/gitlab/charts/migrations/Chart.yaml
index ec42ef28a3705e6b4610af193c0c7b87d94383d0..8600b6b8fe728be3ed12bf4d8222dc185d9b4fa9 100644
--- a/chart/charts/gitlab/charts/migrations/Chart.yaml
+++ b/chart/charts/gitlab/charts/migrations/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: migrations
-version: 8.6.1
-appVersion: v17.6.1
+version: 8.6.2
+appVersion: v17.6.2
 description: Database migrations and other versioning tasks for upgrading Gitlab
 keywords:
 - gitlab
diff --git a/chart/charts/gitlab/charts/praefect/Chart.yaml b/chart/charts/gitlab/charts/praefect/Chart.yaml
index 58d02e8ab91a9b36f041886dc701ace2c97c34e1..ec4a70854f70d26a130f3785769af4f37faf0eb1 100644
--- a/chart/charts/gitlab/charts/praefect/Chart.yaml
+++ b/chart/charts/gitlab/charts/praefect/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: praefect
-version: 8.6.1
-appVersion: 17.6.1
+version: 8.6.2
+appVersion: 17.6.2
 description: Praefect is a router and transaction manager for Gitaly, and a required
   component for running a Gitaly Cluster.
 keywords:
diff --git a/chart/charts/gitlab/charts/sidekiq/Chart.yaml b/chart/charts/gitlab/charts/sidekiq/Chart.yaml
index b18430f92273506e0bc0323691b1d24ec7c786f5..c7e4e8e0476c0209a81fe4c25bfb02d881026a0d 100644
--- a/chart/charts/gitlab/charts/sidekiq/Chart.yaml
+++ b/chart/charts/gitlab/charts/sidekiq/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: sidekiq
-version: 8.6.1
-appVersion: v17.6.1
+version: 8.6.2
+appVersion: v17.6.2
 description: Gitlab Sidekiq for asynchronous task processing in rails
 keywords:
 - gitlab
diff --git a/chart/charts/gitlab/charts/spamcheck/Chart.yaml b/chart/charts/gitlab/charts/spamcheck/Chart.yaml
index 38c3c32a47e99ec82bba5cd175cbafb32789f59d..2863c2c71d32614a5dcec4d9157b5cee7cad73be 100644
--- a/chart/charts/gitlab/charts/spamcheck/Chart.yaml
+++ b/chart/charts/gitlab/charts/spamcheck/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: spamcheck
-version: 8.6.1
+version: 8.6.2
 appVersion: 1.2.3
 description: GitLab Anti-Spam Engine
 keywords:
diff --git a/chart/charts/gitlab/charts/toolbox/Chart.yaml b/chart/charts/gitlab/charts/toolbox/Chart.yaml
index 14c4c16d0809c4b4a6b85df1a0f20c399edd683a..f77dd9d624862e0aa05fdabca57b902086318a52 100644
--- a/chart/charts/gitlab/charts/toolbox/Chart.yaml
+++ b/chart/charts/gitlab/charts/toolbox/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: toolbox
-version: 8.6.1
-appVersion: v17.6.1
+version: 8.6.2
+appVersion: v17.6.2
 description: For manually running rake tasks through kubectl
 keywords:
 - gitlab
diff --git a/chart/charts/gitlab/charts/webservice/Chart.yaml b/chart/charts/gitlab/charts/webservice/Chart.yaml
index e8bd7bdeb117814cd177609ebcccf49e30f9f796..53df63dbc2dd6cffa027a92ee4ccb953a29c76e5 100644
--- a/chart/charts/gitlab/charts/webservice/Chart.yaml
+++ b/chart/charts/gitlab/charts/webservice/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: webservice
-version: 8.6.1
-appVersion: v17.6.1
+version: 8.6.2
+appVersion: v17.6.2
 description: HTTP server for Gitlab
 keywords:
 - gitlab
diff --git a/chart/doc/charts/globals.md b/chart/doc/charts/globals.md
index 123be6d1c86f0b492fe9a3d368bccf36fe5bbac6..c0486cd006bd1c993291f465d07e032a559cb067 100644
--- a/chart/doc/charts/globals.md
+++ b/chart/doc/charts/globals.md
@@ -1670,7 +1670,7 @@ omniauth:
 |:------------------------- |:-------:|:----------- |
 | `allowBypassTwoFactor`    | Boolean or Array |   `false` |
 | `allowSingleSignOn`       | Boolean or Array   | `['saml']`  |
-| `autoLinkLdapUser`        | Boolean | `false`     | 
+| `autoLinkLdapUser`        | Boolean | `false`     |
 | `autoLinkSamlUser`        | Boolean | `false`     |
 | `autoLinkUser`            | Boolean or Array | `false` |
 | `autoSignInWithProvider`  |         | `nil`       |
diff --git a/chart/doc/installation/version_mappings.md b/chart/doc/installation/version_mappings.md
index d34d60831a262986c4cabbaa66dfe9f8c3c515e9..2d70de020a084c618d2ca7f5d62ea42146ba23cb 100644
--- a/chart/doc/installation/version_mappings.md
+++ b/chart/doc/installation/version_mappings.md
@@ -33,6 +33,7 @@ The table below maps some of the key previous supported chart versions and suppo
 
 | Chart version | GitLab version |
 |---------------|----------------|
+| 8.6.2 | 17.6.2 |
 | 8.6.1 | 17.6.1 |
 | 8.6.0 | 17.6.0 |
 | 8.6.1 | 17.6.1 |
@@ -575,7 +576,6 @@ The table below maps some of the key previous supported chart versions and suppo
 | 6.0.2 | 15.0.2 |
 | 6.0.1 | 15.0.1 |
 | 6.0.0 | 15.0.0 |
->>>>>>> update "chart" (https://gitlab.com/gitlab-org/charts/gitlab) from "v8.6.1" (444b06a2195c8f8932847de2b727b63cbc3b8836) to "v8.6.1" (0a325d09171fcfa4a3e828052cb273f148a8ff04)
 
 To see the full list, you can issue the following command with Helm:
 
diff --git a/chart/values.yaml b/chart/values.yaml
index 216e49449327286e9df7ef868386a80211807d15..21606cb8d17d3734e8a9f36fcea5916ebf97d3b0 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -57,7 +57,7 @@ global:
   edition: ee
 
   ## https://docs.gitlab.com/charts/charts/globals#gitlab-version
-  gitlabVersion: "17.6.1"
+  gitlabVersion: "17.6.2"
 
   ## https://docs.gitlab.com/charts/charts/globals#application-resource
   application:
@@ -825,7 +825,7 @@ global:
   certificates:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/certificates
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
     init:
@@ -874,7 +874,7 @@ global:
   kubectl:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
     securityContext:
@@ -891,7 +891,7 @@ global:
       # 1. UBI does not have the newly required /scripts/set-config template generator in its entrypoint.
       #   a. trying gitlab-base per https://repo1.dso.mil/dsop/gitlab/gitlab/gitlab-base/-/issues/77
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base
-      tag: "17.6.1"
+      tag: "17.6.2"
       pullSecrets:
       - name: private-registry
 
@@ -1478,7 +1478,7 @@ registry:
       memory: 1024Mi
   image:
     repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry
-    tag: 17.6.1
+    tag: 17.6.2
     pullSecrets:
     - name: private-registry
   ingress:
@@ -1618,7 +1618,7 @@ gitlab:
         app: gitaly
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
     init:
@@ -1695,7 +1695,7 @@ gitlab:
         - ALL
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
     metrics:
@@ -1740,7 +1740,7 @@ gitlab:
         memory: 1.5G
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
     securityContext:
@@ -1789,7 +1789,7 @@ gitlab:
         memory: 2.5G # = 2 * 1.25G assuming there are 2 workerProcesses configured
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
     workhorse:
@@ -1802,7 +1802,7 @@ gitlab:
           cpu: 600m
           memory: 2.5G
       image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
       metrics:
@@ -1826,7 +1826,7 @@ gitlab:
   sidekiq:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
     init:
@@ -1863,7 +1863,7 @@ gitlab:
   gitaly:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
     init:
@@ -1904,7 +1904,7 @@ gitlab:
   gitlab-shell:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
       - name: private-registry
     init:
@@ -1948,7 +1948,7 @@ gitlab:
   mailroom:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-mailroom
-      tag: 17.6.1
+      tag: 17.6.2
       pullSecrets:
         - name: private-registry
     containerSecurityContext:
@@ -1965,7 +1965,7 @@ gitlab:
         type: ClusterIP
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages
-      tag: 17.6.1
+      tag: 17.6.2
     containerSecurityContext:
       capabilities:
         drop:
@@ -1976,7 +1976,7 @@ gitlab:
   praefect:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly
-      tag: 17.6.1
+      tag: 17.6.2
     init:
       resources:
         limits:
diff --git a/tests/images.txt b/tests/images.txt
index ca6855a2d4b428c572a1a313ed0a5fc92d337ff7..37b11354313a86f6c21e6bfc4ed82fa839ba9f0d 100644
--- a/tests/images.txt
+++ b/tests/images.txt
@@ -1,2 +1,2 @@
-registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:17.6.1
-registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:17.6.1
+registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:17.6.2
+registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:17.6.2