diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 4adc2e1845d38d05c1eefaf422ba431d90dc6002..4464d94a92d0738c26478a6292b26d6df1bb3567 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 4adc2e1845d38d05c1eefaf422ba431d90dc6002
+Subproject commit 4464d94a92d0738c26478a6292b26d6df1bb3567
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index b718da33ac6216312463f956c578fc6bc070e529..042b24dc806481024f3dc9cba957ac3d6b1a0a48 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -10,13 +10,13 @@ build container images:
   extends: .container-maker-setup
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - poetry run ogscm --build --ogs off
+    - poetry run ogscm compiler.py ogs.py --build --ogs off
       --pm system --cvode --cppcheck --docs --gcovr --tfel --ccache
       --tag $CONTAINER_GCC_IMAGE --upload
-    - poetry run ogscm --build --ogs off
+    - poetry run ogscm compiler.py ogs.py --build --ogs off
       --pm system --cvode --cppcheck --docs --gcovr --gui --ccache
       --tag $CONTAINER_GCC_GUI_IMAGE --upload
-    - poetry run ogscm --build --ogs off
+    - poetry run ogscm compiler.py ogs.py --build --ogs off
       --compiler clang --compiler_version 9 --ccache
       --tag $CONTAINER_CLANG_IMAGE --upload
 
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
index e32a688b6de2e2fca3531dbc9dae93012f6c6a69..9db8c4214c494c2f0d69c2ebdadeb5ebef30b336 100644
--- a/scripts/ci/jobs/container.yml
+++ b/scripts/ci/jobs/container.yml
@@ -9,18 +9,18 @@ container:
     - .container-maker-setup
   script:
     - >
-      poetry run ogscm -B -C -R --ogs ../..
+      poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --pm system --cvode --ccache
       --cmake_args ' -DBUILD_TESTING=OFF -DOGS_BUILD_UTILS=ON'
     - >
-      poetry run ogscm -B -C -R --ogs ../..
+      poetry run ogscm compiler.py mpi.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --pm system --cvode --ccache
       --cmake_args ' -DBUILD_TESTING=OFF'
-      --ompi 4.0.5 --mpi_benchmarks
+      --base_image 'centos:8' --ompi 4.0.5 --mpi_benchmarks
     - >
-      poetry run ogscm -B -C -R --ogs ../..
+      poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --pm system --cvode --ccache
       --cmake_args ' -DBUILD_TESTING=OFF'