diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 846287e..1f50acd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,13 +31,8 @@ workflow:
   image:
     name: debian:trixie
 
-.tags: &tags
-  tags:
-    - librem5:arm64
-
 # Regular, full build
 build:gcc:native-debian-trixie:full:
-  <<: *tags
   <<: *image
   <<: *before_script
   stage: build
@@ -53,7 +48,6 @@ build:gcc:native-debian-trixie:full:
 
 # Minimal build for e.g. submodule usage
 build:gcc:native-debian-trixie:lib:
-  <<: *tags
   <<: *image
   <<: *before_script
   stage: build
@@ -68,7 +62,6 @@ build:gcc:native-debian-trixie:lib:
 build:clang:native-debian-trixie:full:
   variables:
     EXTRA_PKGS: clang
-  <<: *tags
   <<: *image
   <<: *before_script
   stage: build
@@ -84,7 +77,6 @@ build:clang:native-debian-trixie:full:
   allow_failure: true
 
 test:native-debian-trixie:
-  <<: *tags
   <<: *image
   <<: *before_script
   stage: test
@@ -92,32 +84,23 @@ test:native-debian-trixie:
     - build:gcc:native-debian-trixie:full
   coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
   script:
-    - dbus-run-session ninja -C _build test coverage
+    - dbus-run-session ninja -C _build test
+    - ninja -C _build coverage || true
   except:
     variables:
       - $PKG_ONLY == "1"
 
 check-consistency:
-  <<: *tags
   stage: test
   extends: .phosh-check-consistency
 
 format-check:
-  <<: *tags
   stage: style-checks
   extends: .phosh-format-check
   allow_failure: true
 
 check-meson:
-  <<: *tags
   stage: style-checks
   extends:
     - .phosh-check-meson
 
-package:deb-debian-trixie:arm64:
-  tags:
-    - librem5:arm64
-  stage: package
-  variables:
-    PHOSH_DOCKER_IMAGE: debian:trixie
-  extends: .phosh-build-debian-package