diff --git a/ci_files/variables.yml b/ci_files/variables.yml
index f669b72bd35b3d72b77a684663171fef21d72c29..7eba4525c0632e30fa654ef730abdadc18f416ad 100644
--- a/ci_files/variables.yml
+++ b/ci_files/variables.yml
@@ -1,76 +1,54 @@
 variables:
-  # Base distribution
-  DEBIAN_IMAGE: "debian:bookworm-slim"
-  UBI_IMAGE: "registry.access.redhat.com/ubi8/ubi-minimal:8.8"
-  ALPINE_IMAGE: "alpine:3.15"
-
-  # GitLab Application Components
-  GITLAB_ELASTICSEARCH_INDEXER_VERSION: "main"
-  GITLAB_VERSION: "main-jh"
-  GITLAB_REF_SLUG: "main-jh"
-  GITLAB_ASSETS_TAG: "main-jh"
-  GITLAB_EXPORTER_VERSION: "14.1.0"
-  GITLAB_SHELL_VERSION: "main"
-  GITLAB_CONTAINER_REGISTRY_VERSION: "v3.88.0-gitlab"
-  GITALY_SERVER_VERSION: "master"
-  GITLAB_PAGES_VERSION: "master"
-  GITLAB_KAS_VERSION: "master"
-  MAILROOM_VERSION: "0.0.24"
-  GITLAB_ZOEKT_WEBSERVER_VERSION: "v0.0.2-fcb27"
-  GITLAB_ZOEKT_DYNAMIC_INDEXSERVER_VERSION: "v0.0.1-5f25b"
-  GITLAB_ZOEKT_INDEXER_VERSION: "v0.3.0-3b794"
-  ZOEKT_VERSION: "fcb279ae404c0aa102121b28257143ad16e77482"
-  ZOEKT_INDEXER_VERSION: "3b794ccc779c71d4b8fadde0f00674e48ca3b364"
-
-  # Runtimes & Tools
-  GIT_VERSION: "2.29.0"
-  # Follow the Go upgrade guidelines when changing the Go version
-  # link: https://docs.gitlab.com/ee/development/go_guide/go_upgrade.html
-  GO_VERSION: "1.20.12"
-  GO_FIPS_VERSION: "1.20.12"
-  GO_FIPS_TAG: "go1.20.12-1-openssl-fips"
-  # Follow the Ruby upgrade guidelines when changing the ruby version
-  # link: https://docs.gitlab.com/ee/development/ruby_upgrade.html
-  RUBY_VERSION: 3.1.4
-  NEXT_RUBY_VERSION: 3.1.4
-  RUST_VERSION: 1.73.0
-  PYTHON_VERSION: "3.9.18"
-  KUBECTL_VERSION: "1.25.16"
-  YQ_VERSION: "4.40.5"
-  PG_VERSION: "15.1"
-  CA_PKG_VERSION: "20220614-r0"
-  CFSSL_VERSION: "1.6.1"
-  CFSSL_CHECKSUM_SHA256: "89e600cd5203a025f8b47c6cd5abb9a74b06e3c7f7f7dd3f5b2a00975b15a491"
-  AWSCLI_VERSION: "1.32.14"
-  S3CMD_VERSION: "2.4.0"
-  GM_VERSION: "1.3.36"
-  GM_CHECKSUM_SHA256: "5d5b3fde759cdfc307aaf21df9ebd8c752e3f088bb051dd5df8aac7ba7338f46"
-  GITLAB_LOGGER_VERSION: "v3.0.0"
-  GITLAB_LOGGER_SHA256: "b6bca21e3eba525334f4b140d9d9405181a25821365ccd9065402fa050af78d5"
-  GOMPLATE_VERSION: "v3.11.6"
-  GOMPLATE_SHA256: "fba514c022e8d797a950b43e3d4e47bf5a546ed95492651a22d95cdf2f614bfd"
-  EXIFTOOL_VERSION: "12.71"
-
-  # Docker configuration
+  ALPINE_IMAGE: alpine:3.15
+  ASSETS_IMAGE_PREFIX: gitlab-assets
+  ASSETS_IMAGE_REGISTRY_PREFIX: registry.gitlab.com/gitlab-org
+  AWSCLI_VERSION: 1.32.14
+  CA_PKG_VERSION: 20220614-r0
+  CE_PROJECT: gitlab-foss
+  CFSSL_CHECKSUM_SHA256: 89e600cd5203a025f8b47c6cd5abb9a74b06e3c7f7f7dd3f5b2a00975b15a491
+  CFSSL_VERSION: 1.6.1
+  COMPILE_ASSETS: "false"
+  DEBIAN_IMAGE: debian:bookworm-slim
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375
   DOCKER_TLS_CERTDIR: ""
