diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29c0cfc..4df0a43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ stages:
 
 variables:
   VERSION: latest
+  CACHETAG: build
   DOCKER_IMAGE: graytech/otrs
   DOCKER_REGISTRY: registry.leenooks.net
   DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
@@ -32,10 +33,11 @@ test:
 build:
   stage: build
   script:
-  - docker build --cache-from ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:latest -t ${DOCKER_IMAGE}:${VERSION} -t ${DOCKER_IMAGE}:CI_BUILD .
+  - docker pull ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:latest
+  - docker build --cache-from ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:latest -t ${DOCKER_IMAGE}:${VERSION} -t ${DOCKER_IMAGE}:${CACHETAG} .
   - docker tag ${DOCKER_IMAGE}:${VERSION} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
   - docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
-  - docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:CI_BUILD
+  - docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${CACHETAG}
   tags:
   - docker
   only: