diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 71f8cf221f00..10f0a68fbb23 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -228,6 +228,7 @@ parts:
       - libffi-dev
       - libmount-dev
       - libselinux1-dev
+      - ninja-build
     override-build: |
       yq=${SNAPCRAFT_STAGE}/yq
       export GOPATH=${SNAPCRAFT_STAGE}/gopath
@@ -275,16 +276,14 @@ parts:
 
       configure_hypervisor=${kata_dir}/tools/packaging/scripts/configure-hypervisor.sh
       chmod +x ${configure_hypervisor}
-      # static build
-      echo "$(${configure_hypervisor} -s qemu) \
-        --disable-rbd
-        --prefix=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr \
-        --datadir=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/share \
-        --libexecdir=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/libexec/qemu" \
+      # static build. The --prefix, --libdir, --libexecdir, --datadir arguments are
+      # based on PREFIX and set by configure-hypervisor.sh
+      echo "$(PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr ${configure_hypervisor} -s qemu) \
+        --disable-rbd " \
         | xargs ./configure
 
       # Copy QEMU configurations (Kconfigs)
-      cp -a ${kata_dir}/tools/packaging/qemu/default-configs/* default-configs/
+      cp -a ${kata_dir}/tools/packaging/qemu/default-configs/* default-configs/devices/
 
       # build and install
       make -j $(($(nproc)-1))
diff --git a/tools/packaging/qemu/default-configs/i386-softmmu.mak b/tools/packaging/qemu/default-configs/i386-softmmu.mak
index bcdd1780138c..8f13f26b88d5 100644
--- a/tools/packaging/qemu/default-configs/i386-softmmu.mak
+++ b/tools/packaging/qemu/default-configs/i386-softmmu.mak
@@ -24,6 +24,7 @@ CONFIG_SD=n
 
 # Automotive
 CONFIG_CAN_BUS=n
+CONFIG_CAN_CTUCANFD=n
 CONFIG_CAN_PCI=n
 CONFIG_CAN_SJA1000=n
 
@@ -56,6 +57,7 @@ CONFIG_USB_TABLET_WACOM=n
 CONFIG_USB_UHCI=n
 CONFIG_USB_XHCI=n
 CONFIG_USB_XHCI_NEC=n
+CONFIG_USB_XHCI_PCI=n
 
 # ISA
 CONFIG_IDE_ISA=n