diff --git a/tools/build-flysky.py b/tools/build-flysky.py
index 95187ff2fc..4380cb8703 100755
--- a/tools/build-flysky.py
+++ b/tools/build-flysky.py
@@ -11,31 +11,23 @@
 boards = {
     "I6X": {
         "HELI": "NO",
-        "PCBI6X_ELRS": "YES",
         "PCBI6X_INAV": "YES",
         "DFPLAYER": "NO",
-        "USB_SERIAL": "YES",
     },
     "I6X_DFPLAYER": {
         "HELI": "NO",
-        "PCBI6X_ELRS": "YES",
         "PCBI6X_INAV": "YES",
         "DFPLAYER": "YES",
-        "USB_SERIAL": "YES",
     },
     "I6X_HELI": {
         "HELI": "YES",
-        "PCBI6X_ELRS": "YES",
         "PCBI6X_INAV": "NO",
         "DFPLAYER": "NO",
-        "USB_SERIAL": "YES",
     },
     "I6X_HELI_DFPLAYER": {
         "HELI": "YES",
-        "PCBI6X_ELRS": "YES",
         "PCBI6X_INAV": "NO",
         "DFPLAYER": "YES",
-        "USB_SERIAL": "YES",
     },
 }
 
@@ -63,6 +55,8 @@
     "DISABLE_COMPANION": "YES",
     "PPM_UNIT": "PERCENT_PREC1",
     "USB_MSD": "YES",
+    "USB_SERIAL": "YES",
+    "PCBI6X_ELRS": "YES",
     "SBUS_TRAINER": "NO",
 }