diff --git a/Containerfile.common b/Containerfile.common
index ee7d8ef7..41bdb976 100644
--- a/Containerfile.common
+++ b/Containerfile.common
@@ -47,6 +47,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
     /tmp/build-kmod-openrazer.sh && \
     /tmp/build-kmod-ryzen-smu.sh && \
     /tmp/build-kmod-v4l2loopback.sh && \
+    /tmp/build-kmod-VirtualBox.sh && \
     /tmp/build-kmod-wl.sh && \
     /tmp/build-kmod-xpadneo.sh && \
     /tmp/build-kmod-xpad-noone.sh && \
diff --git a/build-kmod-VirtualBox.sh b/build-kmod-VirtualBox.sh
new file mode 100755
index 00000000..e797f1b1
--- /dev/null
+++ b/build-kmod-VirtualBox.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -oeux pipefail
+
+ARCH="$(rpm -E '%_arch')"
+KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
+RELEASE="$(rpm -E '%fedora')"
+
+
+### BUILD VirtualBox (succeed or fail-fast with debug output)
+rpm-ostree install \
+    akmod-VirtualBox-*.fc${RELEASE}.${ARCH}
+akmods --force --kernels "${KERNEL}" --kmod VirtualBox
+modinfo /usr/lib/modules/${KERNEL}/extra/VirtualBox/{vboxdrv,vboxnetadp,vboxnetflt}.ko.xz > /dev/null \
+|| (find /var/cache/akmods/VirtualBox/ -name \*.log -print -exec cat {} \; && exit 1)