diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index b485565c..21e8c2ee 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -2,7 +2,7 @@ name: Build and Test Reporting App
 
 on:
   push:
-    branches: [develop, main, feat/37-client-docker-file]
+    branches: [develop, main]
   pull_request:
     branches: [develop, main]
   workflow_dispatch:
@@ -38,7 +38,7 @@ jobs:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-client-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-client
+            ${{ runner.os }}-buildx-client-
       - name: Build image
         uses: docker/build-push-action@v5
         with:
@@ -48,5 +48,6 @@ jobs:
           file: client/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha
\ No newline at end of file
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+