diff --git a/.github/workflows/raspberrypi.yml b/.github/workflows/raspberrypi.yml
index 6dc4823..c5c6935 100644
--- a/.github/workflows/raspberrypi.yml
+++ b/.github/workflows/raspberrypi.yml
@@ -28,21 +28,13 @@ jobs:
         run: |
           ./build_raspberry_pi.sh
 
-      - name: Compress firmware
-        run: |
-          pigz -9 raspikiosk.img
-
-      - name: Debug info
-        run: |
-          ls -lAh .
-
       - name: Release build artifacts
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
           append_body: true
-          body_path: ./raspikiosk.version
+          body_path: ./version-info
           files: |
-            ./raspikiosk.img.gz
+            ./anotterkiosk-*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/x86.yml b/.github/workflows/x86.yml
index 0d47476..234a04d 100644
--- a/.github/workflows/x86.yml
+++ b/.github/workflows/x86.yml
@@ -28,21 +28,13 @@ jobs:
         run: |
           ./build_x86.sh
 
-      - name: Compress firmware
-        run: |
-          pigz -4 x86kiosk.img
-
-      - name: Debug info
-        run: |
-          ls -lAh .
-
       - name: Release build artifacts
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
           append_body: true
-          body_path: ./x86kiosk.version
+          body_path: ./version-info
           files: |
-            ./x86kiosk.img.gz
+            ./anotterkiosk-*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/build_raspberry_pi.sh b/build_raspberry_pi.sh
index 1bdf0a2..a8a5644 100755
--- a/build_raspberry_pi.sh
+++ b/build_raspberry_pi.sh
@@ -51,9 +51,8 @@ sed -i 's/vfat    defaults/vfat    ro,defaults/g' "${BUILD_DIR}/etc/fstab"
 sed -i 's/ext4    defaults/ext4    ro,defaults/g' "${BUILD_DIR}/etc/fstab"
 
 # Include git repo version info
-echo -n "AnotterKiosk repository version: " > "${BUILD_DIR}/version-info"
+echo -n "AnotterKiosk Raspberry Pi version: " > "${BUILD_DIR}/version-info"
 git describe --abbrev=4 --dirty --always --tags >> "${BUILD_DIR}/version-info"
-echo >> "${BUILD_DIR}/version-info"
 
 # Mount system partitions (from the build host)
 sudo mount proc -t proc -o nosuid,noexec,nodev "${BUILD_DIR}/proc/"
@@ -69,7 +68,7 @@ sudo chroot "${BUILD_DIR}" /kiosk_skeleton/build.sh
 sudo rm -r "${BUILD_DIR}/kiosk_skeleton"
 sudo rm "${BUILD_DIR}/raspberry_pi_bullseye.sh"
 
-cp "${BUILD_DIR}/version-info" raspikiosk.version
+cp "${BUILD_DIR}/version-info" version-info
 
 sudo umount -fl "${BUILD_DIR}/proc"
 sudo umount -fl "${BUILD_DIR}/sys"
@@ -83,3 +82,7 @@ sudo umount "${BUILD_DIR}/boot"
 sudo umount "${BUILD_DIR}"
 
 sudo losetup -D /dev/loop0
+
+tag=$(git describe --abbrev=4 --dirty --always --tags)
+mv raspikiosk.img anotterkiosk-${tag}-arm64-raspberrypi.img
+pigz -4 anotterkiosk-${tag}-arm64-raspberrypi.img
\ No newline at end of file
diff --git a/build_x86.sh b/build_x86.sh
index 29221c2..75f6ac1 100755
--- a/build_x86.sh
+++ b/build_x86.sh
@@ -33,8 +33,8 @@ echo "${PARTLAYOUT}" | sfdisk x86kiosk.img
 ld=$(sudo losetup -P --show -f x86kiosk.img)
 
 # Create filesystems
-mkfs.ext4 "${ld}p2"
-mkfs.fat -F 32 "${ld}p1"
+sudo mkfs.ext4 "${ld}p2"
+sudo mkfs.fat -F 32 "${ld}p1"
 
 # Mount partitions
 sudo mount "${ld}p2" "${BUILD_DIR}"
@@ -56,9 +56,8 @@ echo "UUID=${fat_uuid}  /boot           vfat    ro,defaults          0       2"
 echo "UUID=${ext_uuid}  /               ext4    ro,defaults,noatime  0       1" | sudo tee -a "${BUILD_DIR}/etc/fstab"
 
 # Include git repo version info
-echo -n "AnotterKiosk repository version: " > "${BUILD_DIR}/version-info"
+echo -n "AnotterKiosk x86 version: " > "${BUILD_DIR}/version-info"
 git describe --abbrev=4 --dirty --always --tags >> "${BUILD_DIR}/version-info"
-echo >> "${BUILD_DIR}/version-info"
 
 # Mount system partitions (from the build host)
 sudo mount proc -t proc -o nosuid,noexec,nodev "${BUILD_DIR}/proc/"
@@ -71,7 +70,7 @@ sudo chroot "${BUILD_DIR}" /kiosk_skeleton/build.sh
 
 sudo rm -r "${BUILD_DIR}/kiosk_skeleton"
 
-cp "${BUILD_DIR}/version-info" x86kiosk.version
+cp "${BUILD_DIR}/version-info" version-info
 
 sudo umount -fl "${BUILD_DIR}/proc"
 sudo umount -fl "${BUILD_DIR}/sys"
@@ -85,3 +84,7 @@ sudo umount "${BUILD_DIR}/boot"
 sudo umount "${BUILD_DIR}"
 
 sudo losetup -D "${ld}"
+
+tag=$(git describe --abbrev=4 --dirty --always --tags)
+mv x86kiosk.img anotterkiosk-${tag}-x86.img
+pigz -4 anotterkiosk-${tag}-x86.img
\ No newline at end of file