diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23ae922ed3511142f5e88ce32f66156de051af3c_LmdpdGxhYi1jaS55bWw=..baf09172fa724fca79f27b4c588e0f76d8a793a6_LmdpdGxhYi1jaS55bWw= 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@
   # will use images from that registry and not depend on GitLab.com
   BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
   PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
-  BUILDER_IMAGE_REVISION: "3.14.1"
+  BUILDER_IMAGE_REVISION: "3.15.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 23ae922ed3511142f5e88ce32f66156de051af3c_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw=..baf09172fa724fca79f27b4c588e0f76d8a793a6_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw= 100644
--- a/gitlab-ci-config/check-packages.yml
+++ b/gitlab-ci-config/check-packages.yml
@@ -173,6 +173,14 @@
   extends: .zypper-install
   tags:
   - docker-arm-builder
+OpenSUSE-15.4-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4:${BUILDER_IMAGE_REVISION}"
+  extends: .zypper-install
+OpenSUSE-15.4-arm64-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
+  extends: .zypper-install
+  tags:
+  - docker-arm-builder
 SLES-12.5-check:
   image: "${DEV_BUILDER_IMAGE_REGISTRY}/sles_12sp5:${BUILDER_IMAGE_REVISION}"
   extends:
diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml
index 23ae922ed3511142f5e88ce32f66156de051af3c_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..baf09172fa724fca79f27b4c588e0f76d8a793a6_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644
--- a/gitlab-ci-config/dev-gitlab-org.yml
+++ b/gitlab-ci-config/dev-gitlab-org.yml
@@ -329,6 +329,14 @@
   extends: .branch_template
   tags:
   - docker-arm-builder
+OpenSUSE-15.4-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4:${BUILDER_IMAGE_REVISION}"
+  extends: .branch_template
+OpenSUSE-15.4-arm64-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
+  extends: .branch_template
+  tags:
+  - docker-arm-builder
 AmazonLinux-2-branch:
   image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2:${BUILDER_IMAGE_REVISION}"
   extends: .branch_template
@@ -609,6 +617,14 @@
   extends: .tag_template
   tags:
   - docker-arm-builder
+OpenSUSE-15.4:
+  image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4:${BUILDER_IMAGE_REVISION}"
+  extends: .tag_template
+OpenSUSE-15.4-arm64:
+  image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
+  extends: .tag_template
+  tags:
+  - docker-arm-builder
 AmazonLinux-2:
   image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2:${BUILDER_IMAGE_REVISION}"
   extends: .tag_template
@@ -740,6 +756,20 @@
       optional: true
     - job: OpenSUSE-15.3-arm64-branch
       optional: true
+OpenSUSE-15.4-staging:
+  extends: .staging_upload_template
+  needs:
+    - job: OpenSUSE-15.4
+      optional: true
+    - job: OpenSUSE-15.4-branch
+      optional: true
+OpenSUSE-15.4-arm64-staging:
+  extends: .staging_upload_template
+  needs:
+    - job: OpenSUSE-15.4-arm64
+      optional: true
+    - job: OpenSUSE-15.4-arm64-branch
+      optional: true
 AmazonLinux-2-staging:
   extends: .staging_upload_template
   needs:
@@ -860,6 +890,14 @@
   extends: .production_release_template
   needs:
     - OpenSUSE-15.3-arm64
+OpenSUSE-15.4-release:
+  extends: .production_release_template
+  needs:
+    - OpenSUSE-15.4
+OpenSUSE-15.4-arm64-release:
+  extends: .production_release_template
+  needs:
+    - OpenSUSE-15.4-arm64
 AmazonLinux-2-release:
   extends: .production_release_template
   needs:
diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml
index 23ae922ed3511142f5e88ce32f66156de051af3c_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA==..baf09172fa724fca79f27b4c588e0f76d8a793a6_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA== 100644
--- a/gitlab-ci-config/gitlab-com.yml
+++ b/gitlab-ci-config/gitlab-com.yml
@@ -399,6 +399,7 @@
 Debian 10 knapsack: !reference [.knapsack]
 Debian 11 knapsack: !reference [.knapsack]
 OpenSUSE 15.3 knapsack: !reference [.knapsack]
+OpenSUSE 15.4 knapsack: !reference [.knapsack]
 Ubuntu 16.04 knapsack: !reference [.knapsack]
 Ubuntu 18.04 knapsack: !reference [.knapsack]
 Ubuntu 20.04 knapsack: !reference [.knapsack]
@@ -474,6 +475,12 @@
   parallel: 6
   needs:
   - OpenSUSE 15.3 knapsack
+OpenSUSE 15.4 specs :
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:omnibus-gitlab-opensuse15.4"
+  extends: .chef_spec_template
+  parallel: 6
+  needs:
+  - OpenSUSE 15.4 knapsack
 AmazonLinux 2 specs :
   image: "registry.gitlab.com/gitlab-org/gitlab-build-images:omnibus-gitlab-amazonlinux2"
   extends: .chef_spec_template