diff --git a/conf/machine/include/orin-nano.inc b/conf/machine/include/orin-nano.inc
index 1257516e..7b1cc894 100644
--- a/conf/machine/include/orin-nano.inc
+++ b/conf/machine/include/orin-nano.inc
@@ -30,7 +30,7 @@ OTAGPTDEV ?= "/dev/mtdblock0"
 
 TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-carveouts.dtbo tegra-optee.dtbo tegra234-p3768-0000+p3767-0000-dynamic.dtbo"
 
-TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0003-3509-a02.dtb"
+TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0003-3768-super.dtb"
 TEGRA_FLASHVAR_BPF_FILE ?= "bpmp_t234-TE950M-A1_prod.bin"
 TEGRA_FLASHVAR_BR_CMD_CONFIG ?= "tegra234-mb1-bct-reset-p3767-0000.dts"
 TEGRA_FLASHVAR_DEVICEPROD_CONFIG ?= "tegra234-mb1-bct-cprod-p3767-0000.dts"
diff --git a/conf/machine/include/orin-nx.inc b/conf/machine/include/orin-nx.inc
index 3e399b72..c78886c0 100644
--- a/conf/machine/include/orin-nx.inc
+++ b/conf/machine/include/orin-nx.inc
@@ -35,7 +35,7 @@ OTAGPTDEV ?= "/dev/mtdblock0"
 
 TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-carveouts.dtbo tegra-optee.dtbo tegra234-p3768-0000+p3767-0000-dynamic.dtbo"
 
-TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0000-@BPFDTBREV@-3509-a02.dtb"
+TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0000-3768-super.dtb"
 TEGRA_FLASHVAR_BPF_FILE ?= "bpmp_t234-TE980M-A1_prod.bin"
 TEGRA_FLASHVAR_BR_CMD_CONFIG ?= "tegra234-mb1-bct-reset-p3767-0000.dts"
 TEGRA_FLASHVAR_CHIP_SKU ?= "00:00:00:D3"
diff --git a/conf/machine/p3768-0000-p3767-0001.conf b/conf/machine/p3768-0000-p3767-0001.conf
index 1c7239ad..0c06c58f 100644
--- a/conf/machine/p3768-0000-p3767-0001.conf
+++ b/conf/machine/p3768-0000-p3767-0001.conf
@@ -11,7 +11,7 @@ TEGRA_BOARDSKU ?= "0001"
 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"
+TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0001-3768-super.dtb"
 TEGRA_FLASHVAR_CHIP_SKU ?= "00:00:00:D4"
 TEGRA_FLASHVAR_WB0SDRAM_BCT ?= "tegra234-p3767-0001-wb0sdram-l4t.dts"
 
diff --git a/conf/machine/p3768-0000-p3767-0004.conf b/conf/machine/p3768-0000-p3767-0004.conf
index f4c4e99b..caa5dd6a 100644
--- a/conf/machine/p3768-0000-p3767-0004.conf
+++ b/conf/machine/p3768-0000-p3767-0004.conf
@@ -15,7 +15,7 @@ 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"
+TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0004-3768-super.dtb"
 TEGRA_FLASHVAR_CHIP_SKU ?= "00:00:00:D6"
 TEGRA_FLASHVAR_RAMCODE ?= "4"
 TEGRA_FLASHVAR_WB0SDRAM_BCT ?= "tegra234-p3767-0004-wb0sdram-l4t.dts"