diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52b46ca..4294502 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,37 @@
 image: leenooks/ci-docker:latest
 
 stages:
+- test
 - build
 
 services:
 - leenooks/ci-docker:dind
 
 variables:
-  REGISTRY: registry.leenooks.net
-  IMAGE: leenooks/base
+  VERSION: latest
 
 before_script:
+- 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}
 
+test:
+  stage: test
+  script:
+  - docker build -t ${IMAGE}:${VERSION} .
+  - docker images
+  only:
+  - debug
+
 build:
   stage: build
   script:
-  - docker build -t ${IMAGE} .
-  - docker tag ${IMAGE} ${REGISTRY}/${IMAGE}
-  - docker push ${REGISTRY}/${IMAGE}
+  - docker build -t ${IMAGE}:${VERSION} .
+  - docker tag ${IMAGE}:${VERSION} ${REGISTRY}/${IMAGE}:${VERSION}
+  - docker push ${REGISTRY}/${IMAGE}:${VERSION}
   tags:
   - docker
+  only:
+  - master