diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini
index 6b7bfd4eab..218f642676 100644
--- a/variants/generic-e22/platformio.ini
+++ b/variants/generic-e22/platformio.ini
@@ -1,6 +1,6 @@
 [Generic_E22]
 extends = esp32_base
-board = esp32doit-devkit-v1
+board = esp32-s3-devkitc-1
 build_flags =
   ${esp32_base.build_flags}
   -I variants/generic-e22
@@ -25,7 +25,73 @@ build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/generic-e22>
 lib_deps =
   ${esp32_base.lib_deps}
-  adafruit/Adafruit SSD1306 @ ^2.5.13
+
+
+[env:Generic_E22_sx1262_900M33S_repeater] ; E22-900M33S
+extends = Generic_E22
+board = esp32-s3-devkitc-1
+build_src_filter = ${Generic_E22.build_src_filter}
+  +<../examples/simple_repeater/*.cpp>
+build_flags =
+    ${Generic_E22.build_flags}
+    -D RADIO_CLASS=CustomSX1262
+    -D WRAPPER_CLASS=CustomSX1262Wrapper
+    -D LORA_TX_POWER=9 ; if 900M30S tx = 22 ; if 900M33S tx = 9
+    -D ADVERT_NAME='""'
+    -D ADMIN_PASSWORD='""'
+    -D MAX_NEIGHBOURS=50
+    -D PIN_VBAT_READ=1
+    -D P_LORA_NSS=18
+    -D P_LORA_SCLK=5
+    -D P_LORA_MOSI=40
+    -D P_LORA_MISO=41
+    -D P_LORA_BUSY=15
+    -D P_LORA_DIO_1=16
+    -D P_LORA_RESET=17
+    -D SX126X_TXEN=13
+    -D SX126X_RXEN=14
+    -D SX126X_DIO2_AS_RF_SWITCH=false
+    -D SX126X_DIO3_TCXO_VOLTAGE=1.8
+    -D SX126X_CURRENT_LIMIT=140
+    -D SX126X_MAX_POWER=22
+    -D PIN_BOARD_SDA=-1
+    -D PIN_BOARD_SCL=-1
+    ;-D MESH_DEBUG=1
+lib_deps =
+  ${Generic_E22.lib_deps}
+  ${esp32_ota.lib_deps}
+
+[env:Generic_E22P_sx1262_868M30S_repeater] ; Ebyte E22P-868M30S
+extends = Generic_E22
+board = esp32-s3-devkitc-1
+build_src_filter = ${Generic_E22.build_src_filter}
+  +<../examples/simple_repeater/*.cpp>
+build_flags =
+    ${Generic_E22.build_flags}
+    -D RADIO_CLASS=CustomSX1262
+    -D WRAPPER_CLASS=CustomSX1262Wrapper
+    -D LORA_TX_POWER=22
+    -D ADVERT_NAME='""'
+    -D ADMIN_PASSWORD='""'
+    -D MAX_NEIGHBOURS=50
+    -D PIN_VBAT_READ=1
+    -D P_LORA_NSS=18
+    -D P_LORA_SCLK=5
+    -D P_LORA_MOSI=40
+    -D P_LORA_MISO=41
+    -D P_LORA_BUSY=15
+    -D P_LORA_DIO_1=16
+    -D P_LORA_RESET=17
+    -D SX126X_DIO2_AS_RF_SWITCH=true     
+    -D SX126X_DIO3_TCXO_VOLTAGE=1.8
+    -D SX126X_CURRENT_LIMIT=140
+    -D SX126X_MAX_POWER=22
+    -D PIN_BOARD_SDA=-1
+    -D PIN_BOARD_SCL=-1
+    ;-D MESH_DEBUG=1
+lib_deps =
+  ${Generic_E22.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Generic_E22_sx1262_repeater]
 extends = Generic_E22