diff --git a/mkosi.conf b/mkosi.conf
index a5953d7613..cea204961b 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -19,8 +19,6 @@ BuildSourcesEphemeral=yes
 
 [Host]
 @Incremental=yes
-# TODO: Drop to 2G again once the next Noble kernel update ships and we can use linux-image-virtual.
-@QemuMem=4G
 @RuntimeSize=8G
 ToolsTreePackages=virtiofsd
 KernelCommandLineExtra=systemd.crash_shell
diff --git a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
index 85126a1a37..957d00e429 100644
--- a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
@@ -5,7 +5,6 @@ Distribution=ubuntu
 
 [Content]
 Packages=
-        # We would like to use linux-virtual but it does not have support for SMBIOS credentials.
-        linux-image-generic
+        linux-image-virtual
         linux-tools-common
-        linux-tools-generic
+        linux-tools-virtual