diff --git a/device/testing/device-motorola-rtwo/APKBUILD b/device/testing/device-motorola-rtwo/APKBUILD
index 57fd574d2..4f91b8460 100644
--- a/device/testing/device-motorola-rtwo/APKBUILD
+++ b/device/testing/device-motorola-rtwo/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="snlavaise <snlavaise@gmail.com>"
 pkgname=device-motorola-rtwo
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="Motorola Moto Edge 40 Pro"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -36,6 +36,6 @@ package() {
 }
 
 sha512sums="
-beca2835f2ea99426eed39607259aab0b4ef119bd9855a961476b6fbca6e55a4d7985407d46067df760919814b8b97dd1f6a350c1f6f1a7ebdc0fb839e6cc0e7  deviceinfo
+eae7f9b4528b392448a7a6eff485bcf1c87285ae12c039d78f25ce86fa3e71c334c3521e5a2ff47c273a249cab2e875b20646eba610f3c132d2c146649b4c505  deviceinfo
 c572e21cb0624b554a22a218b0c4faab9b6412654bed6bfef530f3068d076b21c573bd7f4b3ca65f510f8756f636a861191cce925ef49587db7d68d09558826c  modules-initfs
 "
diff --git a/device/testing/device-motorola-rtwo/deviceinfo b/device/testing/device-motorola-rtwo/deviceinfo
index d90792e55..8487c2076 100644
--- a/device/testing/device-motorola-rtwo/deviceinfo
+++ b/device/testing/device-motorola-rtwo/deviceinfo
@@ -33,6 +33,10 @@ deviceinfo_create_initfs_extra="true"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=tty0 console=ttyMSM0,115200n8 earlycon clk_ignore_unused pd_ignore_unused ignore_loglevel"
 deviceinfo_generate_bootimg="true"
+# The Motorola bootloader places the DTB / kernel at the addresses in the
+# vendor_boot header. mkbootimg defaults to base 0x10000000 (dtb ends up at
+# 0x11f00000, outside RAM) - stock uses base 0. Force the stock layout.
+deviceinfo_bootimg_custom_args="--base 0x00000000 --kernel_offset 0x00008000 --ramdisk_offset 0x01000000 --tags_offset 0x00000100 --dtb_offset 0x01f00000"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_header_version="4"
 deviceinfo_flash_pagesize="4096"