diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edf99a6..482bf18 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,11 +49,13 @@ Docker Build:
   stage: docker
   needs:
     - Gradle Build
+  variables:
+    GIT_STRATEGY: none
 
   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="$CI_COMMIT_SHORT_SHA"
+    - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
 
   script:
     - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
@@ -70,7 +72,7 @@ Docker Build:
 
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
-    - export BASE_TAG="$CI_COMMIT_SHORT_SHA"
+    - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
 
   script:
     - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
diff --git a/Dockerfile b/Dockerfile
index 7047530..ff08f12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:15
+FROM adoptopenjdk:17
 
 WORKDIR /mangahome
 ADD /build/libs/mangadex_at_home.jar /mangahome/mangadex_at_home.jar