diff --git a/.dockerignore b/.dockerignore
index 52209531..7759d5dd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,6 @@
-docker/Dockerfile
+Dockerfile
 .dockerignore
 node_modules
-**/node_modules
 npm-debug.log
 README.md
 **/.next
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 767a9cde..d6de38fd 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,7 +11,6 @@ jobs:
     strategy:
       matrix:
         package: [web, workers, cli]
-        arch: [linux/amd64, linux/arm64]
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -36,11 +35,11 @@ jobs:
           build-args: SERVER_VERSION=nightly
           file: docker/Dockerfile
           target: ${{ matrix.package }}
-          platforms: ${{ matrix.arch }}
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ghcr.io/mohamedbassem/hoarder-${{ matrix.package }}:latest
-          cache-from: type=gha,scope=${{ matrix.package }}_${{ matrix.arch }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.package }}_${{ matrix.arch }}
+          cache-from: type=registry,ref=ghcr.io/mohamedbassem/hoarder-build-cache:${{ matrix.package }}
+          cache-to: type=registry,mode=max,ref=ghcr.io/mohamedbassem/hoarder-build-cache:${{ matrix.package }}
 
       - name: Build ${{ matrix.package }} (release)
         uses: docker/build-push-action@v5
@@ -50,8 +49,8 @@ jobs:
           build-args: SERVER_VERSION=${{ github.event.release.name }}
           file: docker/Dockerfile
           target: ${{ matrix.package }}
-          platforms: ${{ matrix.arch }}
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ghcr.io/mohamedbassem/hoarder-${{ matrix.package }}:${{ github.event.release.name }},ghcr.io/mohamedbassem/hoarder-${{ matrix.package }}:release
-          cache-from: type=gha,scope=${{ matrix.package }}_${{ matrix.arch }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.package }}_${{ matrix.arch }}
+          cache-from: type=registry,ref=ghcr.io/mohamedbassem/hoarder-build-cache:${{ matrix.package }}
+          cache-to: type=registry,mode=max,ref=ghcr.io/mohamedbassem/hoarder-build-cache:${{ matrix.package }}