diff --git a/.ci/lib/generate_build_jobs.py b/.ci/lib/generate_build_jobs.py
index e2f6d0e29..72eebd6e5 100755
--- a/.ci/lib/generate_build_jobs.py
+++ b/.ci/lib/generate_build_jobs.py
@@ -189,16 +189,17 @@ if __name__ == "__main__":
             if apkbuild['pkgname'] in device.dependencies:
                 devices_under_test.add(device)
 
-    skip = False
     if common.commit_message_has_string("[ci:skip-build]"):
         print("User requested skipping build, skipping build")
-        skip = True
+        archs = ArchTagSet()
+        devices_under_test = set()
     if common.all_committed_by_merge_bot():
         print("All commits in branch committed by merge bot, skipping build")
-        skip = True
-    if skip:
         archs = ArchTagSet()
         devices_under_test = set()
+    if common.commit_message_has_string("[ci:skip-hw-ci]"):
+        print("User requested skipping HW-CI jobs, skipping them")
+        devices_under_test = set()
 
     print(f"Architectures to build: {archs}")
     print(f"Devices under test: {devices_under_test}")
diff --git a/docs/ci/ci-tags.md b/docs/ci/ci-tags.md
index 866b6042b..3fa17b9cf 100644
--- a/docs/ci/ci-tags.md
+++ b/docs/ci/ci-tags.md
@@ -17,6 +17,10 @@ the continuous integration behaviour for your merge requests.
   might not pass the check.
 * `[ci:skip-grep]`: Do not run the grep check. Use this when renaming or moving
   unmaintained packages.
+* `[ci:skip-hw-ci]`: Do not run any jobs associated with hardware CI. This is
+  useful if there is something urgent that needs merging and there is some
+  regression in the jobs that do the preparation for the runs on the actual
+  hardware.
 * `[ci:skip-kconfigcheck]`: Do not check the kernel config for packages
   changed in the commit. Use this when moving kernel packages between
   categories or performing bulk changes across a lot of kernel packages, but