diff --git a/common/zarf.yaml b/common/zarf.yaml
index 40f0273a..2d8429a2 100644
--- a/common/zarf.yaml
+++ b/common/zarf.yaml
@@ -16,6 +16,6 @@ components:
         namespace: gitlab
         url: https://charts.gitlab.io/
         gitPath: chart
-        version: "7.11.1"
+        version: "8.0.1"
         valuesFiles:
           - ../values/common-values.yaml
diff --git a/values/common-values.yaml b/values/common-values.yaml
index 8e395e43..c56c9289 100644
--- a/values/common-values.yaml
+++ b/values/common-values.yaml
@@ -120,9 +120,10 @@ registry:
 gitlab:
   toolbox:
     backups:
-      config:
-        secret: gitlab-object-store
-        key: backups
+      objectStorage:
+        config:
+          secret: gitlab-object-store
+          key: backups
 
   gitlab-exporter:
     enabled: true
diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml
index 8f4acc1e..ad1e9846 100644
--- a/values/registry1-values.yaml
+++ b/values/registry1-values.yaml
@@ -2,61 +2,61 @@ gitlab:
   webservice:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice
-      tag: 16.11.1
+      tag: 17.0.1
     workhorse:
       image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse
-      tag: 16.11.1
+      tag: 17.0.1
   sidekiq:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq
-      tag: 16.11.1
+      tag: 17.0.1
   migrations:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox
-      tag: 16.11.1
+      tag: 17.0.1
   gitaly:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly
-      tag: 16.11.1
+      tag: 17.0.1
   gitlab-exporter:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter
-      tag: 16.11.1
+      tag: 17.0.1
   gitlab-pages:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages
-      tag: 16.11.1
+      tag: 17.0.1
   gitlab-shell:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell
-      tag: 16.11.1
+      tag: 17.0.1
   praefect:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly
-      tag: 16.11.1
+      tag: 17.0.1
   toolbox:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox
-      tag: 16.11.1
+      tag: 17.0.1
 
 global:
   certificates:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/certificates
-      tag: 16.11.1
+      tag: 17.0.1
   gitlabBase:
     image:
       repository: registry1.dso.mil/ironbank/redhat/ubi/ubi9
-      tag: "9.3"
+      tag: "9.4"
   kubectl:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl
-      tag: 16.11.1
+      tag: 17.0.1
 
 registry:
   image:
     repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry
-    tag: 16.11.1
+    tag: 17.0.1
 
 shared-secrets:
   selfsign:
@@ -67,4 +67,4 @@ shared-secrets:
 upgradeCheck:
   image:
     repository: registry1.dso.mil/ironbank/redhat/ubi/ubi9
-    tag: "9.3"
+    tag: "9.4"
diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml
index 915c0da2..09023568 100644
--- a/values/upstream-values.yaml
+++ b/values/upstream-values.yaml
@@ -2,69 +2,69 @@ gitlab:
   webservice:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee
-      tag: v16.11.1
+      tag: v17.0.1
     workhorse:
       image: registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee
-      tag: v16.11.1
+      tag: v17.0.1
   sidekiq:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee
-      tag: v16.11.1
+      tag: v17.0.1
   migrations:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
-      tag: v16.11.1
+      tag: v17.0.1
   gitaly:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
-      tag: v16.11.1
+      tag: v17.0.1
   gitlab-exporter:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter
-      tag: v16.11.1
+      tag: v17.0.1
   gitlab-pages:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-pages
-      tag: v16.11.1
+      tag: v17.0.1
   gitlab-shell:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-shell
-      tag: v16.11.1
+      tag: v17.0.1
   praefect:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
-      tag: v16.11.1
+      tag: v17.0.1
   toolbox:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
-      tag: v16.11.1
+      tag: v17.0.1
 
 global:
   certificates:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/certificates
-      tag: v16.11.1
+      tag: v17.0.1
   gitlabBase:
     image:
-      repository: docker.io/redhat/ubi8
-      tag: "8.9"
+      repository: docker.io/redhat/ubi9
+      tag: "9.4"
   kubectl:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
-      tag: v16.11.1
+      tag: v17.0.1
 
 registry:
   image:
     repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry
-    tag: v16.11.1
+    tag: v17.0.1
 
 shared-secrets:
   selfsign:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign
-      tag: v16.11.1
+      tag: v17.0.1
 
 upgradeCheck:
   image:
-    repository: docker.io/redhat/ubi8
-    tag: "8.9"
+    repository: docker.io/redhat/ubi9
+    tag: "9.4"
diff --git a/zarf.yaml b/zarf.yaml
index 6962d7d4..00cdf604 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -47,19 +47,19 @@ components:
         valuesFiles:
           - values/registry1-values.yaml
     images:
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/certificates:16.11.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/certificates:17.0.1"
       - "registry1.dso.mil/ironbank/gitlab/gitlab/cfssl-self-sign:1.6.1"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitaly:16.11.1"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry:16.11.1"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages:16.11.1"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell:16.11.1"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq:16.11.1"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox:16.11.1"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice:16.11.1"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse:16.11.1"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:16.11.1"
-      - "registry1.dso.mil/ironbank/redhat/ubi/ubi9:9.3"
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:16.11.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitaly:17.0.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry:17.0.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages:17.0.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell:17.0.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq:17.0.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox:17.0.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice:17.0.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse:17.0.1"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:17.0.1"
+      - "registry1.dso.mil/ironbank/redhat/ubi/ubi9:9.4"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:17.0.1"
 
   # Note: upstream flavor is experimental
   - name: gitlab
@@ -74,16 +74,16 @@ components:
         valuesFiles:
           - values/upstream-values.yaml
     images:
-      - "registry.gitlab.com/gitlab-org/build/cng/certificates:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/gitaly:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-pages:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v16.11.1"
-      - "registry.gitlab.com/gitlab-org/build/cng/kubectl:v16.11.1"
-      - "docker.io/redhat/ubi8:8.9"
-      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v16.11.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-pages:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.0.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.0.1"
+      - "docker.io/redhat/ubi9:9.4"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.0.1"