diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c0b790af240f15b872913ebac6a89ee55e4e0fd..12273ddd78dce59d8e77dc852375225698446488 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ ubuntu:jammy-meson:docker-build:
     - lmap
     - cpu
   rules:
-    - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-jammy-meson\]/
+    - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-jammy-meson\]/ || $CI_COMMIT_MESSAGE =~ /\[docker-build-all\]/
       when: always
 
 ubuntu:nvidia-meson:docker-build:
@@ -54,7 +54,7 @@ ubuntu:nvidia-meson:docker-build:
     - lmap
     - cpu
   rules:
-    - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-nvidia\]/
+    - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-nvidia\]/ || $CI_COMMIT_MESSAGE =~ /\[docker-build-all\]/
       when: always
 
 mamba-meson:docker-build:
@@ -66,7 +66,7 @@ mamba-meson:docker-build:
      - lmap
      - cpu
    rules:
-     - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-mamba\]/
+     - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-mamba\]/ || $CI_COMMIT_MESSAGE =~ /\[docker-build-all\]/
        when: always
 
 ## -- hysop jobs --
diff --git a/ci/docker_images/ubuntu_jammy_meson/Dockerfile b/ci/docker_images/ubuntu_jammy_meson/Dockerfile
index e82ffee11f73cd8443d7484f13eaa04eac2d4c95..9c9729c6f6b53a68bf460774a7051b17501ba19d 100644
--- a/ci/docker_images/ubuntu_jammy_meson/Dockerfile
+++ b/ci/docker_images/ubuntu_jammy_meson/Dockerfile
@@ -260,7 +260,6 @@ ENV PYOPENCL_COMPILER_OUTPUT=1
 # january 2024: h5py   doesn't compile with cython==3.x.x!
 # january 2024: pyfftw doesn't compile with cython==3.x.x!
 RUN pip   install --upgrade cython==3.0.8
-RUN pip uninstall -y setuptools
 
 RUN pip install numpy==1.26.3
 
diff --git a/docs/hysop-doc b/docs/hysop-doc
index 608d0e5f37dba68086e534c78e2224d9916c0e35..3c3338e354c53b948bba7eb3e343fc475751698b 160000
--- a/docs/hysop-doc
+++ b/docs/hysop-doc
@@ -1 +1 @@
-Subproject commit 608d0e5f37dba68086e534c78e2224d9916c0e35
+Subproject commit 3c3338e354c53b948bba7eb3e343fc475751698b