diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7ca286d7..9ad2010fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,9 +226,6 @@ python_e2e_sandbox_test:
   extends: .e2e_job_rules
   stage: test
   rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_BRANCH == "main"
     - when: never
   services:
     - docker:24-dind
@@ -258,6 +255,7 @@ python_e2e_sandbox_test:
 # =============================================================================
 publish_main_artifacts:
   stage: publish
+  timeout: 2h
   services:
     - docker:24-dind
   tags:
@@ -289,6 +287,7 @@ publish_main_artifacts:
 
 publish_tag_artifacts:
   stage: release
+  timeout: 2h
   services:
     - docker:24-dind
   tags:
diff --git a/build/scripts/docker-publish-multiarch.sh b/build/scripts/docker-publish-multiarch.sh
index a8c58ab0c..77ab95bb6 100755
--- a/build/scripts/docker-publish-multiarch.sh
+++ b/build/scripts/docker-publish-multiarch.sh
@@ -129,8 +129,8 @@ for component in sandbox server; do
     --platform "${PLATFORMS}" \
     -f "${DOCKERFILE}" \
     -t "${FULL_IMAGE}:${IMAGE_TAG}" \
-    --cache-from "type=registry,ref=${FULL_IMAGE}:latest" \
-    --cache-to "type=inline" \
+    --cache-from "type=registry,ref=${FULL_IMAGE}:buildcache" \
+    --cache-to "type=registry,ref=${FULL_IMAGE}:buildcache,mode=max" \
     ${EXTRA_BUILD_FLAGS} \
     ${BUILD_ARGS} \
     --push \
@@ -157,8 +157,8 @@ docker buildx build \
   -f deploy/docker/Dockerfile.cluster \
   -t "${CLUSTER_IMAGE}:${IMAGE_TAG}" \
   --build-arg K3S_VERSION=${K3S_VERSION} \
-  --cache-from "type=registry,ref=${CLUSTER_IMAGE}:latest" \
-  --cache-to "type=inline" \
+  --cache-from "type=registry,ref=${CLUSTER_IMAGE}:buildcache" \
+  --cache-to "type=registry,ref=${CLUSTER_IMAGE}:buildcache,mode=max" \
   ${EXTRA_BUILD_FLAGS} \
   --push \
   .