diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b5116594615fb6598d2b33848166547948889ef_LmdpdGxhYi1jaS55bWw=..6b7ecfb5a567a01ff272361a54e804deeb51425b_LmdpdGxhYi1jaS55bWw= 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@
   # To be used for images that exist only on dev.gitlab.org
   DEV_BUILDER_IMAGE_REGISTRY: 'dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder'
   PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
-  BUILDER_IMAGE_REVISION: "5.2.0"
+  BUILDER_IMAGE_REVISION: "5.4.0"
   # The registry to pull the assets image from
   ASSET_REGISTRY: "${CI_REGISTRY}"
   ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"
diff --git a/gitlab-ci-config/check-packages.yml b/gitlab-ci-config/check-packages.yml
index 3b5116594615fb6598d2b33848166547948889ef_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw=..6b7ecfb5a567a01ff272361a54e804deeb51425b_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw= 100644
--- a/gitlab-ci-config/check-packages.yml
+++ b/gitlab-ci-config/check-packages.yml
@@ -137,6 +137,14 @@
   variables:
     package_repository: 'raspberry-pi2'
   tags: !reference [.distribution-armhf-tags]
+Raspberry-Pi-2-Bookworm-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/rpi_12:${BUILDER_IMAGE_REVISION}"
+  extends:
+    - .apt-install
+    - .ce-tag-only
+  variables:
+    package_repository: 'raspberry-pi2'
+  tags: !reference [.distribution-armhf-tags]
 Ubuntu-18.04-fips-check:
   image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04_fips:${BUILDER_IMAGE_REVISION}"
   extends:
diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml
index 3b5116594615fb6598d2b33848166547948889ef_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..6b7ecfb5a567a01ff272361a54e804deeb51425b_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644
--- a/gitlab-ci-config/dev-gitlab-org.yml
+++ b/gitlab-ci-config/dev-gitlab-org.yml
@@ -429,6 +429,10 @@
   image: "${BUILDER_IMAGE_REGISTRY}/rpi_11:${BUILDER_IMAGE_REVISION}"
   extends: .rpi_branch_template
 
+Raspberry-Pi-2-Bookworm-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/rpi_12:${BUILDER_IMAGE_REVISION}"
+  extends: .rpi_branch_template
+
 # This job runs only on nightly EE builds
 RAT-Nightly:
   stage: slow_jobs
@@ -1102,6 +1106,10 @@
   extends: .rpi_tag_template
   image: "${BUILDER_IMAGE_REGISTRY}/rpi_11:${BUILDER_IMAGE_REVISION}"
 
+Raspberry-Pi-2-Bookworm:
+  extends: .rpi_tag_template
+  image: "${BUILDER_IMAGE_REGISTRY}/rpi_12:${BUILDER_IMAGE_REVISION}"
+
 Raspberry-Pi-2-Buster-release:
   extends: .raspbian_release_template
   needs:
@@ -1112,6 +1120,11 @@
   needs:
     - Raspberry-Pi-2-Bullseye
 
+Raspberry-Pi-2-Bookworm-release:
+  extends: .raspbian_release_template
+  needs:
+    - Raspberry-Pi-2-Bookworm
+
 AWS-CE-Release:
   variables:
     AWS_LISTING_NAME: "GitLab Community Edition"