diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 82c1b5728..4bbeb43b3 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -1174,7 +1174,7 @@ void registerOpenTxFirmwares()
   firmware = new OpenTxFirmware("opentx-x9d+2019", Firmware::tr("FrSky Taranis X9D+ 2019"), BOARD_TARANIS_X9DP_2019);
   addOpenTxTaranisOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
 
   /* FrSky Taranis X9D board */
   firmware = new OpenTxFirmware("opentx-x9d", Firmware::tr("FrSky Taranis X9D"), BOARD_TARANIS_X9D);
@@ -1208,13 +1208,13 @@ void registerOpenTxFirmwares()
   firmware = new OpenTxFirmware("opentx-x7", Firmware::tr("FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7);
   addOpenTxTaranisOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, EU + FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, EU + FLEX);
 
   /* FrSky X7 Access board */
   firmware = new OpenTxFirmware("opentx-x7access", Firmware::tr("FrSky Taranis X7 / X7S Access"), BOARD_TARANIS_X7_ACCESS);
   addOpenTxTaranisOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
 
   /* FrSky X-Lite S/PRO board */
   firmware = new OpenTxFirmware("opentx-xlites", Firmware::tr("FrSky Taranis X-Lite S/PRO"), BOARD_TARANIS_XLITES);
@@ -1234,13 +1234,13 @@ void registerOpenTxFirmwares()
   addOpenTxFrskyOptions(firmware);
   firmware->addOption("internalaccess", Firmware::tr("Support for ACCESS internal module replacement"));
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, EU + FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, EU + FLEX);
 
   /* FrSky X10 Express board */
   firmware = new OpenTxFirmware("opentx-x10express", Firmware::tr("FrSky Horus X10 Express / X10S Express"), BOARD_X10_EXPRESS);
   addOpenTxFrskyOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
 
   /* FrSky X12 (Horus) board */
   firmware = new OpenTxFirmware("opentx-x12s", Firmware::tr("FrSky Horus X12S"), BOARD_HORUS_X12S);
@@ -1248,7 +1248,7 @@ void registerOpenTxFirmwares()
   firmware->addOption("internalaccess", Firmware::tr("Support for ACCESS internal module replacement"));
   firmware->addOption("pcbdev", Firmware::tr("Use ONLY with first DEV pcb version"));
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, EU + FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, EU + FLEX);
 
   /* Jumper T12 board */
   firmware = new OpenTxFirmware("opentx-t12", QCoreApplication::translate("Firmware", "Jumper T12 / T12 Pro"), BOARD_JUMPER_T12);
@@ -1266,13 +1266,13 @@ void registerOpenTxFirmwares()
   addOpenTxFrskyOptions(firmware);
   firmware->addOption("internalmulti", Firmware::tr("Support for MULTI internal module"));
   firmware->addOption("bluetooth", Firmware::tr("Support for bluetooth module"));
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
   registerOpenTxFirmware(firmware);
 
   /* Radiomaster TX16S board */
   firmware = new OpenTxFirmware("opentx-tx16s", Firmware::tr("Radiomaster TX16s / TX16s Hall / TX16s Masterfire"), BOARD_RADIOMASTER_TX16S);
   addOpenTxFrskyOptions(firmware);
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
   static const Firmware::Option opt_bt("bluetooth", Firmware::tr("Support for bluetooth module"));
   static const Firmware::Option opt_internal_gps("internalgps", Firmware::tr("Support internal GPS"));
   firmware->addOptionsGroup({opt_bt, opt_internal_gps});
diff --git a/radio/util/build-firmware.py b/radio/util/build-firmware.py
index 11b85be7d..c27e6b58a 100755
--- a/radio/util/build-firmware.py
+++ b/radio/util/build-firmware.py
@@ -93,12 +93,14 @@ def main():
         maxsize = 65536 * 8
     elif options[optcount] == "x7":
         cmake_options["PCB"] = "X7"
-        firmware_options = options_taranis_x9dp
+        cmake_options["AFHDS3"] = "YES"
+        firmware_options = options_taranis_x7
         maxsize = 65536 * 8
     elif options[optcount] == "x7access":
         cmake_options["PCB"] = "X7"
         cmake_options["PCBREV"] = "ACCESS"
-        firmware_options = options_taranis_x9dp
+        cmake_options["AFHDS3"] = "YES"
+        firmware_options = options_taranis_x7
         maxsize = 65536 * 8
     elif board_name == "xlite":
         cmake_options["PCB"] = "XLITE"
@@ -119,6 +121,7 @@ def main():
     elif board_name == "x9d+2019":
         cmake_options["PCB"] = "X9D+"
         cmake_options["PCBREV"] = "2019"
+        cmake_options["AFHDS3"] = "YES"
         firmware_options = options_taranis_x9dp
         maxsize = 65536 * 8
     elif board_name == "x9e":
diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py
index 7227b3cef..fe5331cb0 100755
--- a/radio/util/fwoptions.py
+++ b/radio/util/fwoptions.py
@@ -97,6 +97,21 @@ options_taranis_x9dp = {
     "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
     "afhds3": ("AFHDS3", "YES", "NO")
 }
+options_taranis_x7 = {
+    "noheli": ("HELI", "NO", "YES"),
+    "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"),
+    "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"),
+    "nogvars": ("GVARS", "NO", "YES"),
+    "sqt5font": ("FONT", "SQT5", None),
+    "noras": ("RAS", "NO", "YES"),
+    "faimode": ("FAI", "YES", None),
+    "faichoice": ("FAI", "CHOICE", None),
+    "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
+    "internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"),
+    "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
+    "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
+    "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
+}
 
 options_taranis_x9lite = {
     "noheli": ("HELI", "NO", "YES"),
@@ -177,7 +192,6 @@ options_horus_x12s = {
     "pcbdev": ("PCBREV", "10", None),
     "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
     "internalaccess": [("INTERNAL_MODULE_PXX1", "NO", None), ("INTERNAL_MODULE_PXX2", "YES", None)],
-    "afhds3": ("AFHDS3", "YES", "NO")
 }
 
 options_horus_x10 = {
@@ -191,7 +205,6 @@ options_horus_x10 = {
     "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
     "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
     "internalaccess": [("INTERNAL_MODULE_PXX1", "NO", None), ("INTERNAL_MODULE_PXX2", "YES", None)],
-    "afhds3": ("AFHDS3", "YES", "NO")
 }
 
 options_horus_x10express = {
@@ -205,7 +218,6 @@ options_horus_x10express = {
     "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
     "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
     "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
-    "afhds3": ("AFHDS3", "YES", "NO")
 }
 
 options_jumper_t12 = {
@@ -232,7 +244,6 @@ options_jumper_t16 = {
     "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
     "internalmulti": ("INTERNAL_MODULE_MULTI", "YES", "NO"),
     "bluetooth": ("BLUETOOTH", "YES", "NO"),
-    "afhds3": ("AFHDS3", "YES", "NO")
 }
 
 options_jumper_t18 = {
@@ -245,7 +256,6 @@ options_jumper_t18 = {
     "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
     "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
     "bluetooth": ("BLUETOOTH", "YES", "NO"),
-    "afhds3": ("AFHDS3", "YES", "NO")
 }
 
 options_radiomaster_tx16s = {
@@ -259,5 +269,4 @@ options_radiomaster_tx16s = {
     "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
     "bluetooth": ("BLUETOOTH", "YES", "NO"),
     "internalgps": ("INTERNAL_GPS", "YES", "NO"),
-    "afhds3": ("AFHDS3", "YES", "NO")
 }
\ No newline at end of file