diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
index f140629ad..69e9a6da1 100644
--- a/.github/workflows/elixir.yml
+++ b/.github/workflows/elixir.yml
@@ -458,8 +458,8 @@ jobs:
             APPLICATION_NAME=${{ env.APPLICATION_NAME }}
             APPLICATION_VERSION=0.0.0-sha.${{ github.sha }}
           context: elixir/
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ env.APPLICATION_NAME }}-${{ github.sha }}
+          cache-to: type=gha,mode=max,scope=${{ env.APPLICATION_NAME }}-${{ github.sha }}
           file: elixir/Dockerfile
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.GCLOUD_PROJECT }}/firezone/${{ env.APPLICATION_NAME }}:${{ env.TAG }} , ${{ env.REGISTRY }}/${{ env.GCLOUD_PROJECT }}/firezone/${{ env.APPLICATION_NAME }}:${{ github.sha }}
@@ -518,8 +518,8 @@ jobs:
             APPLICATION_NAME=${{ env.APPLICATION_NAME }}
             APPLICATION_VERSION=0.0.0-sha.${{ github.sha }}
           context: elixir/
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ env.APPLICATION_NAME }}-${{ github.sha }}
+          cache-to: type=gha,mode=max,scope=${{ env.APPLICATION_NAME }}-${{ github.sha }}
           file: elixir/Dockerfile
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.GCLOUD_PROJECT }}/firezone/${{ env.APPLICATION_NAME }}:${{ env.TAG }} , ${{ env.REGISTRY }}/${{ env.GCLOUD_PROJECT }}/firezone/${{ env.APPLICATION_NAME }}:${{ github.sha }}
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 442bec88e..8ed0b57e1 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -16,6 +16,13 @@ jobs:
       - name: Build images
         uses: docker/bake-action@v3
         with:
+          set: |
+            elixir.cache-from=scope=elixir,type=gha
+            elixir.cache-to=scope=elixir,type=gha,mode=max
+            api.cache-from=scope=api,type=gha
+            api.cache-to=scope=api,type=gha,mode=max
+            web.cache-from=scope=web,type=gha
+            web.cache-to=scope=web,type=gha,mode=max
           files: docker-compose.yml
           push: false
       - name: Seed database
diff --git a/elixir/Dockerfile b/elixir/Dockerfile
index b067f0717..def4c4f10 100644
--- a/elixir/Dockerfile
+++ b/elixir/Dockerfile
@@ -39,8 +39,7 @@ ARG APPLICATION_VERSION=0.0.0-dev.docker
 # Install pipeline and compile assets for Web app
 RUN cd apps/web \
     && mix assets.setup \
-    && mix assets.deploy \
-    && cd ../../
+    && mix assets.deploy
 
 # Compile the release
 RUN mix compile