diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3fe8e6..95ce5ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,26 +4,26 @@ stages:
 - test
 - build
 
-services:
-- registry.leenooks.net/leenooks/ci-docker:dind
-
 variables:
   VERSION: latest
-  DOCKER_HOST: tcp://registry.leenooks.net-leenooks-ci-docker:2375
+  DOCKER_IMAGE: leenooks/base
+  DOCKER_REGISTRY: registry.leenooks.net
+  DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
+
+services:
+- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind
 
 before_script:
-- cat /etc/hosts
-- env|sort
-- test -n "${REGISTRY}" # Needs to be set in project
-- test -n "${IMAGE}"    # Needs to be set in project
 - docker info
 - docker version
-- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${REGISTRY}
+- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${DOCKER_REGISTRY}
 
 test:
   stage: test
   script:
-  - docker build -t ${IMAGE}:${VERSION} .
+  - cat /etc/hosts
+  - env|sort
+  - docker build -t ${DOCKER_IMAGE}:${VERSION} .
   - docker images
   only:
   - debug
@@ -31,9 +31,9 @@ test:
 build:
   stage: build
   script:
-  - docker build -t ${IMAGE}:${VERSION} .
-  - docker tag ${IMAGE}:${VERSION} ${REGISTRY}/${IMAGE}:${VERSION}
-  - docker push ${REGISTRY}/${IMAGE}:${VERSION}
+  - docker build -t ${DOCKER_IMAGE}:${VERSION} .
+  - docker tag ${DOCKER_IMAGE}:${VERSION} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
+  - docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
   tags:
   - docker
   only: