diff --git a/kas/include/tegra-jetpack5.yml b/kas/include/tegra-jetpack5.yml
index b3a0314c..b82df72a 100644
--- a/kas/include/tegra-jetpack5.yml
+++ b/kas/include/tegra-jetpack5.yml
@@ -6,7 +6,8 @@ header:
 repos:
   meta-tegra:
     # refers to the scarthgap-l4t-r35.x branch
-    commit: 972488415a80afebbd652a983a46c2641eed99ad
+    # commit: 972488415a80afebbd652a983a46c2641eed99ad # this lacks classes/l4t_version.bbclass
+    commit: 32d86844d857321e1ed137abbdd5a045c6f5cb3f
   meta-tegra-community:
     # refers to the scarthgap-l4t-r35.x branch
     commit: 865561b6d3ba6607a814354c122c91422df720d5
diff --git a/meta-mender-tegra/classes-global/tegra-mender-setup.bbclass b/meta-mender-tegra/classes-global/tegra-mender-setup.bbclass
index fbec7e39..a102ad8e 100644
--- a/meta-mender-tegra/classes-global/tegra-mender-setup.bbclass
+++ b/meta-mender-tegra/classes-global/tegra-mender-setup.bbclass
@@ -49,7 +49,7 @@ IMAGE_BOOT_FILES = "u-boot-dtb.bin"
 # boot into an emergency shell and examine the /dev/mmcblk* devices,
 # or use the uboot console to look at mtdparts
 MENDER_DATA_PART_NUMBER_DEFAULT:tegra186 = "34"
-MENDER_DATA_PART_NUMBER_DEFAULT:tegra194 = "42"
+MENDER_DATA_PART_NUMBER_DEFAULT:tegra194 = "45"
 MENDER_DATA_PART_NUMBER_DEFAULT:xavier-nx = "23"
 MENDER_DATA_PART_NUMBER_DEFAULT:tegra210 = "${@'16' if (d.getVar('TEGRA_SPIFLASH_BOOT') or '') == '1' else '23'}"
 MENDER_DATA_PART_NUMBER_DEFAULT:jetson-nano-emmc = "19"
diff --git a/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-storage-layout-base_%.bbappend b/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-storage-layout-base_%.bbappend
index de1ebb38..2acf01c2 100644
--- a/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-storage-layout-base_%.bbappend
+++ b/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-storage-layout-base_%.bbappend
@@ -29,8 +29,8 @@ do_install:append:tegra194() {
     # 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}
+		   ${D}${datadir}/l4t-storage-layout/${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}
+		   ${D}${datadir}/l4t-storage-layout/${PARTITION_LAYOUT_EXTERNAL}
 }