diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b992407..07edec3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,11 +70,10 @@ docker-build:
   before_script:
     - docker info
   script:
-    - docker build -t centrum-api:latest -f Dockerfile .
+    - docker build -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:${CI_PIPELINE_IID} -f Dockerfile .
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
-    - docker tag centrum-api:latest $CI_REGISTRY_IMAGE:latest
-    - docker tag centrum-api:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
     - docker push $CI_REGISTRY_IMAGE:latest
+    - docker push $CI_REGISTRY_IMAGE:${CI_PIPELINE_IID}
 
 docker-deploy:
   stage: release
@@ -82,6 +81,6 @@ docker-deploy:
     - production
   script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
-    - docker compose pull
+    - docker compose pull -f deployment/docker-compose.yaml
     - docker compose -f deployment/docker-compose.yaml up -d
     - docker image prune -f -a