diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80a13137df642a85ce8b4c4f29fa61e7046efe8d..ecc25345ebdac4956b9b544676852011f74e7c73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,5 @@
 image: node
 
-variables:
-  DOCKER_HOST: tcp://docker:2375
-
-services:
-  - docker:dind
-
 stages:
   - build
   - test
@@ -36,6 +30,8 @@ build_war:
 build_debian_package:
   image: debian
   stage: build
+  only:
+    - tags
   tags:
      - privileged
   artifacts:
@@ -50,16 +46,17 @@ build_debian_package:
     - export DEBEMAIL="piotr.gawron@uni.lu"
     - ant debian-pkg
 
-test_debian_package:
+test_install_debian_package:
   image: debian
   stage: test
-
-  services:
-     - name: piotrgawron/debian-repo
-       alias: debian-repo
+  only:
+    - tags
 # we need to run it in privileged mode due to: https://stackoverflow.com/questions/29683231/tomcat7-fail-to-start-inside-ubuntu-docker-container
   tags:
      - privileged
+  services:
+     - name: piotrgawron/debian-repo
+       alias: debian-repo
   dependencies:
      - build_debian_package
   script: