diff --git a/.gitea/workflows/build-arch-builder.yaml b/.gitea/workflows/build-arch-builder.yaml
index 77fe6e3..39ab099 100644
--- a/.gitea/workflows/build-arch-builder.yaml
+++ b/.gitea/workflows/build-arch-builder.yaml
@@ -31,7 +31,8 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:base"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:base-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:base-buildx          
           target: base
       -
         name: Build and push arch-builder kernel images
@@ -43,7 +44,8 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:kernel"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:kernel-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:kernel-buildx          
           target: kernel
       -
         name: Build and push arch-builder rust images
@@ -55,7 +57,8 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:rust"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:rust-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:rust-buildx          
           target: rust
       -
         name: Build and push arch-builder rust full images
@@ -67,7 +70,8 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:rust-full"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-buildx          
           target: rust-full
       -
         name: Build and push arch-builder gitea_act_runner images
@@ -79,6 +83,6 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx
-          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx          
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:gitea-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:gitea-buildx          
           target: gitea_act_runner
diff --git a/arch-builder/Dockerfile b/arch-builder/Dockerfile
index 6741b45..33ac611 100644
--- a/arch-builder/Dockerfile
+++ b/arch-builder/Dockerfile
@@ -114,6 +114,7 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed g
 RUN --mount=type=bind,source=woggioni.net.ca.pem,target=/root.pem trust anchor root.pem
 RUN usermod -a luser -G docker
 USER luser
+WORKDIR /home/luser
 RUN rustup toolchain install stable-x86_64-unknown-linux-gnu --profile minimal
 RUN rustup component add rustfmt
 RUN rustup target add \
@@ -125,7 +126,6 @@ RUN rustup target add \
     aarch64-unknown-linux-gnu \
     wasm32-unknown-unknown \
     wasm32-wasip2
-RUN npm install wrangler
+RUN npm install -D wrangler
 ENV PATH="/home/luser/.local/bin:/home/luser/.cargo/bin:${PATH}"
-WORKDIR /home/luser
 CMD ["/usr/lib/gitea/act_runner/act_runner", "daemon", "--config", "/var/lib/gitea/act_runner.yaml"]