apt-get purge grub-efi grub-efi-arm64 grub-efi-arm64-bin grub-efi-arm64-signed
apt-get install grub-efi-arm64
grub-install --removable /dev/nvme0n1p4
# Set removable media to yes and nvram to no
dpkg-reconfigure dpkg-reconfigure grub-efi-arm64
update-grub
find /boot/efi -name fbaa64.efi | xargs rm

See also: https://github.com/AsahiLinux/docs/wiki/U-Boot