diff --git a/conf/machine/include/orin-nano.inc b/conf/machine/include/orin-nano.inc
index 3ab78e2e..eb8b6183 100644
--- a/conf/machine/include/orin-nano.inc
+++ b/conf/machine/include/orin-nano.inc
@@ -9,16 +9,10 @@ NVFANCONTROL ?= "nvfancontrol_p3767_0000"
 MACHINEOVERRIDES =. "orin-nano:"
 require conf/machine/include/tegra234.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 \
+TEGRA_BUPGEN_SPECS ?= "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=0004;boardrev=;bup_type=kernel"
 
 KERNEL_DEVICETREE ?= "tegra234-p3767-0003-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/p3509-a02-p3767-0000.conf b/conf/machine/p3509-a02-p3767-0000.conf
index db5f53f0..9ecfe88f 100644
--- a/conf/machine/p3509-a02-p3767-0000.conf
+++ b/conf/machine/p3509-a02-p3767-0000.conf
@@ -20,15 +20,7 @@ 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-p3509-a02.dtb"
 KERNEL_ARGS ?= "mminit_loglevel=4 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb"