diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e00740..cbd846b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 include:
  - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
- - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-byzantium-jobs.yml'
 
 stages:
  - build
@@ -8,6 +7,9 @@ stages:
  - package
  - test-package
 
+variables:
+  L5_DOCKER_IMAGE: debian:bullseye
+
 build:native:
   stage: build
   artifacts:
@@ -17,17 +19,21 @@ build:native:
     COMMON_BUILD_OPTS: -Db_coverage=true --werror
     BUILD_OPTS: -Dgtk_doc=true ${COMMON_BUILD_OPTS}
     WANT_BUILD_DEPS: "true"
+    EXP_DEPS: libhandy-1-dev/experimental libhandy-1-0/experimental gir1.2-handy-1/experimental libgladeui-common/experimental
   except:
     variables:
       - $PKG_ONLY == "1"
-  image: pureos/byzantium
-  tags:
-    - librem5
+  image: debian:bullseye
+  tags: []
   before_script:
     - export DEBIAN_FRONTEND=noninteractive
     - apt-get -y update
-    - apt-get -y install lcov
-    - apt-get -y build-dep .
+    - apt-get -y install eatmydata
+    - echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/exp.list
+    - eatmydata apt-get -y update
+    - eatmydata apt-get -y install $EXP_DEPS
+    - eatmydata apt-get -y install lcov
+    - '[ "${WANT_BUILD_DEPS}" != "true" ] || eatmydata apt-get -y build-dep .'
     - ulimit -c unlimited
   script:
     - 'echo "Build opts: ${BUILD_OPTS}"'
@@ -73,6 +79,27 @@ check-po:
     - cd po/
     - intltool-update -m 2>&1 | grep -qs '/.*\.c' && { intltool-update -m; exit 1; } || exit 0
 
+package-debian-bullseye:
+  variables:
+    EXP_DEPS: libhandy-1-dev/experimental libhandy-1-0/experimental gir1.2-handy-1/experimental libgladeui-common/experimental
+  tags: []
+  extends: .l5-build-debian-package
+  before_script:
+    - echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/exp.list
+    - apt-get -y update
+    - apt-get -y install $EXP_DEPS
+
+package-debian-bullseye:arm64:
+  variables:
+    EXP_DEPS: libhandy-1-dev/experimental libhandy-1-0/experimental gir1.2-handy-1/experimental libgladeui-common/experimental
+  tags:
+    - aarch64
+  extends: .l5-build-debian-package
+  before_script:
+    - echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/exp.list
+    - apt-get -y update
+    - apt-get -y install $EXP_DEPS
+
 # For some reason including https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml fails with a network error (status code 500), therefore it's copied here
 .flatpak:
   image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'