diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index 940338c8e6..47002d59ba 100644
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -465,6 +465,13 @@ ifneq (,$(QEMUCMD))
     ifneq (,$(QEMUFWVOL))
         FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/ovmf/$(QEMUFWVOL)
     endif
+
+    ifneq (,$(QEMUFW_ARM64))
+        FIRMWAREPATH := $(PREFIXDEPS)/share/aavmf/$(QEMUFW_ARM64)
+    endif
+    ifneq (,$(QEMUFWVOL_ARM64))
+        FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/aavmf/$(QEMUFWVOL_ARM64)
+    endif
 endif
 
 ifneq (,$(CLHCMD))
diff --git a/src/runtime/arch/arm64-options.mk b/src/runtime/arch/arm64-options.mk
index 749504cfca..9359282576 100644
--- a/src/runtime/arch/arm64-options.mk
+++ b/src/runtime/arch/arm64-options.mk
@@ -11,8 +11,8 @@ MACHINEACCELERATORS :=
 CPUFEATURES := pmu=off
 
 QEMUCMD := qemu-system-aarch64
-QEMUFW := AAVMF_CODE.fd
-QEMUFWVOL := AAVMF_VARS.fd
+QEMUFW_ARM64 := AAVMF_CODE.fd
+QEMUFWVOL_ARM64 := AAVMF_VARS.fd
 
 # Firecracker binary name
 FCCMD := firecracker
diff --git a/tools/packaging/static-build/ovmf/build-ovmf.sh b/tools/packaging/static-build/ovmf/build-ovmf.sh
index a649a3a33c..23f6e05585 100755
--- a/tools/packaging/static-build/ovmf/build-ovmf.sh
+++ b/tools/packaging/static-build/ovmf/build-ovmf.sh
@@ -84,7 +84,11 @@ fi
 popd
 
 info "Install fd to destdir"
-install_dir="${DESTDIR}/${PREFIX}/share/ovmf"
+if [ "${ovmf_build}" == "arm64" ]; then
+	install_dir="${DESTDIR}/${PREFIX}/share/aavmf"
+else
+	install_dir="${DESTDIR}/${PREFIX}/share/ovmf"
+fi
 
 mkdir -p "${install_dir}"
 if [ "${ovmf_build}" == "sev" ]; then