diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a9099e429..751191254 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,12 +86,12 @@ jobs:
           build-args: ${{ matrix.build-args }}
           context: ${{ matrix.context }}/
           cache-from: |
-            type=registry,ref=${{ steps.login.outputs.registry }}/firezone/${{ matrix.image_name }}-buildcache:${{ env.CACHE_TAG }}
-            type=registry,ref=${{ steps.login.outputs.registry }}/firezone/${{ matrix.image_name }}-buildcache:main
+            type=registry,ref=${{ steps.login.outputs.registry }}/firezone/cache/${{ matrix.image_name }}:${{ env.CACHE_TAG }}
+            type=registry,ref=${{ steps.login.outputs.registry }}/firezone/cache/${{ matrix.image_name }}:main
           # This will write the cache on main even if integration tests fail,
           # but it'll just be corrected on the next successful build.
           cache-to: >-
-            type=registry,ref=${{ steps.login.outputs.registry }}/firezone/${{ matrix.image_name }}-buildcache:${{ env.CACHE_TAG }}
+            type=registry,ref=${{ steps.login.outputs.registry }}/firezone/cache/${{ matrix.image_name }}:${{ env.CACHE_TAG }}
           file: ${{ matrix.context }}/Dockerfile
           push: true
           target: ${{ matrix.target }}
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
index 93156f3d7..013c9825f 100644
--- a/.github/workflows/elixir.yml
+++ b/.github/workflows/elixir.yml
@@ -390,11 +390,11 @@ jobs:
       MIX_ENV: test
       POSTGRES_HOST: localhost
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      MIX_TEST_PARTITIONS: 4
+      MIX_TEST_PARTITIONS: 1
     strategy:
       fail-fast: false
       matrix:
-        MIX_TEST_PARTITION: [1, 2, 3, 4]
+        MIX_TEST_PARTITION: [1]
     services:
       postgres:
         image: postgres:16
diff --git a/docker-compose.yml b/docker-compose.yml
index 711827d42..bea33addb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -53,7 +53,7 @@ services:
     build:
       context: elixir
       cache_from:
-        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/web-buildcache:main
+        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/web:main
       args:
         APPLICATION_NAME: web
     image: us-east1-docker.pkg.dev/firezone-staging/firezone/web
@@ -120,7 +120,7 @@ services:
       context: rust
       dockerfile: Dockerfile
       cache_from:
-        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/client-buildcache:main
+        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/client:main
       args:
         PACKAGE: firezone-headless-client
     image: us-east1-docker.pkg.dev/firezone-staging/firezone/client
@@ -156,7 +156,7 @@ services:
       context: rust
       dockerfile: Dockerfile
       cache_from:
-        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/gateway-buildcache:main
+        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/gateway:main
       args:
         PACKAGE: firezone-gateway
     image: us-east1-docker.pkg.dev/firezone-staging/firezone/gateway
@@ -207,7 +207,7 @@ services:
       context: rust
       dockerfile: Dockerfile
       cache_from:
-        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/relay-buildcache:main
+        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/relay:main
       args:
         PACKAGE: relay
     image: us-east1-docker.pkg.dev/firezone-staging/firezone/relay
@@ -235,7 +235,7 @@ services:
     build:
       context: elixir
       cache_from:
-        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/api-buildcache:main
+        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/api:main
       args:
         APPLICATION_NAME: api
     image: us-east1-docker.pkg.dev/firezone-staging/firezone/api
@@ -306,7 +306,7 @@ services:
       context: elixir
       target: builder
       cache_from:
-        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/elixir-buildcache:main
+        - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/elixir:main
       args:
         APPLICATION_NAME: api
     image: us-east1-docker.pkg.dev/firezone-staging/firezone/elixir