diff --git a/.gitea/workflows/build-arch-builder.yaml b/.gitea/workflows/build-arch-builder.yaml
index 9e6f6a1..55816dd 100644
--- a/.gitea/workflows/build-arch-builder.yaml
+++ b/.gitea/workflows/build-arch-builder.yaml
@@ -73,20 +73,6 @@ jobs:
           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          
           target: rust-full
-      -
-        name: Build and push arch-builder rust full rootless images
-        uses: docker/build-push-action@v6
-        with:
-          context: "{{defaultContext}}:arch-builder"
-          platforms: linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/arch-builder:rust-full-rootless"
-            "gitea.woggioni.net/woggioni/arch-builder:latest"
-          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          
-          target: rust-full-rootless
       -
         name: Build and push arch-builder gitea_act_runner images
         uses: docker/build-push-action@v6
diff --git a/arch-builder/Dockerfile b/arch-builder/Dockerfile
index 48980d0..ae7243d 100644
--- a/arch-builder/Dockerfile
+++ b/arch-builder/Dockerfile
@@ -88,26 +88,29 @@ RUN pacman -S --noconfirm --needed \
     rustup \
     llvm \
     clang
+
 FROM rust AS rust-full
 RUN pacman -S --noconfirm --needed \
     hidapi \
     protobuf     
-
-FROM rust-full AS rust-full-rootless
 USER luser
 WORKDIR /home/luser
 RUN mkdir .cargo
-RUN rustup toolchain install stable-x86_64-unknown-linux-gnu
+RUN rustup toolchain install stable-x86_64-unknown-linux-gnu --profile minimal
 RUN rustup target add \
     x86_64-unknown-linux-musl \
     x86_64-unknown-linux-gnu \
     armv7-unknown-linux-musleabihf \
     arm-unknown-linux-musleabi \
     aarch64-unknown-linux-musl \
-    aarch64-unknown-linux-gnu
+    aarch64-unknown-linux-gnu \
+    wasm32-unknown-unknown \
+    wasm32-wasip2
+RUN cargo install --locked trunk
+ENV PATH="/home/luser/.local/bin:/home/luser/.cargo/bin:${PATH}"
 
-FROM rust-full AS gitea_act_runner
-RUN pacman -S --noconfirm nodejs npm docker docker-buildx btrfs-progs
+FROM base AS gitea_act_runner
+RUN pacman -S --noconfirm nodejs npm docker docker-buildx btrfs-progs hidapi protobuf rustup llvm clang
 RUN mkdir /downloads
 WORKDIR /downloads
 RUN curl --retry 3 -OJ https://gitea.woggioni.net/api/packages/woggioni/generic/gitea-act-runner/0.2.10/gitea-act-runner-0.2.10-1-x86_64.pkg.tar.zst
@@ -121,4 +124,18 @@ RUN rm -rf /downloads
 RUN --mount=type=bind,source=woggioni.net.ca.pem,target=/root.pem trust anchor root.pem
 USER luser
 WORKDIR /home/luser
-CMD /usr/lib/gitea/act_runner/act_runner daemon --config /var/lib/gitea/act_runner.yaml
+RUN mkdir .cargo
+RUN rustup toolchain install stable-x86_64-unknown-linux-gnu --profile minimal
+RUN rustup target add \
+    x86_64-unknown-linux-musl \
+    x86_64-unknown-linux-gnu \
+    armv7-unknown-linux-musleabihf \
+    arm-unknown-linux-musleabi \
+    aarch64-unknown-linux-musl \
+    aarch64-unknown-linux-gnu \
+    wasm32-unknown-unknown \
+    wasm32-wasip2
+RUN cargo install --locked trunk
+ENV PATH="/home/luser/.local/bin:/home/luser/.cargo/bin:${PATH}"
+
+CMD ["/usr/lib/gitea/act_runner/act_runner", "daemon", "--config", "/var/lib/gitea/act_runner.yaml"]