diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c568768e0..bfa08c4777 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,9 +37,8 @@ default:
 build:
   extends: .main_template
   stage: build
-  tags:
-    - starpu
-    - linux
+  image: registry.gitlab.inria.fr/starpu/starpu-docker/ci-debian12
+  tags: ['ci.inria.fr', 'linux', 'large']
   script:
     - ./contrib/gitlab/build.sh
   artifacts:
@@ -57,19 +56,28 @@ build:
   script:
     - ./contrib/gitlab/deploy.sh
 
-check:
+check_ci:
   extends: .check_template
   parallel:
     matrix:
-      - NODE: [debian12, debian10, ubuntu1604, ubuntu1804, centos72amd64, macosx]
+      - NODE: [centos72amd64, macosx]
   tags:
     - ${NODE}
+  script:
+    - ./contrib/gitlab/deploy.sh
+
+check:
+  extends: .check_template
+  parallel:
+    matrix:
+      - NODE: [debian12, debian10, ubuntu1604, ubuntu1804, ubuntu2004]
+  image: registry.gitlab.inria.fr/starpu/starpu-docker/ci-${NODE}
+  tags: ['ci.inria.fr', 'linux', 'large']
 
 check_mpich:
   extends: .check_template
-  tags:
-    - starpu
-    - ubuntu1804
+  image: registry.gitlab.inria.fr/starpu/starpu-docker/ci-ubuntu1804
+  tags: ['ci.inria.fr', 'linux', 'large']
   parallel:
     matrix:
       - SCRIPT: [./contrib/gitlab/mpich.sh, ./contrib/gitlab/mpich_struct.sh]
@@ -78,18 +86,11 @@ check_mpich:
 
 check_simgrid:
   extends: .check_template
-  tags:
-    - starpu
-    - debian10
+  image: registry.gitlab.inria.fr/starpu/starpu-docker/ci-debian10
+  tags: ['ci.inria.fr', 'linux', 'large']
   script:
     - ./contrib/gitlab/simgrid.sh
 
-#check_macosx:
-#  extends: .check_template
-#  tags : ["macosx"]
-#  script:
-#    - STARPU_USER_CONFIGURE_OPTIONS=--disable-mpi ./contrib/gitlab/deploy.sh
-
 .analyze_template:
   extends: .main_template
   stage: analyze
diff --git a/contrib/gitlab/mpich.sh b/contrib/gitlab/mpich.sh
index a70c4851be..11d9d46b50 100755
--- a/contrib/gitlab/mpich.sh
+++ b/contrib/gitlab/mpich.sh
@@ -17,5 +17,5 @@
 
 export STARPU_MICROBENCHS_DISABLED=1
 export STARPU_CHECK_DIRS=mpi
-export STARPU_USER_CONFIGURE_OPTIONS="--with-mpicc=/usr/bin/mpicc.mpich --with-mpiexec=/usr/bin/mpiexec.mpich --with-mpicxx=/usr/bin/mpicxx.mpich --with-mpifort=/usr/bin/mpifort.mpich"
+export STARPU_USER_CONFIGURE_OPTIONS="--disable-socl --with-mpicc=/usr/bin/mpicc.mpich --with-mpiexec=/usr/bin/mpiexec.mpich --with-mpicxx=/usr/bin/mpicxx.mpich --with-mpifort=/usr/bin/mpifort.mpich"
 ./contrib/ci.inria.fr/job-1-check.sh