diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5b5b10..4768692 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,5 +16,6 @@ build:
   before_script:
     - echo "$ZEVARYX_REGISTRY_PASSWORD" | docker login -u "$ZEVARYX_REGISTRY_USERNAME" --password-stdin "$ZEVARYX_REGISTRY_URL"
   script:
-    - docker build -t $ZEVARYX_REGISTRY_URL/jarvis-bot:$CI_COMMIT_BRANCH .
-    - docker push $ZEVARYX_REGISTRY_URL/jarvis-bot:$CI_COMMIT_BRANCH
+    - if [ "$CI_COMMIT_BRANCH" == "main" ]; then TAG="stable"; elif [ "$CI_COMMIT_BRANCH" == "dev" ]; then TAG="latest"; else TAG="${CI_COMMIT_BRANCH}"; fi
+    - docker build -t $ZEVARYX_REGISTRY_URL/jarvis-bot:$TAG .
+    - docker push $ZEVARYX_REGISTRY_URL/jarvis-bot:$TAG