diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3586600..db30fb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,15 +2,37 @@ image: docker
 services:
 - docker:dind
 
+before_script:
+- apk add --no-cache curl
+- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab.rezometz.org:5678
+
 stages:
 - build
+- deploy
 
-build_job:
+.build_image: &build_image
   stage: build
   script:
-  - apk add --no-cache curl
-  - docker build -f Dockerfile -t gitlab.rezometz.org:5678/klafyvel/klafirc .
-  - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab.rezometz.org:5678
-  - docker push gitlab.rezometz.org:5678/klafyvel/klafirc:latest
-  - "curl -X POST lupercus.rez -d \"$API_VARS\" -H \"Content-Type: application/json\""
+  - docker build -f Dockerfile -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA .
 
+build_image_test:
+  <<: *build_image
+  stage: build
+  except:
+  - master
+
+build_image_prod:
+  <<: *build_image
+  stage: build
+  after_script:
+  - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
+  - docker push $CI_REGISTRY_IMAGE:latest
+  only:
+  - master
+
+deploy:
+  stage: deploy
+  script:
+  - "curl -X POST lupercus.rez -d \"$API_VARS\" -H \"Content-Type: application/json\""
+  only:
+  - master