diff --git a/.dockerignore b/.dockerignore
index cfecf3aa1ec3fe60c5e8a78b47b834241ef4a85a..bc6c2b61bc74a546a57ae2cd93563a04c1b029a3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,3 @@
 # .git
 Tests/Data
 _out/images
-ThirdParty/container-maker
diff --git a/.gitmodules b/.gitmodules
index 6333c7e38256c4ac29bb12cb33e6a56f532759e8..854c0f5d668475d7acf3e23fabb419d8ff882453 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "ThirdParty/container-maker"]
-	path = ThirdParty/container-maker
-	url = https://gitlab.opengeosys.org/ogs/container-maker.git
 [submodule "ThirdParty/ogs6py"]
 	path = ThirdParty/ogs6py
 	url = https://github.com/joergbuchwald/ogs6py.git
diff --git a/Applications/InSituLib/README.md b/Applications/InSituLib/README.md
index 9d335dd2f4d8815aefc18600e432c6b7ea143181..e8347a920dfe5181ee54f7231d44910e3fd91b90 100644
--- a/Applications/InSituLib/README.md
+++ b/Applications/InSituLib/README.md
@@ -22,12 +22,6 @@ cmake -DCMAKE_BUILD_TYPE=Release -DOGS_USE_INSITU=ON \
   -DOGS_BUILD_PROCESSES=SteadyStateDiffusion ../ogs
 ```
 
-**OR:** Build with [ogs-container-maker](https://github.com/ufz/ogs-container-maker):
-
-```bash
-ogscm compiler.py ogs.py --cmake_args ' -DOGS_BUILD_PROCESSES=SteadyStateDiffusion' --insitu -B -C -R
-```
-
 ### Run benchmark
 
 ```bash
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
deleted file mode 160000
index ca9223670c32601af2945be988813c47b7fbdcd6..0000000000000000000000000000000000000000
--- a/ThirdParty/container-maker
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca9223670c32601af2945be988813c47b7fbdcd6
diff --git a/scripts/ci/extends/container-maker-setup.yml b/scripts/ci/extends/container-maker-setup.yml
deleted file mode 100644
index 61d7a41a16fe8e3a4d49a19a36afeeef652219f5..0000000000000000000000000000000000000000
--- a/scripts/ci/extends/container-maker-setup.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-.container-maker-setup:
-  before_script:
-    - git submodule update --init --force ThirdParty/container-maker
-    - cd ThirdParty/container-maker
-    - rm -rf _out .venv
-    - poetry install
diff --git a/scripts/ci/jobs/build-container.yml b/scripts/ci/jobs/build-container.yml
deleted file mode 100644
index 33825b75d23cf9310d9d86c248857e966cbe8616..0000000000000000000000000000000000000000
--- a/scripts/ci/jobs/build-container.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-build container:
-  stage: build
-  tags: [envinf, shell]
-  needs: [meta]
-  extends:
-    - .container-maker-setup
-  script:
-    # Test local dependency builds (--pm off)
-    - >
-      poetry run ogscm compiler.py mpi.py ogs.py -B --ogs ../..
-      --build_args ' --progress=plain'
-      --cvode --ccache --cpmcache --mfront
-      --pm off
-      --cmake_args ' -DOGS_BUILD_PROCESSES=SteadyStateDiffusion'
diff --git a/scripts/ci/pipelines/regular.yml b/scripts/ci/pipelines/regular.yml
index 6f37a4854754de62770f3b6a31a8bc695a83e93e..cfc7735b7c41f277f020032fc28a5e53c58c4e2a 100644
--- a/scripts/ci/pipelines/regular.yml
+++ b/scripts/ci/pipelines/regular.yml
@@ -7,7 +7,6 @@ include:
   - local: "/scripts/ci/pipelines/mac.yml"
   - local: "/scripts/ci/pipelines/win.yml"
   - local: "/scripts/ci/jobs/build-docs.yml"
-  - local: "/scripts/ci/jobs/build-container.yml"
   - local: "/scripts/ci/jobs/jupyter.yml"
   - local: "/scripts/ci/jobs/code-quality.yml"
   - local: "/scripts/ci/jobs/code-coverage.yml"
@@ -18,7 +17,6 @@ include:
   - local: "/scripts/ci/jobs/web-preview.yml"
   - local: "/scripts/ci/jobs/web-check.yml"
   - local: "/scripts/ci/jobs/web-deploy.yml"
-  - local: "/scripts/ci/jobs/container.yml"
   - local: "/scripts/ci/jobs/release.yml"
   - local: "/scripts/ci/jobs/package.yml"