diff --git a/platforms/diskimg/pre.inc.sh b/platforms/diskimg/pre.inc.sh
index d205082..60f53b4 100644
--- a/platforms/diskimg/pre.inc.sh
+++ b/platforms/diskimg/pre.inc.sh
@@ -1,8 +1,16 @@
+DEVICEARCH=$ARCH
 case $VARIANT in
-   baytrail) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-baytrail"; DEVICEARCH=x86_64; MEDIA_SIZE=5120 ;;
-   bananapi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-bpi"; DEVICEARCH=arm; MEDIA_SIZE=4192 ;;
-   raspberrypi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-rpi"; DEVICEARCH=arm; MEDIA_SIZE=6144 ;;
-   cubox) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-cubox" DEVICEARCH=arm; MEDIA_SIZE=4192 ;;
+   baytrail) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-baytrail"; MEDIA_SIZE=5120 ;;
+   bananapi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-bpi"; MEDIA_SIZE=4192 ;;
+   cubox) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-cubox"; MEDIA_SIZE=4192 ;;
    livecd) MODE=usbinstall; ROOTFSINSTALL_ADD= ;;
-   *) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ; DEVICEARCH=$ARCH ;;
+   raspberrypi)
+      MODE=rootfsinstall
+      if [ "$ARCH" == "aarch64" ]; then
+          ROOTFSINSTALL_ADD="-rpi64"
+      else
+          ROOTFSINSTALL_ADD="-rpi"
+      fi
+      MEDIA_SIZE=6144 ;;
+   *) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ;;
 esac