diff --git a/Tests/Data/Mechanics/GuentherSalzer/model_uniaxial_test.prj b/Tests/Data/Mechanics/GuentherSalzer/model_uniaxial_test.prj
index 4e98fded0a4..cc9f93d608f 100644
--- a/Tests/Data/Mechanics/GuentherSalzer/model_uniaxial_test.prj
+++ b/Tests/Data/Mechanics/GuentherSalzer/model_uniaxial_test.prj
@@ -255,7 +255,7 @@
         <vtkdiff>
             <file>uniaxial_test_output_ts_199_t_199.000000.vtu</file>
             <field>displacement</field>
-            <absolute_tolerance>3e-14</absolute_tolerance>
+            <absolute_tolerance>9e-14</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <!--secondary field-->
diff --git a/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj b/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj
index 36cba58ee12..cfbb854081e 100644
--- a/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj
+++ b/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj
@@ -194,7 +194,7 @@
         <vtkdiff>
             <file>piston_ts_10_t_10.000000.vtu</file>
             <field>sigma</field>
-            <absolute_tolerance>2e-8</absolute_tolerance>
+            <absolute_tolerance>3e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
     </test_definition>
diff --git a/Tests/Data/Mechanics/Linear/square_1e2.prj b/Tests/Data/Mechanics/Linear/square_1e2.prj
index 4417afd6bd5..d65741583d3 100644
--- a/Tests/Data/Mechanics/Linear/square_1e2.prj
+++ b/Tests/Data/Mechanics/Linear/square_1e2.prj
@@ -170,7 +170,7 @@
         <vtkdiff>
             <file>square_1e2_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
-            <absolute_tolerance>1e-15</absolute_tolerance>
+            <absolute_tolerance>1.1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
     </test_definition>
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index d4a466c0fc2..36a44e36dbe 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit d4a466c0fc28e693c781e653a9234b838d342c80
+Subproject commit 36a44e36dbe82da8d7870e914a389057359a22a9
diff --git a/scripts/ci/jobs/ci_images.yml b/scripts/ci/jobs/ci_images.yml
index 66c57ee7bcf..dd766eb9941 100644
--- a/scripts/ci/jobs/ci_images.yml
+++ b/scripts/ci/jobs/ci_images.yml
@@ -43,28 +43,25 @@ ci_images:
     - !reference [.container-maker-setup, before_script]
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - poetry run ogscm compiler.py ogs.py --build --ogs off
-      --compiler_version 11
       --pm system --cvode --cppcheck --docs --gcovr --mfront --ccache
       --version_file ../../web/data/versions.json
       --tag $CONTAINER_GCC_IMAGE --upload
       --cpu-target $CPU_TARGET
       --packages build-essential
     - poetry run ogscm compiler.py ogs.py --build --ogs off
-      --compiler_version 11
       --cvode --cppcheck --docs --gcovr --gui --ccache
       --version_file ../../web/data/versions.json
       --tag $CONTAINER_GCC_GUI_IMAGE --upload
       --cpu-target $CPU_TARGET
       --packages build-essential
     - poetry run ogscm compiler.py mpi.py ogs.py --build --ogs off
-      --compiler_version 11
       --pm off --ccache
       --version_file ../../web/data/versions.json
       --tag $CONTAINER_GCC_PM_OFF_IMAGE --upload
       --cpu-target $CPU_TARGET
       --packages build-essential jq moreutils
     - poetry run ogscm compiler.py ogs.py --build --ogs off
-      --compiler clang --compiler_version 11 --ccache
+      --compiler clang --ccache
       --version_file ../../web/data/versions.json
       --tag $CONTAINER_CLANG_IMAGE --upload
       --cpu-target $CPU_TARGET