diff --git a/apps/web/playwright.config.ts b/apps/web/playwright.config.ts
index b7a93b241..bbf0ec2a4 100644
--- a/apps/web/playwright.config.ts
+++ b/apps/web/playwright.config.ts
@@ -26,6 +26,9 @@ export default defineConfig({
           use: {
             ...devices["Desktop Chrome"],
             channel: process.env.E2E_BROWSER_CHANNEL || "msedge",
+            launchOptions: {
+              args: ["--disable-gpu", "--disable-software-rasterizer"],
+            },
           },
         },
         {
@@ -51,6 +54,9 @@ export default defineConfig({
           use: {
             ...devices["Desktop Chrome"],
             channel: process.env.E2E_BROWSER_CHANNEL || "msedge",
+            launchOptions: {
+              args: ["--disable-gpu", "--disable-software-rasterizer"],
+            },
           },
         },
       ],
diff --git a/scripts/build_release_images.sh b/scripts/build_release_images.sh
index 079333f59..e2199a0c3 100755
--- a/scripts/build_release_images.sh
+++ b/scripts/build_release_images.sh
@@ -63,8 +63,8 @@ BRANCH_NAME="${GITHUB_REF_NAME:-${CI_COMMIT_BRANCH:-unknown}}"
 if [ "$USE_CACHE" -eq 1 ]; then
   docker buildx build \
     --build-arg APP_VERSION="$VERSION" \
-    --cache-from "type=registry,ref=${CACHE_REGISTRY}/api-cache:${CACHE_TAG},ignore-error=true" \
-    --cache-to "type=registry,ref=${CACHE_REGISTRY}/api-cache:${CACHE_TAG},mode=max" \
+    --cache-from "type=registry,ref=${CACHE_REGISTRY}/api-cache:${CACHE_TAG_PRIMARY},ignore-error=true" \
+    --cache-to "type=registry,ref=${CACHE_REGISTRY}/api-cache:${CACHE_TAG_PRIMARY},mode=max" \
     -f infra/docker/api.Dockerfile \
     -t "$API_IMAGE" -t "$API_LATEST" \
     --load \
@@ -123,8 +123,8 @@ echo "=== Building Worker image ==="
 if [ "$USE_CACHE" -eq 1 ]; then
   docker buildx build \
     --build-arg APP_VERSION="$VERSION" \
-    --cache-from "type=registry,ref=${CACHE_REGISTRY}/worker-cache:${CACHE_TAG},ignore-error=true" \
-    --cache-to "type=registry,ref=${CACHE_REGISTRY}/worker-cache:${CACHE_TAG},mode=max" \
+    --cache-from "type=registry,ref=${CACHE_REGISTRY}/worker-cache:${CACHE_TAG_PRIMARY},ignore-error=true" \
+    --cache-to "type=registry,ref=${CACHE_REGISTRY}/worker-cache:${CACHE_TAG_PRIMARY},mode=max" \
     -f infra/docker/worker.Dockerfile \
     -t "$WORKER_IMAGE" -t "$WORKER_LATEST" \
     --load \
@@ -152,8 +152,8 @@ test -f apps/web/dist/index.html
 
 if [ "$USE_CACHE" -eq 1 ]; then
   docker buildx build \
-    --cache-from "type=registry,ref=${CACHE_REGISTRY}/web-cache:${CACHE_TAG},ignore-error=true" \
-    --cache-to "type=registry,ref=${CACHE_REGISTRY}/web-cache:${CACHE_TAG},mode=max" \
+    --cache-from "type=registry,ref=${CACHE_REGISTRY}/web-cache:${CACHE_TAG_PRIMARY},ignore-error=true" \
+    --cache-to "type=registry,ref=${CACHE_REGISTRY}/web-cache:${CACHE_TAG_PRIMARY},mode=max" \
     -f infra/docker/web-artifact.Dockerfile \
     --build-arg "NGINX_CONF=$NGINX_CONF_FILE" \
     -t "$WEB_IMAGE" \