diff --git a/.github/targets_validator.py b/.github/targets_validator.py
index aaf660b..b18b75a 100644
--- a/.github/targets_validator.py
+++ b/.github/targets_validator.py
@@ -95,10 +95,10 @@ def validate_devices(vendor, type, devname, device):
         platform = device['platform']
         if platform == 'stm32':
             validate_stm32(vendor, type, devname, device)
-        elif platform == 'esp32':
-            validate_esp32(vendor, type, devname, device)
         elif platform == 'esp8285':
             validate_esp8285(vendor, type, devname, device)
+        elif platform.startswith('esp32'):
+            validate_esp32(vendor, type, devname, device)
         else:
             error(f'invalid platform "{platform}" in device "{vendor}.{type}.{devname}"')
 
diff --git a/RX/DIY S3 DEVKIT 2400 True Diversity PWM 16.json b/RX/DIY S3 DEVKIT 2400 True Diversity PWM 16.json
new file mode 100644
index 0000000..e13e181
--- /dev/null
+++ b/RX/DIY S3 DEVKIT 2400 True Diversity PWM 16.json	
@@ -0,0 +1,38 @@
+{
+    "serial_rx":44,
+    "serial_tx":43,
+
+    "radio_miso":15,
+    "radio_mosi":16,
+    "radio_sck":7,
+
+    "radio_busy":4,
+    "radio_dio1":5,
+    "radio_rst":6,
+    "radio_nss":17,
+
+    "radio_busy_2":18,
+    "radio_dio1_2":8,
+    "radio_rst_2":3,
+    "radio_nss_2":46,
+
+    "power_min":0,
+    "power_high":0,
+    "power_max":0,
+    "power_default":0,
+    "power_control":0,
+    "power_values":[13],
+
+    "led_rgb":48,
+    "led_rgb_isgrb":true,
+    "ledidx_rgb_status":[0],
+    "ledidx_rgb_boot":[0],
+
+    "button": 0,
+
+    "vbat": 10,
+    "vbat_offset": -197,
+    "vbat_scale": 1200,
+
+    "pwm_outputs":[2,9,11,12,13,14,21,35,36,37,38,39,40,41,42,47]
+}
diff --git a/RX/DIY S3 DEVKIT 2400 True Diversity VTX PWM 11.json b/RX/DIY S3 DEVKIT 2400 True Diversity VTX PWM 11.json
new file mode 100644
index 0000000..9ad37d2
--- /dev/null
+++ b/RX/DIY S3 DEVKIT 2400 True Diversity VTX PWM 11.json	
@@ -0,0 +1,50 @@
+{
+    "serial_rx":44,
+    "serial_tx":43,
+
+    "radio_miso":15,
+    "radio_mosi":16,
+    "radio_sck":7,
+
+    "radio_busy":4,
+    "radio_dio1":5,
+    "radio_rst":6,
+    "radio_nss":17,
+
+    "radio_busy_2":18,
+    "radio_dio1_2":8,
+    "radio_rst_2":3,
+    "radio_nss_2":46,
+
+    "power_min":0,
+    "power_high":0,
+    "power_max":0,
+    "power_default":0,
+    "power_control":0,
+    "power_values":[13],
+
+    "led_rgb":48,
+    "led_rgb_isgrb":true,
+    "ledidx_rgb_status":[0],
+    "ledidx_rgb_boot":[0],
+
+    "button": 0,
+
+    "vbat": 10,
+    "vbat_offset": -197,
+    "vbat_scale": 1200,
+
+    "pwm_outputs":[2,9,11,12,13,14,21,35,36,37,38],
+
+    "vtx_nss": 39,
+    "vtx_miso": 40,
+    "vtx_mosi": 41,
+    "vtx_sck": 42,
+
+    "vtx_amp_pwm": 45,
+    "vtx_amp_vpd": 1,
+    "vtx_amp_vref": 47,
+
+    "vtx_amp_vpd_25mW": [600,600,600,600],
+    "vtx_amp_vpd_100mW": [1500,1500,1500,1500]
+}
diff --git a/TX/DIY S3 DEVKIT 2400 Gemini.json b/TX/DIY S3 DEVKIT 2400 Gemini.json
new file mode 100644
index 0000000..52a0cec
--- /dev/null
+++ b/TX/DIY S3 DEVKIT 2400 Gemini.json	
@@ -0,0 +1,32 @@
+{
+    "serial_rx":2,
+    "serial_tx":2,
+
+    "radio_miso":15,
+    "radio_mosi":16,
+    "radio_sck":7,
+
+    "radio_busy":4,
+    "radio_dio1":5,
+    "radio_rst":6,
+    "radio_nss":17,
+
+    "radio_busy_2":18,
+    "radio_dio1_2":8,
+    "radio_rst_2":3,
+    "radio_nss_2":46,
+
+    "power_min":0,
+    "power_high":0,
+    "power_max":0,
+    "power_default":0,
+    "power_control":0,
+    "power_values":[13],
+
+    "led_rgb":48,
+    "led_rgb_isgrb":true,
+    "ledidx_rgb_status":[0],
+    "ledidx_rgb_boot":[0],
+
+    "button": 0
+}
diff --git a/targets.json b/targets.json
index e4ae690..aa70b9a 100644
--- a/targets.json
+++ b/targets.json
@@ -393,6 +393,35 @@
                 "platform": "esp32",
                 "firmware": "Unified_ESP32_2400_TX",
                 "prior_target_name": "DIY_BLE_JOYSTICK"
+            },
+            "true_diversity_pwm16_s3": {
+                "product_name": "DIY ESP32-S3 DevKit Gemini 2.4Ghz TX ",
+                "lua_name": "Gemini S3 2G4",
+                "layout_file": "DIY S3 DEVKIT 2400 Gemini.json",
+                "upload_methods": ["uart", "wifi", "etx"],
+                "min_version": "3.4.0",
+                "platform": "esp32-s3",
+                "firmware": "Unified_ESP32S3_2400_TX"
+            }
+        },
+        "rx_2400": {
+            "true_diversity_pwm16_s3": {
+                "product_name": "DIY ESP32-S3 DevKit True Diversity 16xPWM 2.4Ghz RX ",
+                "lua_name": "16PWM TD 2.4RX",
+                "layout_file": "DIY S3 DEVKIT 2400 True Diversity PWM 16.json",
+                "upload_methods": ["uart", "wifi", "betaflight"],
+                "min_version": "3.4.0",
+                "platform": "esp32-s3",
+                "firmware": "Unified_ESP32S3_2400_RX"
+            },
+            "true_diversity_vtx_pwm11_s3": {
+                "product_name": "DIY ESP32-S3 DevKit True Diversity, VTX, 11xPWM 2.4Ghz RX ",
+                "lua_name": "VTX PWM TD 2.4RX",
+                "layout_file": "DIY S3 DEVKIT 2400 True Diversity VTX PWM 11.json",
+                "upload_methods": ["uart", "wifi", "betaflight"],
+                "min_version": "3.4.0",
+                "platform": "esp32-s3",
+                "firmware": "Unified_ESP32S3_2400_RX"
             }
         }
     },