diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6de61f1..b7cd25e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,9 +5,10 @@ stages:
 - build
 
 variables:
-  VERSION: php70
-  DOCKER_IMAGE: leenooks/ldap
+  VERSION: latest
+  CACHETAG: build
   DOCKER_REGISTRY: registry.leenooks.net
+  DOCKER_IMAGE: ${DOCKER_REGISTRY}/${CI_PROJECT_PATH}
   DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
 
 services:
@@ -25,6 +26,8 @@ test:
   - env|sort
   - docker build -t ${DOCKER_IMAGE}:${VERSION} .
   - docker images
+  - echo "CI_PROJECT_PATH ${CI_PROJECT_PATH} CI_COMMIT_TAG ${CI_COMMIT_TAG} CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}"
+  - echo "CI_REGISTRY ${CI_REGISTRY} CI_REGISTRY_IMAGE ${CI_REGISTRY_IMAGE} CI ${CI}"
   only:
   - debug
 
@@ -32,9 +35,10 @@ build:
   stage: build
   script:
   - chmod 500 init
-  - docker build -t ${DOCKER_IMAGE}:${VERSION} .
-  - docker tag ${DOCKER_IMAGE}:${VERSION} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
-  - docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
+  - docker pull ${DOCKER_IMAGE}:${CACHETAG}
+  - docker build --cache-from ${DOCKER_IMAGE}:${CACHETAG} -t ${DOCKER_IMAGE}:${VERSION} -t ${DOCKER_IMAGE}:${CACHETAG} .
+  - docker push ${DOCKER_IMAGE}:${VERSION}
+  - docker push ${DOCKER_IMAGE}:${CACHETAG}
   tags:
   - docker
   only: