diff --git a/.gitlab/docker-build.yml b/.gitlab/docker-build.yml
index 477e7ef3..297c2b20 100644
--- a/.gitlab/docker-build.yml
+++ b/.gitlab/docker-build.yml
@@ -92,16 +92,15 @@ docker-build-prod:
     - docker context create tls-environment
     - docker buildx create --name zedBuilder --use tls-environment
     - docker buildx build
-      --cache-from type=registry,ref="$CI_REGISTRY_IMAGE"
+      --cache-from type=registry,ref="$CI_REGISTRY_IMAGE:latest"
       --build-arg BUILDKIT_INLINE_CACHE=1
       --build-arg "BUILD_DATE=$(date +"%Y-%m-%dT%H:%M:%SZ")"
       --build-arg "BUILD_REF=${CI_COMMIT_SHA}"
       --build-arg "CRAFTY_VER=${VERSION}"
-      --tag "crafty_build"
-      --platform linux/arm64/v8,linux/amd64 .
-    - docker tag crafty_build:latest $CI_REGISTRY_IMAGE:latest
-    - docker tag crafty_build:latest $CI_REGISTRY_IMAGE:$VERSION
-    - docker push -a
+      --tag "$CI_REGISTRY_IMAGE:$VERSION"
+      --tag "$CI_REGISTRY_IMAGE:latest"
+      --platform linux/arm64/v8,linux/amd64
+      --push .
   after_script:
     - |
       docker buildx rm zedBuilder && echo "Successfully Stopped builder instance" || echo "Failed to stop builder instance."