diff --git a/Tools/scripts/board_list.py b/Tools/scripts/board_list.py
index 354367ec05..f8dbd5dc56 100644
--- a/Tools/scripts/board_list.py
+++ b/Tools/scripts/board_list.py
@@ -48,10 +48,13 @@ AUTOBUILD_BOARDS = ["fmuv2",
                     "Pixhawk1",
                     "Pixhawk1-1M",
                     "Pixhawk4",
+                    "Pixhawk4-bdshot",
                     "Pix32v5",
                     "PH4-mini",
                     "CUAVv5",
+                    "CUAVv5-bdshot",
                     "CUAVv5Nano",
+                    "CUAVv5Nano-bdshot",
                     "CUAV-Nora",
                     "CUAV-X7",
                     "CUAV-X7-bdshot",
diff --git a/Tools/scripts/generate_manifest.py b/Tools/scripts/generate_manifest.py
index 79064a7440..4d52ff326c 100755
--- a/Tools/scripts/generate_manifest.py
+++ b/Tools/scripts/generate_manifest.py
@@ -21,6 +21,7 @@ RELEASE_TYPES = ["beta", "latest", "stable", "stable-*", "dirty"]
 # mapping for board names to brand name and manufacturer
 brand_map = {
     'Pixhawk4' : ('Pixhawk 4', 'Holybro'),
+    'Pixhawk4-bdshot' : ('Pixhawk 4', 'Holybro'),
     'Pix32v5' :  ('Pix32 v5', 'Holybro'),
     'Durandal' : ('Durandal', 'Holybro'),
     'Durandal-bdshot' : ('Durandal', 'Holybro'),
@@ -37,7 +38,9 @@ brand_map = {
     'CubeSolo' : ('CubeSolo', '3DR'),
     'CubeGreen-solo' : ('CubeGreen Solo', 'Hex/ProfiCNC'),
     'CUAVv5' : ('CUAVv5', 'CUAV'),
+    'CUAVv5-bdshot' : ('CUAVv5', 'CUAV'),
     'CUAVv5Nano' : ('CUAVv5 Nano', 'CUAV'),
+    'CUAVv5Nano-bdshot' : ('CUAVv5 Nano', 'CUAV'),
     'CUAV-Nora' : ('CUAV Nora', 'CUAV'),
     'CUAV-X7' : ('CUAV X7', 'CUAV'),
     'CUAV-X7-bdshot' : ('CUAV X7', 'CUAV'),