diff --git a/build/debian/fai_config/hooks/mountdisks.BASE b/build/debian/fai_config/hooks/mountdisks.BASE
deleted file mode 100755
index 33ebb05..0000000
--- a/build/debian/fai_config/hooks/mountdisks.BASE
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -eu
-touch $LOGDIR/skip.mountdisks
-
-# Set filesystem context if running with SELinux enabled
-options="context=$(cat /proc/self/attr/current 2>/dev/null || :)"
-
-set -- $disklist
-device=/dev/$1
-file=$(losetup -O BACK-FILE ${device} | tail -1)
-parted -m ${device} unit B print
-root_offset=$(parted -m ${device} unit B print | awk -F '[B:]' '/1:/{ print $2 }')
-efi_offset=$( parted -m ${device} unit B print | awk -F '[B:]' '/15:/{ print $2 }')
-device_root=$(losetup -O NAME,OFFSET -j ${file} | grep ${root_offset} | cut -d ' ' -f 1)
-device_efi=$(losetup -O NAME,OFFSET -j ${file} | grep ${efi_offset} | cut -d ' ' -f 1)
-
-echo root=${device_root} efi=${device_efi}
-
-mount -o noatime -o "$options" "$device_root" "$FAI_ROOT"
-if ifclass -o AMD64 ARM64 RISCV64; then
-  mkdir -p "${FAI_ROOT}/boot/efi"
-  mount -o noatime -o "$options" "$device_efi" "${FAI_ROOT}/boot/efi"
-fi
-
-mount
diff --git a/build/debian/fai_config/hooks/partition.ARM64 b/build/debian/fai_config/hooks/partition.ARM64
index 56f239c..31258d6 100755
--- a/build/debian/fai_config/hooks/partition.ARM64
+++ b/build/debian/fai_config/hooks/partition.ARM64
@@ -32,6 +32,8 @@
 efi_size=$(   parted -m ${device} unit B print | awk -F '[B:]' '/15:/{ print $6 }')
 device_root=$(losetup -o ${root_offset} --sizelimit ${root_size} --show -f ${file})
 device_efi=$(losetup -o ${efi_offset} --sizelimit ${efi_size} --show -f ${file})
+ln ${device_root} ${device}p1
+ln ${device_efi} ${device}p15
 
 losetup -a -l
 parted ${device} unit B print