diff --git a/.gitea/workflows/build-arch-builder.yaml b/.gitea/workflows/build-arch-builder.yaml
index 81962eb..8af4b5c 100644
--- a/.gitea/workflows/build-arch-builder.yaml
+++ b/.gitea/workflows/build-arch-builder.yaml
@@ -31,8 +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-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:buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
           target: base
       -
         name: Build and push arch-builder kernel images
@@ -44,8 +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-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:buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
           target: kernel
       -
         name: Build and push arch-builder rust images
@@ -57,8 +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-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:buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
           target: rust
       -
         name: Build and push arch-builder rust full images
@@ -70,8 +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-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:buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
           target: rust-full
       -
         name: Build and push arch-builder rust full rootless images
@@ -84,7 +84,19 @@ jobs:
           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          
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
           target: rust-full-rootless
-
+      -
+        name: Build and push arch-builder gitea_act_runner 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:gitea_act_runner"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
+          target: gitea_act_runner
diff --git a/arch-builder/Dockerfile b/arch-builder/Dockerfile
index 509d232..96430d1 100644
--- a/arch-builder/Dockerfile
+++ b/arch-builder/Dockerfile
@@ -97,3 +97,15 @@ RUN rustup target add \
     arm-unknown-linux-musleabi \
     aarch64-unknown-linux-musl \
     aarch64-unknown-linux-gnu
+
+FROM rust-full AS gitea_act_runner
+RUN pacman -S --noconfirm nodejs npm
+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
+RUN pacman -U --noconfirm *.pkg.tar.*
+WORKDIR /
+RUN rm -rf /downloads
+USER gitea
+WORKDIR /var/lib/gitea
+CMD /usr/lib/gitea/act_runner/act_runner daemon --config /var/lib/gitea/act_runner.yaml
\ No newline at end of file