diff --git a/configs/qemux86-64_config b/configs/qemux86-64_config
index 6b0599d..2f21b14 100644
--- a/configs/qemux86-64_config
+++ b/configs/qemux86-64_config
@@ -1,16 +1,19 @@
 # This configuration can be used to run on a qemux86-64 machine.
 #
-# This has been tested on images generated with the following command:
+# The image is generated with the following command:
 #
-#    mkosi -d ubuntu -r bionic -t gpt_ext4 -b --checksum --password password --package=openssh-server,dhcpcd5 -o image.raw
+#    mkosi --root-size=2G --distribution=ubuntu --release=focal --format=gpt_ext4 --bootable --checksum
+#          --password password --package=openssh-server,dhcpcd5 --output=Ubuntu-Focal-x86-64.img build
 #
-# Converted with the following command:
+# Then manually uploaded to Mender's AWS S3 bucket for CI testing
 #
-#    MENDER_ARTIFACT_NAME=release-1 ./mender-convert --disk-image input/image.raw  --overlay rootfs_overlay_demo --config configs/qemux86-64_config
+# Locally, converted with the following command:
+#
+#    MENDER_ARTIFACT_NAME=release-1 ./docker-mender-convert --disk-image input/Ubuntu-Focal-x86-64.img --overlay rootfs_overlay_demo --config configs/qemux86-64_config
 #
 # and qemu is executed with the following command:
 #
-#    qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/ovmf/x64/OVMF_CODE.fd -drive format=raw,file=qemux86_64-release-1.sdimg
+#    qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/OVMF/OVMF_CODE.fd -drive format=raw,file=deploy/Ubuntu-Focal-x86-64-qemux86_64-mender.img
 
 MENDER_STORAGE_DEVICE_BASE=/dev/sda
 MENDER_DEVICE_TYPE="qemux86_64"
diff --git a/scripts/test/run-tests.sh b/scripts/test/run-tests.sh
index 916aaee..84a6cdc 100755
--- a/scripts/test/run-tests.sh
+++ b/scripts/test/run-tests.sh
@@ -26,7 +26,7 @@ BBB_DEBIAN_EMMC_IMAGE_URL="https://rcn-ee.com/rootfs/bb.org/testing/2021-05-28/b
 ## Auto-update
 RASPBIAN_IMAGE_URL="http://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2020-02-14/2020-02-13-raspbian-buster-lite.zip"
 
-UBUNTU_IMAGE_URL="https://downloads.mender.io/mender-convert/images/Ubuntu-Bionic-x86-64.img.gz"
+UBUNTU_IMAGE_URL="https://downloads.mender.io/mender-convert/images/Ubuntu-Focal-x86-64.img.gz"
 
 ## Auto-update
 UBUNTU_SERVER_RPI_IMAGE_URL="http://cdimage.ubuntu.com/ubuntu/releases/20.04.2/release/ubuntu-20.04.2-preinstalled-server-armhf+raspi.img.xz"
@@ -90,7 +90,7 @@ else
     wget --progress=dot:giga -N ${UBUNTU_IMAGE_URL} -P input/
     convert_and_test "qemux86_64" \
                      "release-1" \
-                     "input/Ubuntu-Bionic-x86-64.img.gz" \
+                     "input/Ubuntu-Focal-x86-64.img.gz" \
                      "--overlay tests/ssh-public-key-overlay" \
                      "--config configs/qemux86-64_config $EXTRA_CONFIG" \
                      || test_result=$?
@@ -99,13 +99,13 @@ else
     echo >&2 "Running the uncompressed test"
     echo >&2 "----------------------------------------"
     rm -rf deploy
-    gunzip --force "input/Ubuntu-Bionic-x86-64.img.gz"
+    gunzip --force "input/Ubuntu-Focal-x86-64.img.gz"
     run_convert "release-2" \
-                "input/Ubuntu-Bionic-x86-64.img" \
+                "input/Ubuntu-Focal-x86-64.img" \
                 "--config configs/qemux86-64_config $EXTRA_CONFIG" || test_result=$?
     ret=0
-    test -f deploy/Ubuntu-Bionic-x86-64-qemux86_64-mender.img || ret=$?
-    assert "${ret}" "0" "Expected uncompressed file deploy/Ubuntu-Bionic-x86-64-qemux86_64-mender.img"
+    test -f deploy/Ubuntu-Focal-x86-64-qemux86_64-mender.img || ret=$?
+    assert "${ret}" "0" "Expected uncompressed file deploy/Ubuntu-Focal-x86-64-qemux86_64-mender.img"
   fi
 
   if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "raspberrypi3" ]; then