diff --git a/conf/machine/jetson-orin-nano-devkit-nvme.conf b/conf/machine/jetson-orin-nano-devkit-nvme.conf
index 08e8ff44..9f07b55d 100644
--- a/conf/machine/jetson-orin-nano-devkit-nvme.conf
+++ b/conf/machine/jetson-orin-nano-devkit-nvme.conf
@@ -6,8 +6,7 @@ MACHINEOVERRIDES =. "jetson-orin-nano-devkit:"
 TNSPEC_BOOTDEV ?= "nvme0n1p1"
 PARTITION_LAYOUT_TEMPLATE_DEFAULT ?= "flash_t234_qspi.xml"
 PARTITION_LAYOUT_TEMPLATE_DEFAULT_SUPPORTS_REDUNDANT ?= "1"
-PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_external.xml"
-PARTITION_LAYOUT_EXTERNAL_REDUNDANT ?= "flash_l4t_nvme_rootfs_ab.xml"
+PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_t234_nvme.xml"
 
 require conf/machine/include/orin-nano.inc
 require conf/machine/include/devkit-wifi.inc
diff --git a/conf/machine/p3509-a02-p3767-0000.conf b/conf/machine/p3509-a02-p3767-0000.conf
index 1553a21f..db5f53f0 100644
--- a/conf/machine/p3509-a02-p3767-0000.conf
+++ b/conf/machine/p3509-a02-p3767-0000.conf
@@ -12,8 +12,8 @@ NVFANCONTROL ?= "nvfancontrol_p3767_0000"
 
 TNSPEC_BOOTDEV ?= "nvme0n1p1"
 PARTITION_LAYOUT_TEMPLATE_DEFAULT ?= "flash_t234_qspi.xml"
-PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_external.xml"
-HAS_REDUNDANT_PARTITION_LAYOUT_EXTERNAL ?= "0"
+PARTITION_LAYOUT_TEMPLATE_DEFAULT_SUPPORTS_REDUNDANT ?= "1"
+PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_t234_nvme.xml"
 TEGRAFLASH_NO_INTERNAL_STORAGE = "1"
 
 require conf/machine/include/tegra234.inc
diff --git a/conf/machine/p3768-0000-p3767-0000.conf b/conf/machine/p3768-0000-p3767-0000.conf
index 41226d31..4e304a38 100644
--- a/conf/machine/p3768-0000-p3767-0000.conf
+++ b/conf/machine/p3768-0000-p3767-0000.conf
@@ -12,23 +12,15 @@ NVFANCONTROL ?= "nvfancontrol_p3767_0000"
 
 TNSPEC_BOOTDEV ?= "nvme0n1p1"
 PARTITION_LAYOUT_TEMPLATE_DEFAULT ?= "flash_t234_qspi.xml"
-PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_external.xml"
-HAS_REDUNDANT_PARTITION_LAYOUT_EXTERNAL ?= "0"
+PARTITION_LAYOUT_TEMPLATE_DEFAULT_SUPPORTS_REDUNDANT ?= "1"
+PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_t234_nvme.xml"
 TEGRAFLASH_NO_INTERNAL_STORAGE = "1"
 
 require conf/machine/include/tegra234.inc
 require conf/machine/include/devkit-wifi.inc
 
 TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0000;boardrev=;bup_type=bl \
-                       fab=000;boardsku=0000;boardrev=;bup_type=kernel \
-                       fab=000;boardsku=0001;boardrev=;bup_type=bl \
-                       fab=000;boardsku=0001;boardrev=;bup_type=kernel \
-                       fab=000;boardsku=0003;boardrev=;bup_type=bl \
-                       fab=000;boardsku=0003;boardrev=;bup_type=kernel \
-                       fab=000;boardsku=0004;boardrev=;bup_type=bl \
-                       fab=000;boardsku=0004;boardrev=;bup_type=kernel \
-                       fab=000;boardsku=0005;boardrev=;bup_type=bl \
-                       fab=000;boardsku=0005;boardrev=;bup_type=kernel"
+                       fab=000;boardsku=0000;boardrev=;bup_type=kernel"
 
 KERNEL_DEVICETREE ?= "tegra234-p3767-0000-p3768-0000-a0.dtb"
 KERNEL_ARGS ?= "mminit_loglevel=4 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb"
diff --git a/conf/machine/p3768-0000-p3767-0004.conf b/conf/machine/p3768-0000-p3767-0004.conf
index 98033bcb..d99e0c98 100644
--- a/conf/machine/p3768-0000-p3767-0004.conf
+++ b/conf/machine/p3768-0000-p3767-0004.conf
@@ -6,8 +6,8 @@ MACHINEOVERRIDES =. "jetson-orin-nano-4g-devkit:"
 TNSPEC_BOOTDEV ?= "nvme0n1p1"
 
 PARTITION_LAYOUT_TEMPLATE_DEFAULT ?= "flash_t234_qspi.xml"
-PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_external.xml"
-HAS_REDUNDANT_PARTITION_LAYOUT_EXTERNAL ?= "0"
+PARTITION_LAYOUT_TEMPLATE_DEFAULT_SUPPORTS_REDUNDANT ?= "1"
+PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_t234_nvme.xml"
 
 TEGRA_BOARDSKU = "0004"
 KERNEL_DEVICETREE = "tegra234-p3767-0004-p3768-0000-a0.dtb"