diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2a940f..1b33cac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,17 +2,18 @@ build-x86_64: &build
   image: registry.git.ptrc.gay/ptrcnull/ptrcports-builder/x86_64:latest
   cache:
     key: repodest-x86_64
-    paths: [repodest/]
+    paths: [repodest/ptrcports/x86_64]
     when: always
   stage: build
   script:
+    - CARCH=$(apk --print-arch)
     - doas apk upgrade -Ua
     - setup-ssh-key "$PRIVATE_KEY"
     - setup-abuild-key "$PACKAGER_PRIVKEY" "alpine@ptrcnull.me-60610fa4.rsa"
-    - mkdir -p repodest
+    - mkdir -p repodest/ptrcports/$CARCH
     - rsync --archive --update --hard-links --delete --delete-after --delay-updates --itemize-changes --no-o --no-g
-        buildozer@repo.ptrc.gay:repodest/
-        repodest/
+        buildozer@repo.ptrc.gay:repodest/ptrcports/$CARCH/
+        repodest/ptrcports/$CARCH/
     - buildrepo
         --aports $PWD/..
         --destdir $PWD/repodest
@@ -21,8 +22,8 @@ build-x86_64: &build
     - |-
         if [ "$CI_COMMIT_BRANCH" = "master" ]; then
           rsync --archive --update --hard-links --delete --delete-after --delay-updates --itemize-changes --no-o --no-g \
-            repodest/ \
-            buildozer@repo.ptrc.gay:repodest/
+            repodest/ptrcports/$CARCH/ \
+            buildozer@repo.ptrc.gay:repodest/ptrcports/$CARCH/
         else
           echo "Current branch: $CI_COMMIT_BRANCH"
         fi
@@ -31,7 +32,7 @@ build-aarch64:
   <<: *build
   cache:
     key: repodest-aarch64
-    paths: [repodest/]
+    paths: [repodest/ptrcports/aarch64]
     when: always
   image: registry.git.ptrc.gay/ptrcnull/ptrcports-builder/arm64v8:latest
 
@@ -39,7 +40,7 @@ build-aarch64:
 #   <<: *build
 #   cache:
 #     key: repodest-armhf
-#     paths: [repodest/]
+#     paths: [repodest/ptrcports/armhf]
 #     when: always
 #   image: arm32v6/alpine:edge
 
@@ -47,7 +48,7 @@ build-aarch64:
 #   <<: *build
 #   cache:
 #     key: repodest-armv7
-#     paths: [repodest/]
+#     paths: [repodest/ptrcports/armv7]
 #     when: always
 #   image: arm32v7/alpine:edge
 
@@ -55,7 +56,7 @@ build-aarch64:
 #   <<: *build
 #   cache:
 #     key: repodest-ppc64le
-#     paths: [repodest/]
+#     paths: [repodest/ptrcports/ppc64le]
 #     when: always
 #   image: ppc64le/alpine:edge
 
@@ -63,7 +64,7 @@ build-riscv64:
   <<: *build
   cache:
     key: repodest-riscv64
-    paths: [repodest/]
+    paths: [repodest/ptrcports/riscv64]
     when: always
   image: registry.git.ptrc.gay/ptrcnull/ptrcports-builder/riscv64:latest
 
@@ -71,7 +72,7 @@ build-riscv64:
 #   <<: *build
 #   cache:
 #     key: repodest-s390x
-#     paths: [repodest/]
+#     paths: [repodest/ptrcports/s390x]
 #     when: always
 #   image: s390x/alpine:edge
 
@@ -79,6 +80,6 @@ build-x86:
   <<: *build
   cache:
     key: repodest-x86
-    paths: [repodest/]
+    paths: [repodest/ptrcports/x86]
     when: always
   image: registry.git.ptrc.gay/ptrcnull/ptrcports-builder/i386:latest