diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4768692..4705ac4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,9 +13,21 @@ build:
   stage: build
   tags:
     - docker-build
-  before_script:
-    - echo "$ZEVARYX_REGISTRY_PASSWORD" | docker login -u "$ZEVARYX_REGISTRY_USERNAME" --password-stdin "$ZEVARYX_REGISTRY_URL"
   script:
+    - echo "$ZEVARYX_REGISTRY_PASSWORD" | docker login -u "$ZEVARYX_REGISTRY_USERNAME" --password-stdin "$ZEVARYX_REGISTRY_URL"
     - 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 build -t $ZEVARYX_REGISTRY_URL/jarvis-bot:$TAG -t zevaryx/jarvis:$TAG .
     - docker push $ZEVARYX_REGISTRY_URL/jarvis-bot:$TAG
+    - echo "$DOCKERHUB_REGISTRY_PASSWORD" | docker login -u "$DOCKERHUB_REGISTRY_USERNAME"
+    - docker push zevaryx/jarvis-bot:$TAG
+
+release:
+  stage: build
+  tags:
+    - docker-build
+  script:
+    - echo "$ZEVARYX_REGISTRY_PASSWORD" | docker login -u "$ZEVARYX_REGISTRY_USERNAME" --password-stdin "$ZEVARYX_REGISTRY_URL"
+    - docker build -t $ZEVARYX_REGISTRY_URL/jarvis-bot:$CI_COMMIT_TAG -t zevaryx/jarvis:$CI_COMMIT_TAG .
+    - docker push $ZEVARYX_REGISTRY_URL/jarvis-bot:$CI_COMMIT_TAG
+    - echo "$DOCKERHUB_REGISTRY_PASSWORD" | docker login -u "$DOCKERHUB_REGISTRY_USERNAME"
+    - docker push zevaryx/jarvis-bot:$CI_COMMIT_TAG