diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bfcb87..17530ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,10 +16,10 @@ build:
   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 -t zevaryx/jarvis-bot:$TAG .
-    - docker push $ZEVARYX_REGISTRY_URL/jarvis-bot:$TAG
+    - docker build -t $ZEVARYX_REGISTRY_URL/$CI_PROJECT_NAME:$TAG -t zevaryx/$CI_PROJECT_NAME:$TAG .
+    - docker push $ZEVARYX_REGISTRY_URL/$CI_PROJECT_NAME:$TAG
     - echo "$DOCKERHUB_REGISTRY_PASSWORD" | docker login -u "$DOCKERHUB_REGISTRY_USERNAME" --password-stdin
-    - docker push zevaryx/jarvis-bot:$TAG
+    - docker push zevaryx/$CI_PROJECT_NAME:$TAG
 
 release:
   stage: build
@@ -29,7 +29,7 @@ release:
     - 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-bot:$CI_COMMIT_TAG .
-    - docker push $ZEVARYX_REGISTRY_URL/jarvis-bot:$CI_COMMIT_TAG
+    - docker build -t $ZEVARYX_REGISTRY_URL/$CI_PROJECT_NAME:$CI_COMMIT_TAG -t zevaryx/$CI_PROJECT_NAME:$CI_COMMIT_TAG .
+    - docker push $ZEVARYX_REGISTRY_URL/$CI_PROJECT_NAME:$CI_COMMIT_TAG
     - echo "$DOCKERHUB_REGISTRY_PASSWORD" | docker login -u "$DOCKERHUB_REGISTRY_USERNAME" --password-stdin
-    - docker push zevaryx/jarvis-bot:$CI_COMMIT_TAG
+    - docker push zevaryx/$CI_PROJECT_NAME:$CI_COMMIT_TAG