diff --git a/arch/amd64-options.mk b/arch/amd64-options.mk
index 2137ad7812..78db6662c6 100644
--- a/arch/amd64-options.mk
+++ b/arch/amd64-options.mk
@@ -9,7 +9,7 @@ MACHINETYPE := pc
 KERNELPARAMS :=
 MACHINEACCELERATORS :=
 
-QEMUCMD := qemu-lite-system-x86_64
+QEMUCMD := qemu-system-x86_64
 
 # Firecracker binary name
 FCCMD := firecracker
diff --git a/versions.yaml b/versions.yaml
index 9072c0961b..1c17e01d17 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -103,7 +103,8 @@ assets:
     qemu:
       description: "VMM that uses KVM"
       url: "https://github.com/qemu/qemu"
-      version: "stable-2.11"
+      version: "4.0.0"
+      tag: "v4.0.0"
       # Do not include any non-full release versions
       # Break the line *without CR or space being appended*, to appease
       # yamllint, and note the deliberate ' ' at the end of the expression.
@@ -114,6 +115,7 @@ assets:
         .*/v?(\d\S+)\.tar\.gz
       architecture:
         aarch64:
+          version: "stable-2.11"
           branch: "master"
           tag: "v3.1.0-rc2"
           commit: "47c1cc30e440860aa695358f7c2dd0b9d7b53d16"