diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1819c4c866eebc7f379e5f8ee6a5b7dbe11317b5..06b33043c9c9f580fcc89712b8b6f6171c65632b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,30 +5,13 @@ stages:
 
 build:src:
   stage: build_src
-  image: "ai/build:base"
+  image: "ai/build:stretch"
   script: "build-dsc"
   artifacts:
     paths:
       - build-deb/
 
 build:pkg:
-  stage: build_pkg
-  image: "ai/build:base"
-  script: "build-deb"
-  dependencies:
-    - build:src
-  artifacts:
-    paths:
-      - output-deb/
-
-upload:pkg:
-  stage: upload
-  image: "ai/pkg:base"
-  script: "upload-packages"
-  dependencies:
-    - build:pkg
-
-build:pkg-stretch:
   stage: build_pkg
   image: "ai/build:stretch"
   script: "build-deb"
@@ -43,4 +26,4 @@ upload:ai3:
   image: "ai/pkg:base"
   script: "upload-packages --repository=ai3"
   dependencies:
-    - build:pkg-stretch
+    - build:pkg