diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f70dca77f1f13007eb2ad5dd47331e4d084cc329..b2e927f7133a752851e2b575b18d3dda1fb4044d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,28 @@
 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.1.0"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/version@v1.2.0"
     inputs:
       extends:
         - .base
       needs:
-        - oci
         - format-check
       versions:
         - 7.4.0
         - 7.x
-      configs:
-        - local
-        # FIXME: enable remote builds
-        #- remote
-      oses:
-        - linux
+  # FIXME: enable remote builds
+  #- component: "${CI_SERVER_HOST}/ci/component/bazelisk/config@v1.2.0"
+  #  inputs:
+  #    extends:
+  #      - .base
+  #    needs:
+  #      - format-check
+  #    config:
+  #      - remote
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/semantic-release@v1.2.0"
+    inputs:
+      extends:
+        - .base
+      needs:
+        - version
 
 default:
   tags:
@@ -24,19 +32,25 @@ default:
 
 .base:
   extends: .job
+  variables:
+    # FIXME: Only exclude `//qemu` when `ROOT` is `e2e`
+    TARGET: //... -//qemu/...
+  script:
+    - cd "${ROOT}"; bazelisk test --config="${CONFIG}" -- ${TARGET}
+
+qemu:
+  extends: .base
+  variables:
+    ROOT: e2e
+    CONFIG: local
+    TARGET: //qemu/...
   tags:
     - arm64
     - linux
     - metal
-  variables:
-    TARGET: "//..."
   rules:
-    - if: $ROOT == "e2e" && $CI_MERGE_REQUEST_IID
-      variables:
-        TARGET: "//:ci"
-    - !reference [.bazelisk, rules]
-  script:
-    - cd "${ROOT}"; bazelisk test --config="${CONFIG}" ${TARGET}
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
 
 oci:
   stage: .pre
@@ -68,8 +82,6 @@ format-check:
 pages:
   stage: deploy
   extends: .base
-  needs:
-    - oci
   script:
     - bazelisk run docs:public
   artifacts:
diff --git a/e2e/BUILD.bazel b/e2e/BUILD.bazel
index d3242e79b4ebb53ce70435b05e6333d8f2296ed0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/e2e/BUILD.bazel
+++ b/e2e/BUILD.bazel
@@ -1,4 +0,0 @@
-test_suite(
-    name = "ci",
-    tests = ["//localhost"],
-)
diff --git a/e2e/localhost/BUILD.bazel b/e2e/localhost/BUILD.bazel
index 05b48f0a36cbfce3c3b3e219dc0a6ef89980c2ea..51fad29e7812b22c90c1169483b4482f3c1d87a6 100644
--- a/e2e/localhost/BUILD.bazel
+++ b/e2e/localhost/BUILD.bazel
@@ -129,7 +129,3 @@ labgrid_test(
     src = ":inner",
     platform = "@rules_labgrid//labgrid/platform:localhost",
 )
-
-test_suite(
-    name = "localhost",
-)