diff --git a/.dockerignore b/.dockerignore
index 59070d1dcb64945e764a32f7ff041d3e90cfbd7a..472cdd2e7ac34210f3ac67d8f157dc495e8f33bf 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,2 @@
-.git
+# .git
 Tests/Data
diff --git a/.gitignore b/.gitignore
index 14fb1e695e364702b99d6a0fc5ed83a478481f1d..56bd57de1b567ef744b61a37daa70fa67e479763 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.bak*
-build*/
+/build*/
 *.sw[op]
 tags
 .ExternalData_*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0b49f06d8444289930493b70ce4aba5ea9bbc00..62ca9abfafb5250d7b1c2da41be3b9f8fdff0fb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,18 @@
-image: alpine:3.4
+variables:
+  GIT_STRATEGY: fetch
+  OPENMPI_VERSIONS: 'off 2.1.6 3.1.4 4.0.1'
 
-before_script:
-  - apk update && apk add openssl
-  - wget https://github.com/spf13/hugo/releases/download/v0.18.1/hugo_0.18.1_Linux-64bit.tar.gz
-  - tar xf hugo_0.18.1_Linux-64bit.tar.gz && cp ./hugo_0.18.1_linux_amd64/hugo_0.18.1_linux_amd64 /usr/bin/hugo
-  - hugo version
-
-pages:
+build-container:
+  tags:
+    - docker-shell
+  stage: build
   script:
-  - cd web
-  - (cd import; python import.py)
-  - gulp build
-  - hugo
+    - git submodule update --init ThirdParty/container-maker
+    - virtualenv .venv
+    - source .venv/bin/activate
+    - pip install -r ThirdParty/container-maker/requirements.txt
+    - export PYTHONPATH="${PYTHONPATH}:${PWD}/ThirdParty/container-maker"
+    - python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs . --pm system --cvode --ompi $OPENMPI_VERSIONS
   artifacts:
     paths:
-    - web/public
-  only:
-  - web-hugo
+      - _out/images/*.sif
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index b673ba0a252264ea37e7ca60784bdfe558e57e3b..8701618b2dc6745a603c2bf147c61d75e1268e42 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit b673ba0a252264ea37e7ca60784bdfe558e57e3b
+Subproject commit 8701618b2dc6745a603c2bf147c61d75e1268e42