diff --git a/conf/machine/include/orin-nano.inc b/conf/machine/include/orin-nano.inc
index 60ae85d4..1257516e 100644
--- a/conf/machine/include/orin-nano.inc
+++ b/conf/machine/include/orin-nano.inc
@@ -2,7 +2,7 @@ TEGRA_BOARDID ?= "3767"
 TEGRA_FAB ?= "RC1"
 TEGRA_BOARDSKU ?= "0005"
 TEGRA_BOARDREV ?= "B.4"
-NVPMODEL ?= "nvpmodel_p3767_0003"
+NVPMODEL ?= "nvpmodel_p3767_0003_super"
 NVFANCONTROL ?= "nvfancontrol_p3767_0000"
 
 MACHINEOVERRIDES =. "orin-nano:"
@@ -13,7 +13,7 @@ require conf/machine/include/tegra234.inc
 TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0005;boardrev=;chipsku=00:00:00:D5;bup_type=bl \
                        fab=000;boardsku=0005;boardrev=;bup_type=kernel"
 
-KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0005-nv.dtb"
+KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0005-nv-super.dtb"
 KERNEL_ARGS ?= "mminit_loglevel=4 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 nospectre_bhb video=efifb:off console=tty0"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-r8168 kernel-module-r8169 kernel-module-realtek"
 MACHINE_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
diff --git a/conf/machine/include/orin-nx.inc b/conf/machine/include/orin-nx.inc
index f75b0610..3e399b72 100644
--- a/conf/machine/include/orin-nx.inc
+++ b/conf/machine/include/orin-nx.inc
@@ -3,7 +3,7 @@ TEGRA_FAB ?= "ES1"
 TEGRA_BOARDSKU ?= "0000"
 TEGRA_BOARDREV ?= "A.3"
 TEGRA_CHIPREV ?= "1"
-NVPMODEL ?= "nvpmodel_p3767_0000"
+NVPMODEL ?= "nvpmodel_p3767_0000_super"
 NVFANCONTROL ?= "nvfancontrol_p3767_0000"
 
 TNSPEC_BOOTDEV ?= "nvme0n1p1"
@@ -17,7 +17,7 @@ require conf/machine/include/tegra234.inc
 TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0000;boardrev=;chipsku=00:00:00:D3;bup_type=bl \
                        fab=000;boardsku=0000;boardrev=;bup_type=kernel"
 
-KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0000-nv.dtb"
+KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0000-nv-super.dtb"
 KERNEL_ARGS ?= "mminit_loglevel=4 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 nospectre_bhb video=efifb:off console=tty0"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-r8168 kernel-module-r8169 kernel-module-realtek"
 MACHINE_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
diff --git a/conf/machine/p3768-0000-p3767-0001.conf b/conf/machine/p3768-0000-p3767-0001.conf
index 7329b793..1c7239ad 100644
--- a/conf/machine/p3768-0000-p3767-0001.conf
+++ b/conf/machine/p3768-0000-p3767-0001.conf
@@ -2,13 +2,13 @@
 #@NAME: Nvidia Jetson Orin NX 8GB (P3767-0001)
 #@DESCRIPTION: Nvidia Jetson Orin NX 8G module in P3768 carrier
 
-NVPMODEL ?= "nvpmodel_p3767_0001"
+NVPMODEL ?= "nvpmodel_p3767_0001_super"
 
 TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0001;boardrev=;chipsku=00:00:00:D4;bup_type=bl \
                        fab=000;boardsku=0001;boardrev=;bup_type=kernel"
 
 TEGRA_BOARDSKU ?= "0001"
-KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0001-nv.dtb"
+KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0001-nv-super.dtb"
 EMMC_BCT ?= "tegra234-p3767-0001-sdram-l4t.dts"
 
 TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0001-3509-a02.dtb"
diff --git a/conf/machine/p3768-0000-p3767-0003.conf b/conf/machine/p3768-0000-p3767-0003.conf
index d3baf87b..920ba06f 100644
--- a/conf/machine/p3768-0000-p3767-0003.conf
+++ b/conf/machine/p3768-0000-p3767-0003.conf
@@ -17,6 +17,6 @@ TEGRAFLASH_NO_INTERNAL_STORAGE = "1"
 
 MACHINEOVERRIDES =. "p3767-0003:"
 
-KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0003-nv.dtb"
+KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0003-nv-super.dtb"
 
 require conf/machine/include/orin-nano.inc
diff --git a/conf/machine/p3768-0000-p3767-0004.conf b/conf/machine/p3768-0000-p3767-0004.conf
index 0c929a51..f4c4e99b 100644
--- a/conf/machine/p3768-0000-p3767-0004.conf
+++ b/conf/machine/p3768-0000-p3767-0004.conf
@@ -11,8 +11,8 @@ PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_t234_nvme.xml"
 TEGRAFLASH_NO_INTERNAL_STORAGE = "1"
 
 TEGRA_BOARDSKU = "0004"
-KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0004-nv.dtb"
-NVPMODEL ?= "nvpmodel_p3767_0004"
+KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0004-nv-super.dtb"
+NVPMODEL ?= "nvpmodel_p3767_0004_super"
 EMMC_BCT ?= "tegra234-p3767-0004-sdram-l4t.dts"
 
 TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0004-3509-a02.dtb"