diff --git a/.gitea/workflows/build-arch-builder.yaml b/.gitea/workflows/build-arch-builder.yaml
index 77fe6e3..66206e3 100644
--- a/.gitea/workflows/build-arch-builder.yaml
+++ b/.gitea/workflows/build-arch-builder.yaml
@@ -32,6 +32,7 @@ jobs:
           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: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