diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b74c9b..db30fb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,22 +13,20 @@ stages:
 .build_image: &build_image
   stage: build
   script:
-  - docker build -f Dockerfile -t gitlab.rezometz.org:5678/klafyvel/klafirc:$CI_COMMIT_SHA .
+  - docker build -f Dockerfile -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA .
 
 build_image_test:
   <<: *build_image
   stage: build
   except:
   - master
-  after_script: 
-  - "echo test: $CI_REGISTRY_IMAGE"
 
 build_image_prod:
   <<: *build_image
   stage: build
   after_script:
-  - docker tag gitlab.rezometz.org:5678/klafyvel/klafirc:$CI_COMMIT_SHA gitlab.rezometz.org:5678/klafyvel/klafirc:latest
-  - docker push gitlab.rezometz.org:5678/klafyvel/klafirc:latest
+  - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
+  - docker push $CI_REGISTRY_IMAGE:latest
   only:
   - master