diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml
index 8b2ffe2..dc0f6a7 100644
--- a/.github/workflows/build_image.yml
+++ b/.github/workflows/build_image.yml
@@ -69,6 +69,7 @@ jobs:
         run: echo ${{ steps.prep.outputs.tags }}
       - name: Build and push
         id: docker_build
+        timeout-minutes: 900
         uses: docker/build-push-action@v2
         with:
           builder: ${{ steps.buildx.outputs.name }}
@@ -79,3 +80,5 @@ jobs:
           tags: ${{ steps.prep.outputs.tags }}
           build-args: ${{ steps.prep.outputs.args }}
           labels: ${{ steps.prep.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max