diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3629b570b53e4c4b975d6da8259319159e2eb87a..17685d9bc1afc1b9875fc51adc2382f220e4bf3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@
 stages:
   - compliance
   - build
+  - update
   - test
   - report
   - deploy
@@ -81,6 +82,15 @@ aggregate-docs:
     - if: '$CI_COMMIT_TAG'
       # XXX: This needs CI_ONIRO_MANIFEST_BRANCH as well, most likely.
 
+# Build a RAUC update bundle for Raspberry Pi 4
+bundle-raspberrypi4-64:
+  extends: .build-rauc-bundle
+  stage: update
+  variables:
+    MACHINE: raspberrypi4-64
+    CI_ONIRO_BUILD_FLAVOUR: linux
+    CI_ONIRO_RECIPE_NAME: oniro-bundle-base
+
 # Mimic the updated rules for lava-test from the bitbake-workspace.
 .lava-test:
   rules:
diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml
index f0c69b4cc70e8af95d1f5839bddbdc3f4540b735..b9efc02665475ff151756671ae447570288fc8e9 100644
--- a/.oniro-ci/build-generic.yaml
+++ b/.oniro-ci/build-generic.yaml
@@ -287,6 +287,18 @@
     - echo "Pruning empty directories"
     - find "$CI_PROJECT_DIR"/artifacts/ -type d -exec rmdir --verbose --ignore-fail-on-non-empty {} \; 2>/dev/null || true
 
+.build-rauc-bundle:
+  extends: .build-image
+  script:
+    - !reference [.build-image, script]
+    # Remove everything _except_ for the .raucb.* files. The bundle is
+    # self-sufficient (aka standalone) and does not need any supporting
+    # infrastructure.
+    - echo "Removing non-bundle files"
+    - find "$CI_PROJECT_DIR"/artifacts/images/ \( -type f -o -type l \) -a ! -name "*.raucb" -print -delete
+    - echo "Pruning empty directories"
+    - find "$CI_PROJECT_DIR"/artifacts/ -type d -exec rmdir --verbose --ignore-fail-on-non-empty {} \; 2>/dev/null || true
+
 # This job is currently used to customize the behavior in oniro and xts-acts.
 # It will be removed when that is safe to do so. It is not documented.
 .build:
diff --git a/docs/ci/hidden-jobs/build-rauc-bundle.rst b/docs/ci/hidden-jobs/build-rauc-bundle.rst
new file mode 100644
index 0000000000000000000000000000000000000000..114413acc4e1898a64e1c7bcff506dba19fc150a
--- /dev/null
+++ b/docs/ci/hidden-jobs/build-rauc-bundle.rst
@@ -0,0 +1,18 @@
+.. SPDX-FileCopyrightText: Huawei Inc.
+..
+.. SPDX-License-Identifier: CC-BY-4.0
+
+==================
+.build-rauc-bundle
+==================
+
+The ``.build-rauc-bundle`` job extends the :doc:`build-image` job to collect
+only the `*.raucb.*` file and remove all the other files that would normally be
+collected by the artifact system. It is recommended for Linux builds which
+produce RAUC update bundles.
+
+Usage Guide
+===========
+
+This job is configured exactly the same as :doc:`build-image` and
+:doc:`build-recipe`.
diff --git a/docs/ci/hidden-jobs/index.rst b/docs/ci/hidden-jobs/index.rst
index b21cb44a68dfcd235f208daf31a8dc1f64e4eff0..04d5083fe7e18db7945bf276094d1c3386afe2a4 100644
--- a/docs/ci/hidden-jobs/index.rst
+++ b/docs/ci/hidden-jobs/index.rst
@@ -23,6 +23,7 @@ implementation details.
    build-recipe
    build-image
    build-wic-image
+   build-rauc-bundle
    build-docs
    lava-test
    lava-report