diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt
index 35840539da..c0713f9953 100644
--- a/lib/nova_plugins/functions-libvirt
+++ b/lib/nova_plugins/functions-libvirt
@@ -71,7 +71,7 @@ function install_libvirt {
     if is_ubuntu; then
         install_package qemu-system libvirt-clients libvirt-daemon-system libvirt-dev python3-libvirt systemd-coredump
         if is_arch "aarch64"; then
-            install_package qemu-efi
+            install_package qemu-efi-aarch64
         fi
         #pip_install_gr <there-si-no-guestfs-in-pypi>
     elif is_fedora; then
diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt
index 4b44c1f86f..1ad0f4309d 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -55,11 +55,11 @@ function configure_nova_hypervisor {
 
     # arm64-specific configuration
     if is_arch "aarch64"; then
-        iniset $NOVA_CONF libvirt cpu_mode "host-passthrough"
+        iniset $NOVA_CONF libvirt cpu_mode "custom"
         # NOTE(mnaser): We cannot have `cpu_model` set if the `cpu_mode` is
         #               set to `host-passthrough`, or `nova-compute` refuses to
         #               start.
-        inidelete $NOVA_CONF libvirt cpu_model
+        iniset $NOVA_CONF libvirt cpu_model "max"
     fi
 
     if isset ENABLE_FILE_INJECTION; then