diff --git a/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-bsp/tegra-binaries/tegra-bootfiles_%.bbappend b/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-bsp/tegra-binaries/tegra-bootfiles_%.bbappend
index 49dc1a88..e0359845 100644
--- a/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-bsp/tegra-binaries/tegra-bootfiles_%.bbappend
+++ b/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-bsp/tegra-binaries/tegra-bootfiles_%.bbappend
@@ -21,5 +21,12 @@ EOF
 }
 
 do_install:append:tegra194() {
-    # Do nothing
+    # Remove invalid start locations from upstream L4T partition layout files that
+    # prevents the Mender data partition to use remaining space.
+    sed -i -e 's#<start_location> 0x708400000 </start_location>##g' \
+           -e 's#<start_location> 0x710800000 </start_location>##g' \
+		   ${D}${datadir}/tegraflash/${PARTITION_LAYOUT_TEMPLATE}
+    sed -i -e 's#<start_location> 0x708400000 </start_location>##g' \
+           -e 's#<start_location> 0x710800000 </start_location>##g' \
+		   ${D}${datadir}/tegraflash/${PARTITION_LAYOUT_EXTERNAL}
 }