diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b1ae319795442efe8eafb719f96ac09048c39b1..ea67c54c6ba213a9e26d918d942fb9deb62e0c36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,37 +1,12 @@
+include: "https://git.autistici.org/ai3/build-deb/raw/master/ci-common.yml"
 
-stages:
-  - build_src
-  - build_pkg
-  - upload
-
-build:src:
-  stage: build_src
-  image: "ai/build:stretch"
-  script: "build-dsc"
-  artifacts:
-    paths:
-      - build-deb/
-  only:
-    - master
-
-build:pkg:
-  stage: build_pkg
-  image: "ai/build:stretch"
-  script: "build-deb"
+upload_pkg:
+  stage: upload_pkg
+  image: "registry.git.autistici.org/ai3/build-deb:buster-amd64"
+  script:
+    - upload-packages -r ai3-tutorials
   dependencies:
-    - build:src
-  artifacts:
-    paths:
-      - output-deb/
+    - build_pkg:buster:amd64
+    - build_pkg:buster:arm64
   only:
     - master
-
-upload:pkg:
-  stage: upload
-  image: "ai/pkg:base"
-  script: "upload-packages -r ai3-tutorials"
-  dependencies:
-    - build:pkg
-  only:
-    - master
-