diff --git a/.gitlab-ci/container/x86_64.config b/.gitlab-ci/container/x86_64.config
index 3bad799e5f3..8f2cec020be 100644
--- a/.gitlab-ci/container/x86_64.config
+++ b/.gitlab-ci/container/x86_64.config
@@ -72,9 +72,11 @@ CONFIG_PARPORT_PC=y
 CONFIG_PARPORT_SERIAL=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_CHROME_PLATFORMS=y
+CONFIG_KVM_AMD=m
 
 #options for Intel devices
 CONFIG_MFD_INTEL_LPSS_PCI=y
+CONFIG_KVM_INTEL=m
 
 #options for KVM guests
 CONFIG_FUSE_FS=y
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index c8e770770d3..45d975dfc5e 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -12,7 +12,7 @@ variables:
    DEBIAN_X86_TEST_VK_TAG: "2022-02-21-libdrm"
 
    FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5"
-   KERNEL_ROOTFS_TAG: "2022-03-04-crosvm-lava"
+   KERNEL_ROOTFS_TAG: "2022-03-04-crosvm-kvm"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
    WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"