diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab08d54..52b46ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,25 @@
-image: docker:latest
+image: leenooks/ci-docker:latest
+
+stages:
+- build
 
 services:
-- docker:dind
+- leenooks/ci-docker:dind
+
+variables:
+  REGISTRY: registry.leenooks.net
+  IMAGE: leenooks/base
 
 before_script:
 - docker info
-- df
+- docker version
+- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${REGISTRY}
 
 build:
   stage: build
   script:
-  - docker build -t registry.leenooks.net/leenooks/base .
-  - docker push registry.leenooks.net/leenooks/base
+  - docker build -t ${IMAGE} .
+  - docker tag ${IMAGE} ${REGISTRY}/${IMAGE}
+  - docker push ${REGISTRY}/${IMAGE}
+  tags:
+  - docker