diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93a59d21613d4b9070838efc2263a7cf648e0335..9fb32cf5df7e9b0e0b109e32bafc6181e2426a9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,11 +17,17 @@ build_image:
     - master
   services:
     - docker:18.09.7-dind
+  variables:
+    DOCKERHUB_NAME: clarinpl/any2txt
   before_script:
     - ''
   script:
-    - docker build -t clarinpl/any2txt .
+    - docker build -t $DOCKERHUB_NAME .
     - echo $DOCKER_PASSWORD > pass.txt
     - cat pass.txt | docker login --username $DOCKER_USERNAME --password-stdin
     - rm pass.txt
-    - docker push clarinpl/any2txt
+    - docker push $DOCKERHUB_NAME
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker image tag $DOCKERHUB_NAME $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    - docker image tag $DOCKERHUB_NAME $CI_REGISTRY_IMAGE:latest
+    - docker push $CI_REGISTRY_IMAGE