diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index e63a5e013..2916eb570 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -48,27 +48,18 @@ jobs:
           - el18
           - pl18
           - pl18ev
-          - t12
           - t12max
           - t15
           - t16
           - t18
-          - t8
-          - tlite
+          - tlite #STM32F2
           - t20
           - t14
           - t20v2
-          - tx12
+          - tx12 #STM32F2
           - x10
           - x12s
-          - x7
-          - x9d
-          - x9dp
           - x9e
-          - x9lite
-          - x9lites
-          - xlite
-          - xlites
           - mt12
           - gx12
           - nb4p
@@ -101,22 +92,20 @@ jobs:
         target:
           - nv14;el18
           - pl18;pl18ev
-          - t12;t12max
+          - t12max
           - t15;t16;t18
-          - t8;zorro;pocket;mt12;commando8
-          - tlite;tpro;tprov2;tpros;bumblebee;lr3pro
+          - zorro;pocket;mt12;commando8
+          - tprov2;tpros;bumblebee
           - t20;t20v2;t14
-          - tx12;tx12mk2;boxer;gx12
+          - tx12mk2;boxer;gx12
           - tx16s
           - f16
           - v12;v14;v16
           - x10;x10express
           - x12s
-          - x7;x7access
-          - x9d;x9dp;x9dp2019
+          - x7access
+          - x9dp2019
           - x9e;x9e-hall
-          - x9lite;x9lites
-          - xlite;xlites
           - mt12;gx12
           - nb4p
           - st16
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7fac3145e..ab027707e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -18,22 +18,20 @@ jobs:
         target:
           - nv14;el18
           - pl18;pl18ev
-          - t12;t12max
+          - t12max
           - t15;t16;t18
-          - t8;zorro;pocket;mt12;commando8
-          - tlite;tpro;tprov2;tpros;bumblebee;lr3pro
+          - zorro;pocket;mt12;commando8
+          - tprov2;tpros;bumblebee
           - t20;t20v2;t14
-          - tx12;tx12mk2;boxer;gx12
+          - tx12mk2;boxer;gx12
           - tx16s
           - f16
           - v16
           - x10;x10express
           - x12s
-          - x7;x7access
-          - x9d;x9dp;x9dp2019
+          - x7access
+          - x9dp2019
           - x9e;x9e-hall
-          - x9lite;x9lites
-          - xlite;xlites
           - mt12
           - nb4p
           - st16
diff --git a/fw.json b/fw.json
index f4b3cb9b7..76022a0ed 100644
--- a/fw.json
+++ b/fw.json
@@ -1,6 +1,5 @@
 {
     "targets": [
-        ["BETAFPV LiteRadio 3 Pro", "lr3pro-"],
         ["Fatfish F16","f16-"],
         ["Flysky EL18", "el18-"],
         ["Flysky NV14", "nv14-"],
@@ -11,23 +10,15 @@
         ["FrSky Horus X10", "x10-"],
         ["FrSky Horus X10 Express", "x10express-"],
         ["FrSky Horus X12s", "x12s-"],
-        ["FrSky QX7", "x7-"],
         ["FrSky QX7 Access", "x7access-"],
-        ["FrSky X9D", "x9d-"],
-        ["FrSky X9D Plus", "x9dp-"],
         ["FrSky X9D Plus 2019", "x9dp2019-"],
         ["FrSky X9E", "x9e-"],
         ["FrSky X9E Hall", "x9e-hall-"],
-        ["FrSky X9 Lite", "x9lite-"],
-        ["FrSky X9 Lite S", "x9lites-"],
-        ["FrSky X-Lite", "xlite-"],
-        ["FrSky X-Lite S", "xlites-"],
         ["HelloRadioSky V12", "v12-"],
         ["HelloRadioSky V14", "v14-"],
         ["HelloRadioSky V16", "v16-"],
         ["iFlight Commando 8", "commando8-"],
         ["Jumper Bumblebee", "bumblebee-"],
-        ["Jumper T12", "t12-"],
         ["Jumper T12 MAX", "t12max-"],
         ["Jumper T14", "t14-"],
         ["Jumper T15", "t15-"],
@@ -35,15 +26,11 @@
         ["Jumper T18", "t18-"],
         ["Jumper T20", "t20-"],
         ["Jumper T20 V2", "t20v2-"],
-        ["Jumper T-Lite", "tlite-"],
-        ["Jumper T-Pro", "tpro-"],
         ["Jumper T-Pro V2", "tprov2-"],
         ["Jumper T-Pro S", "tpros-"],
         ["RadioMaster Boxer", "boxer-"],
         ["RadioMaster MT12","mt12-"],
         ["RadioMaster Pocket", "pocket-"],
-        ["RadioMaster T8", "t8-"],
-        ["RadioMaster TX12", "tx12-"],
         ["RadioMaster TX12MK2", "tx12mk2-"],
         ["RadioMaster TX16S", "tx16s-"],
         ["RadioMaster Zorro","zorro-"],