-
-  # Pipeline config
-  ASSETS_IMAGE_PREFIX: "gitlab-assets"
-  ASSETS_IMAGE_REGISTRY_PREFIX: "registry.gitlab.com/gitlab-org"
-  PREFLIGHT_IMAGE_PREFIX: "cloud-native"
-  PREFLIGHT_IMAGE_REGISTRY_PREFIX: "registry.gitlab.com/gitlab-org"
-  GITLAB_NAMESPACE: "gitlab-org"
-  CE_PROJECT: "gitlab-foss"
-  EE_PROJECT: "gitlab"
-  COMPILE_ASSETS: "false"
-## Note
-# Variables ASSETS_IMAGE_REGISTRY_PREFIX, PREFIX_IMAGE_REGISTRY_PREFIX,
-# GITLAB_NAMESPACE and CE_PROJECT are overridden in the mirror of this
-# project in dev.gitlab.org to match their dev counterpart locations.
-
-## Note
-# Forcing complete rebuilds requires setting two items:
-# FORCE_IMAGE_BUILDS=true
-# DISABLE_DOCKER_BUILD_CACHE=true
+  EE_PROJECT: gitlab
+  EXIFTOOL_VERSION: "12.71"
+  GIT_VERSION: 2.29.0
+  GITALY_SERVER_VERSION: 73920c7baa9ace55ba51d555e309897fd331c1b4
+  GITLAB_ASSETS_TAG: ba98831b39389e388c752df4b29b0510fec4790c
+  GITLAB_CONTAINER_REGISTRY_VERSION: v3.88.0-gitlab
+  GITLAB_ELASTICSEARCH_INDEXER_VERSION: v4.5.0
+  GITLAB_EXPORTER_VERSION: 14.1.0
+  GITLAB_KAS_VERSION: v16.8.0
+  GITLAB_LOGGER_SHA256: b6bca21e3eba525334f4b140d9d9405181a25821365ccd9065402fa050af78d5
+  GITLAB_LOGGER_VERSION: v3.0.0
+  GITLAB_NAMESPACE: gitlab-org
+  GITLAB_PAGES_VERSION: bf6cd6ddf529f8958adee206ac0f93953e9ac39c
+  GITLAB_REF_SLUG: ba98831b39389e388c752df4b29b0510fec4790c
+  GITLAB_SHELL_VERSION: v14.32.0
+  GITLAB_VERSION: ba98831b39389e388c752df4b29b0510fec4790c
+  GITLAB_ZOEKT_DYNAMIC_INDEXSERVER_VERSION: v0.0.1-5f25b
+  GITLAB_ZOEKT_INDEXER_VERSION: v0.3.0-3b794
+  GITLAB_ZOEKT_WEBSERVER_VERSION: v0.0.2-fcb27
+  GM_CHECKSUM_SHA256: 5d5b3fde759cdfc307aaf21df9ebd8c752e3f088bb051dd5df8aac7ba7338f46
+  GM_VERSION: 1.3.36
+  GO_FIPS_TAG: go1.20.12-1-openssl-fips
+  GO_FIPS_VERSION: 1.20.12
+  GO_VERSION: 1.20.12
+  GOMPLATE_SHA256: fba514c022e8d797a950b43e3d4e47bf5a546ed95492651a22d95cdf2f614bfd
+  GOMPLATE_VERSION: v3.11.6
+  KUBECTL_VERSION: 1.25.16
+  MAILROOM_VERSION: 0.0.24
+  NEXT_RUBY_VERSION: 3.1.4
+  PG_VERSION: "15.1"
+  PREFLIGHT_IMAGE_PREFIX: cloud-native
+  PREFLIGHT_IMAGE_REGISTRY_PREFIX: registry.gitlab.com/gitlab-org
+  PYTHON_VERSION: 3.9.18
+  RUBY_VERSION: 3.1.4
+  RUST_VERSION: 1.73.0
+  S3CMD_VERSION: 2.4.0
+  UBI_IMAGE: registry.access.redhat.com/ubi8/ubi-minimal:8.8
+  YQ_VERSION: 4.40.5
+  ZOEKT_INDEXER_VERSION: 3b794ccc779c71d4b8fadde0f00674e48ca3b364
+  ZOEKT_VERSION: fcb279ae404c0aa102121b28257143ad16e77482