diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60d752489a945bbd3990478b2ab830736a998f14..444f92fa6ff41d76a26ed778582b5f34c7c053ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -184,7 +184,7 @@ variables:
   BUILD_OS: "debian"
   OS_VERSION: "bookworm"
   UBI_VERSION: "8.6"
-  CHROME_VERSION: "120"
+  CHROME_VERSION: "123"
   DOCKER_VERSION: "24.0.5"
   RUBYGEMS_VERSION: "3.4"
   BUNDLER_VERSION: "2.5"
diff --git a/qa/Dockerfile b/qa/Dockerfile
index 54ae484e17a2b1c4307df1f2fca53834ea10104c..975c6edd9e2d8e9ee4f88e698fe4bb5bdba14f81 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -2,9 +2,11 @@ ARG DOCKER_VERSION=24.0.5
 ARG CHROME_VERSION=119
 ARG RUBY_VERSION=3.1
 ARG BUNDLER_VERSION=2.5
+ARG BUILD_OS=debian
+ARG OS_VERSION=bookworm
 ARG QA_BUILD_TARGET=ee
 
-FROM registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-${BUNDLER_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23 AS foss
+FROM registry.gitlab.com/gitlab-org/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}:bundler-${BUNDLER_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23 AS foss
 LABEL maintainer="GitLab Quality Department <quality@gitlab.com>"
 
 ENV DEBIAN_FRONTEND="noninteractive"
diff --git a/scripts/build_qa_image b/scripts/build_qa_image
index eab8abd5c5cd7466a252931fdc70477623317b0b..7a783996124bb2b743da9c1f105f5b84e5583541 100755
--- a/scripts/build_qa_image
+++ b/scripts/build_qa_image
@@ -88,6 +88,8 @@ docker buildx build \
   --build-arg=DOCKER_VERSION="${DOCKER_VERSION}" \
   --build-arg=RUBY_VERSION="${RUBY_VERSION}" \
   --build-arg=BUNDLER_VERSION="${BUNDLER_VERSION}" \
+  --build-arg=BUILD_OS="${BUILD_OS}" \
+  --build-arg=OS_VERSION="${OS_VERSION}" \
   --build-arg=QA_BUILD_TARGET="${QA_BUILD_TARGET}" \
   --file="${CI_PROJECT_DIR}/qa/Dockerfile" \
   --push \