diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 10c99f0fbab844930de4d15a5596056095f10b90..cd0784969daf82732c5440206ca1b81a95084af0 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 10c99f0fbab844930de4d15a5596056095f10b90
+Subproject commit cd0784969daf82732c5440206ca1b81a95084af0
diff --git a/scripts/ci/extends/template-build-linux.yml b/scripts/ci/extends/template-build-linux.yml
index 86fc1d60463ca914913f05947aa2c109437d7673..aae9754ffde9bb2bda628ddf2eb9c070b0249fa4 100644
--- a/scripts/ci/extends/template-build-linux.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -1,7 +1,5 @@
 .template-build-linux:
   stage: build
-  tags:
-    - docker
   extends:
     - .test-artifacts
   dependencies: [meta, meta_container]
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index b309cd69725ab6a32f0f44067d7a7352ebb291ee..9a710967e36c8f6d62f420d7de611073807e7fc0 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -1,11 +1,8 @@
 build gui linux:
   extends: .template-build-linux
   stage: build
-  image:
-    name: $CONTAINER_GCC_GUI_IMAGE
-  tags:
-    - envinf1
-    - docker
+  image: $CONTAINER_GCC_GUI_IMAGE
+  tags: [ envinf1 ]
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
     - changes:
diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml
index df835fd0902d8379e1f50b592bf710fba85823e3..974ef2fc3abb1d24f83c96fb1955785239cd63bb 100644
--- a/scripts/ci/jobs/build-linux.yml
+++ b/scripts/ci/jobs/build-linux.yml
@@ -1,8 +1,7 @@
 build linux:
+  image: $CONTAINER_GCC_IMAGE
   extends: .template-build-linux
-  tags:
-    - envinf1
-    - docker
+  tags: [ envinf1 ]
   timeout: 2h
   variables:
     BUILD_DIR: "build"
@@ -12,5 +11,3 @@ build linux:
       -DOGS_USE_CONAN=OFF
       -DOGS_USE_MFRONT=ON
       -DOGS_USE_PYTHON=ON
-  image:
-    name: $CONTAINER_GCC_IMAGE
diff --git a/scripts/ci/jobs/check-header.yml b/scripts/ci/jobs/check-header.yml
index bc15c3e225d29f275c7353e48b8d1407d6b21acb..fb3fa9dcb7222bb6e656838d4c26958d803097bd 100644
--- a/scripts/ci/jobs/check-header.yml
+++ b/scripts/ci/jobs/check-header.yml
@@ -1,16 +1,13 @@
 check header:
   stage: check
   allow_failure: true
-  tags:
-    - docker
   extends:
     - .rules-master-manual
   dependencies: [meta_container]
   variables:
     BUILD_DIR: "build-check-header"
     CMAKE_ARGS: "-DOGS_CHECK_HEADER_COMPILATION=ON -DOGS_BUILD_UTILS=ON -DOGS_BUILD_GUI=ON -DOGS_USE_PYTHON=ON -DBUILD_SHARED_LIBS=ON"
-  image:
-    name: $CONTAINER_GCC_GUI_IMAGE
+  image: $CONTAINER_GCC_GUI_IMAGE
   script:
     - mkdir -p $BUILD_DIR
     - cd $BUILD_DIR
diff --git a/scripts/ci/jobs/code-quality.yml b/scripts/ci/jobs/code-quality.yml
index 1c663903adf95f11ec4b65a197e174784ebd860c..704242fb6cfb6c6337451a6d8498b37d0eb7ea31 100644
--- a/scripts/ci/jobs/code-quality.yml
+++ b/scripts/ci/jobs/code-quality.yml
@@ -17,7 +17,7 @@ cppcheck:
 # Disabled, see !3053
 .code_quality:
   stage: check
-  tags: [docker, envinf1]
+  tags: [envinf1]
   needs: []
   rules:
   variables:
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
index 134c0dc1a5fc250861453455113e9a29ad603c95..e40e525d390e965b344fa62da6d3ecd2a12f36da 100644
--- a/scripts/ci/jobs/container.yml
+++ b/scripts/ci/jobs/container.yml
@@ -8,8 +8,17 @@ container:
   extends:
     - .container-maker-setup
   script:
-    - python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs . --pm system --cvode --build_args ' --progress=plain'
-    - python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs . --pm system --cvode --ompi 4.0.4 --base_image centos:8 --build_args ' --progress=plain'
+    - >
+      python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs .
+      --build_args ' --progress=plain'
+      --pm system --cvode --ccache
+      --cmake_args ' -DBUILD_TESTING=OFF'
+    - >
+      python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs .
+      --build_args '--progress=plain'
+      --pm system --cvode --ccache
+      --cmake_args ' -DBUILD_TESTING=OFF'
+      --ompi 4.0.4 --base_image centos:8
   artifacts:
     name: container
     paths:
diff --git a/scripts/ci/jobs/pre-commit.yml b/scripts/ci/jobs/pre-commit.yml
index 73d530dfea2ee4f70afcaac96bdebec02018073e..badb3eea0a86674bf7346593843c6ac4fdeae7c1 100644
--- a/scripts/ci/jobs/pre-commit.yml
+++ b/scripts/ci/jobs/pre-commit.yml
@@ -1,7 +1,6 @@
 pre commit:
   stage: preparation
-  image:
-    name: $PRECOMMIT_IMAGE
+  image: $PRECOMMIT_IMAGE
   dependencies: [meta_container]
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
diff --git a/scripts/ci/jobs/web.yml b/scripts/ci/jobs/web.yml
index 71f595fd33b53af5990f15ff81df4af9774d3956..196948fce325b500335b78523b85f1a03a33b18f 100644
--- a/scripts/ci/jobs/web.yml
+++ b/scripts/ci/jobs/web.yml
@@ -1,13 +1,11 @@
 web url checker:
   stage: check
   allow_failure: true
-  tags:
-    - docker
+  tags: [ docker ]
   extends:
     - .rules-manual
   dependencies: [meta_container]
-  image:
-    name: $WEB_IMAGE
+  image: $WEB_IMAGE
   script:
     - cd web
     - >
@@ -18,6 +16,7 @@ web url checker:
 
 preview web site:
   stage: build
+  tags: [ docker ]
   image: $WEB_IMAGE
   dependencies: [meta_container]
   script: