Index: head/release/scripts/mk-vmimage.sh
===================================================================
--- head/release/scripts/mk-vmimage.sh
+++ head/release/scripts/mk-vmimage.sh
@@ -93,15 +93,7 @@
 		. "${VMCONFIG}"
 	fi
 
-	case ${TARGET}:${TARGET_ARCH} in
-		arm64:aarch64)
-			ROOTLABEL="ufs"
-			NOSWAP=1
-			;;
-		*)
-			ROOTLABEL="gpt"
-			;;
-	esac
+	ROOTLABEL="gpt"
 
 	vm_create_base
 	vm_install_base
Index: head/release/tools/vmimage.subr
===================================================================
--- head/release/tools/vmimage.subr
+++ head/release/tools/vmimage.subr
@@ -32,9 +32,9 @@
 			;;
 		arm64:aarch64)
 			ESP=yes
-			SCHEME=mbr
+			SCHEME=gpt
 			BOOTPARTS=
-			ROOTFSPART="-p freebsd:=${VMBASE}"
+			ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
 			;;
 		powerpc:powerpc*)
 			ESP=no