diff --git a/.gitea/workflows/builder.yaml b/.gitea/workflows/builder.yaml
index 644c6e2..04e5271 100644
--- a/.gitea/workflows/builder.yaml
+++ b/.gitea/workflows/builder.yaml
@@ -12,35 +12,42 @@ jobs:
     runs-on: [arm64]
 
     steps:
-      - apt update
-      - apt install -y xorriso curl genisoimage cpio
-      - curl -LO https://laotzu.ftp.acc.umu.se/debian-cd/current/amd64/iso-cd/debian-11.6.0-amd64-netinst.iso
-      - xorriso -osirrox on -indev debian-11.6.0-amd64-netinst.iso -extract / ./isofiles
-      - chmod +w -R isofiles/
-      - gunzip ./isofiles/install.amd/initrd.gz
-      - echo preseed.cfg | cpio -H newc -o -A -F isofiles/install.amd/initrd
-      - cp bootloader-configs/*.cfg isofiles/isolinux
-      - gzip isofiles/install.amd/initrd
-      - cd isofiles
-        # Execute the md5sum generation in a separated shell instance, because it returns a
-        # warning (file system loop) that makes the CI job error out
-      - sh -c "find -follow -type f ! -name md5sum.txt -print0 | xargs -0 md5sum > md5sum.txt"
-      - cd ..
-      - chmod -w -R isofiles/
-      - genisoimage -r -J -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o halis-debian-11.6.0-amd64.iso isofiles
-    artifacts:
-        paths:
-          - halis-debian-11.3.0-amd64.iso
-        expire_in: 1 mos 8 days
+      - name: Create ISO
+        run: |
+          apt update
+          apt install -y xorriso curl genisoimage cpio
+          curl -LO https://laotzu.ftp.acc.umu.se/debian-cd/current/amd64/iso-cd/debian-11.6.0-amd64-netinst.iso
+          xorriso -osirrox on -indev debian-11.6.0-amd64-netinst.iso -extract / ./isofiles
+          chmod +w -R isofiles/
+          gunzip ./isofiles/install.amd/initrd.gz
+          echo preseed.cfg | cpio -H newc -o -A -F isofiles/install.amd/initrd
+          cp bootloader-configs/*.cfg isofiles/isolinux
+          gzip isofiles/install.amd/initrd
+          cd isofiles
+          # Execute the md5sum generation in a separated shell instance, because it returns a
+          # warning (file system loop) that makes the CI job error out
+          sh -c "find -follow -type f ! -name md5sum.txt -print0 | xargs -0 md5sum > md5sum.txt"
+          cd ..
+          chmod -w -R isofiles/
+          genisoimage -r -J -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o halis-debian-11.6.0-amd64.iso isofiles
+      - name: Upload ISO image
+        uses: actions/upload-artifact@v4
+        with:
+          name: halis-debian-11.6.0-amd64.iso
+          path: halis-debian-11.6.0-amd64.iso
 
   build-arm64:
+    container:
       image: debian:latest
-      stage: build
-      script:
-        - apt update
-        - apt install -y curl xz-utils file sudo
-        - ./arm64-build.sh
-      artifacts:
-          paths:
-            - ./*.img.xz
-          expire_in: 1 mos 8 days
+    runs-on: [arm64]
+
+    steps:
+      - name: Create ISO
+        run: |
+          apt update
+          apt install -y curl xz-utils file sudo
+          ./arm64-build.sh
+      - name: Upload ISO image
+        uses: actions/upload-artifact@v4
+        with:
+          path: ./*.img.xz