diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c194c6de8b52e8247a35cc8c19dd5d59da0d47bb..909aff6616ad77cbc7848b66999d3594c9ce34b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,10 @@ stages:
     - build
 
 build-debian:
-    image: registry.videolan.org/vlc-debian-unstable:20181128113529
+    image: registry.videolan.org/vlc-debian-unstable:20200529132440
     stage: build
     tags:
-        - debian
+        - docker
         - amd64
     script:
         - ./bootstrap
@@ -17,7 +17,8 @@ build-debian:
 build-macos:
     stage: build
     tags:
-        - macos
+        - catalina
+        - amd64
     script:
         - ./bootstrap
         - mkdir build
@@ -26,12 +27,11 @@ build-macos:
         - make -j $(getconf _NPROCESSORS_ONLN)
 
 build-win64:
-    image: registry.videolan.org/vlc-debian-win64:20181107154313
+    image: registry.videolan.org/vlc-debian-win64:20201106143728
     stage: build
     tags:
-        - debian
+        - docker
         - amd64
-        - win64
     script:
         - ./bootstrap
         - mkdir build
@@ -40,12 +40,11 @@ build-win64:
         - make -j $(getconf _NPROCESSORS_ONLN)
 
 build-win32:
-    image: registry.videolan.org/vlc-debian-win32:20181107151708
+    image: registry.videolan.org/vlc-debian-win32:20201106141924
     stage: build
     tags:
-        - debian
+        - docker
         - amd64
-        - win32
     script:
         - ./bootstrap
         - mkdir build