diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36985d594d45cc89c604b5d2b1f7ddd9bf60ff97..d36458971660c0b5ab354ad1e4b03068fb46ebea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,3 @@
-stages:
-  - test
-  - build
-  - deploy
-
 include:
     - local: "/ci/general.yml"
     - local: "/ci/test.yml"
diff --git a/ci/build_docker.yml b/ci/build_docker.yml
index 98de0c16b367156eba55691823aa46dcaf9b45dd..92a1572c6ac4d1878110500f458262a6a7c5bdf4 100644
--- a/ci/build_docker.yml
+++ b/ci/build_docker.yml
@@ -1,5 +1,3 @@
-image: registry.edugit.org/teckids/team-sysadmin/docker-images/python-pimped:master
-
 build_docker:
   stage: build
   image:
diff --git a/ci/general.yml b/ci/general.yml
index d41c22e721d229dd99e445af4a549e421d817754..58891983dbeda6b9c8f49dc07e490a021a4c31dd 100644
--- a/ci/general.yml
+++ b/ci/general.yml
@@ -1,3 +1,10 @@
+image: registry.edugit.org/teckids/team-sysadmin/docker-images/python-pimped:latest
+
+stages:
+  - test
+  - build
+  - deploy
+
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"