diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f3772f741..d17a5ac994 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 stages:
-- prepare
 - build
 
 variables:
@@ -9,24 +8,6 @@ variables:
   REACT_SDK_REPO: "https://gitlab-ci-token:$GL_BAYERN_REACT_SDK_TOKEN@gitlab.matrix.org/new-vector/dataport/bayern-react-sdk"
   REACT_SDK_BRANCH: "master"
 
-prepare-master:
-  variables:
-    SPECIAL_DOCKER_TAG: "$CI_REGISTRY_IMAGE:latest"
-  stage: prepare
-  script:
-  - echo "Set SPECIAL_DOCKER_TAG to $SPECIAL_DOCKER_TAG"
-  rules:
-  - if: $CI_COMMIT_BRANCH == "master" && $REACT_SDK_BRANCH == "master" && $JS_SDK_REF == "master"
-
-prepare-tags:
-  variables:
-    SPECIAL_DOCKER_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
-  stage: prepare
-  script:
-  - echo "Set SPECIAL_DOCKER_TAG to $SPECIAL_DOCKER_TAG"
-  rules:
-  - if: $CI_COMMIT_TAG
-
 docker-build:
   tags: ['shell']
   stage: build
@@ -40,6 +21,8 @@ docker-build:
   - "[[ $REACT_SDK_BRANCH == 'master' ]] && export REACT_SDK_SHA=master"
   - "[[ $CI_COMMIT_BRANCH != 'master' ]] && export ELEMENT_WEB_SHA=$(git rev-parse --short=12 HEAD)"
   - "[[ $CI_COMMIT_BRANCH == 'master' ]] && export ELEMENT_WEB_SHA=master"
+  - "[[ -v CI_COMMIT_TAG ]] && export SPECIAL_DOCKER_TAG=$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
+  - "[[ $CI_COMMIT_BRANCH == 'master' -a $REACT_SDK_BRANCH == 'master' -a $JS_SDK_REF == 'master' ]] && export SPECIAL_DOCKER_TAG=$CI_REGISTRY_IMAGE:latest"
   - '[[ -z $SPECIAL_DOCKER_TAG ]] && export DOCKER_TAG="$CI_REGISTRY_IMAGE:$ELEMENT_WEB_SHA-react-$REACT_SDK_SHA-js-$JS_SDK_SHA" || export DOCKER_TAG="$SPECIAL_DOCKER_TAG"'
   script:
   - echo "Docker tag will be $DOCKER_TAG"