diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3efa7fa604f075e856dd69438be220faf3beec8..4dc0b6cd92c9b5410723c8bafa79ef8ab632886d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,19 @@ stages:
   - test
   - release
 
-build_docker:
+build_docker_from_scratch:
+  only:
+    - schedules
+  image: docker:stable
+  stage: build_docker
+  script:
+    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.mpcdf.mpg.de
+    - docker build -t $CONTAINER_TEST_IMAGE --no-cache .
+    - docker push $CONTAINER_TEST_IMAGE
+
+build_docker_from_cache:
+  except:
+    - schedules
   image: docker:stable
   stage: build_docker
   script: