diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48f81141e..1883fa95f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,16 +61,6 @@ debian-9-full:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
     MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
   <<: *compile_definition
-  after_script:
-  - make -C build/doc html-pages
-  - rm -rf lists && mkdir lists && mv build/doc/*.html lists/
-  - cd build/doc && doxygen doxygen-sanei.conf && mv sanei-html ../../doc
-  artifacts:
-    paths:
-    - sane-backends-*.tar.gz
-    - lists
-    - doc/sanei-html
-    expire_in: 1 day
 
 debian-10-mini:
   image: $REGISTRY_HUB:debian-buster-mini
@@ -85,6 +75,16 @@ debian-10-full:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
     #MAKE_FLAGS: "CFLAGS=-Werror"
   <<: *compile_definition
+  after_script:
+  - make -C build/doc html-pages
+  - rm -rf lists && mkdir lists && mv build/doc/*.html lists/
+  - cd build/doc && doxygen doxygen-sanei.conf && mv sanei-html ../../doc
+  artifacts:
+    paths:
+    - sane-backends-*.tar.gz
+    - lists
+    - doc/sanei-html
+    expire_in: 1 day
 
 fedora-29-clang:
   image: $REGISTRY_HUB:fedora-29-clang
@@ -105,10 +105,10 @@ alpine-3.10-musl:
   <<: *compile_definition
 
 make-distcheck:
-  image: $REGISTRY_HUB:debian-stretch-full
+  image: $REGISTRY_HUB:debian-buster-full
   stage: snapshot
   dependencies:
-  - debian-9-full
+  - debian-10-full
   script:
   - tar xzf sane-backends-*.tar.gz --strip-components=1
   - rm sane-backends-*.tar.gz