diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66e0591afc9bc50fa1883632274983e3a1d57e76..ef532d2a2ebc8e2a1a11be5b9703c1e0be400474 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,12 +14,10 @@ build_image:
   services:
   - docker:dind
   script:
-    - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG"
+    - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
   only:
     - tags
   tags:
     - docker
-
-# simple edit to trigger this old pipeline again
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index d5920cfb2c108f4757d2647c5e5f217887e92ff8..06daa7a1ee68a45f4f7f601c55c27a5055fce6d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,6 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update; \
    apt-get install -y curl apt-transport-https ca-certificates; \
-   apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D; \
-   echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" > /etc/apt/sources.list.d/docker.list; \
    apt-get update; \
-   apt-get install -y docker-engine python-pip git; \
+   apt-get install -y docker docker-compose git; \
    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN  pip install docker-compose
\ No newline at end of file