diff --git a/docs/platform/qemu_virt.md b/docs/platform/qemu_virt.md
index bab046e0..32575f96 100644
--- a/docs/platform/qemu_virt.md
+++ b/docs/platform/qemu_virt.md
@@ -50,7 +50,7 @@ or
 ```
 qemu-system-riscv64 -M virt -m 256M -display none -serial stdio \
 	-kernel build/platform/qemu/virt/firmware/fw_jump.elf \
-	-device loader,file=<uboot_build_directory>/u-boot.bin,addr=0x80200000
+	-device loader,file=<uboot_build_directory>/u-boot.bin,addr=0x80400000
 ```
 
 **Linux Kernel Payload**
@@ -75,7 +75,7 @@ or
 ```
 qemu-system-riscv64 -M virt -m 256M -display none -serial stdio \
 	-kernel build/platform/qemu/virt/firmware/fw_jump.elf \
-	-device loader,file=<linux_build_directory>/arch/riscv/boot/Image,addr=0x80200000 \
+	-device loader,file=<linux_build_directory>/arch/riscv/boot/Image,addr=0x80400000 \
 	-drive file=<path_to_linux_rootfs>,format=raw,id=hd0 \
 	-device virtio-blk-device,drive=hd0 \
 	-append "root=/dev/vda rw console=ttyS0"
diff --git a/platform/qemu/virt/config.mk b/platform/qemu/virt/config.mk
index 5931d0e0..fcd25c86 100644
--- a/platform/qemu/virt/config.mk
+++ b/platform/qemu/virt/config.mk
@@ -30,10 +30,12 @@ PLATFORM_SYS_CLINT=y
 # Blobs to build
 FW_TEXT_START=0x80000000
 FW_JUMP=y
-FW_JUMP_ADDR=0x80200000
+# This needs to be 4MB alligned for 32-bit support
+FW_JUMP_ADDR=0x80400000
 FW_JUMP_FDT_ADDR=0x82200000
 FW_PAYLOAD=y
-FW_PAYLOAD_OFFSET=0x200000
+# This needs to be 4MB alligned for 32-bit support
+FW_PAYLOAD_OFFSET=0x400000
 FW_PAYLOAD_FDT_ADDR=0x82200000
 
 # External Libraries to include