diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88a3a85..59b639c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ build-binary:
   image:
     name: moby/buildkit:rootless
     entrypoint: [""]
+  timeout: 3 hours
   tags:
     - saas-linux-medium-amd64
   rules:
@@ -30,7 +31,7 @@ build-binary:
   variables:
     # Removes the need for privileged container access at the runner level
     BUILDKITD_FLAGS: "--oci-worker-no-process-sandbox"
-    CACHE_IMAGE: "$CI_REGISTRY_IMAGE/deploy-artifacts:cache"
+    CACHE_IMAGE: "$CI_REGISTRY_IMAGE/deploy-artifacts:cache-$CI_BRANCH"
   before_script:
     - mkdir -p ~/.docker
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > ~/.docker/config.json