diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 007aff6..d325a75 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,13 +52,14 @@ Docker Build:
 
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
-    - export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
     - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
+    - export SHORT_TAG="$(echo $CI_COMMIT_TAG | cut -d "." -f1)"
 
   script:
-    - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
-    - docker build . -t $CI_REGISTRY_IMAGE:$BASE_TAG
-    - docker push $CI_REGISTRY_IMAGE:$BASE_TAG
+    - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
+    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG
+    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$SHORT_TAG
+    - docker push $CI_REGISTRY_IMAGE:$NEW_TAG
 
 .docker_push: &docker_push
   image: docker:20.10.8