diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini
index 6bf3766d..a7e6fe22 100644
--- a/variants/ebyte_eora_s3/platformio.ini
+++ b/variants/ebyte_eora_s3/platformio.ini
@@ -17,7 +17,6 @@ build_flags =
   -D PIN_USER_BTN=0
   -D PIN_BOARD_SDA=18
   -D PIN_BOARD_SCL=17
-  -D PIN_OLED_RESET=21
 
 ; SD_DAT0/MISO - GPIO2
 ; SD_DAT1 - GPIO4
@@ -25,6 +24,8 @@ build_flags =
 ; SD_DAT2 - GPIO112
 ; SD_DAT3/CS - GPIO113
 ; SD_CLK - GPIO114
+  -D PIN_BOARD_SDA=18
+  -D PIN_BOARD_SCL=17
 
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
diff --git a/variants/ebyte_eora_s3/target.cpp b/variants/ebyte_eora_s3/target.cpp
index 1c7b3b09..647f5997 100644
--- a/variants/ebyte_eora_s3/target.cpp
+++ b/variants/ebyte_eora_s3/target.cpp
@@ -3,8 +3,13 @@
 
 ESP32Board board;
 
-static SPIClass spi;
-RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
+#if defined(P_LORA_SCLK)
+  static SPIClass spi;
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
+#else
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
+#endif
+
 WRAPPER_CLASS radio_driver(radio, board);
 
 ESP32RTCClock fallback_clock;
@@ -24,7 +29,39 @@ bool radio_init() {
   fallback_clock.begin();
   rtc_clock.begin(Wire);
   
-  return radio.std_init(&spi);
+#ifdef SX126X_DIO3_TCXO_VOLTAGE
+  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
+#else
+  float tcxo = 1.6f;
+#endif
+
+#if defined(P_LORA_SCLK)
+  spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);
+#endif
+  int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, tcxo);
+  if (status != RADIOLIB_ERR_NONE) {
+    Serial.print("ERROR: radio init failed: ");
+    Serial.println(status);
+    return false;  // fail
+  }
+  
+  radio.setCRC(1);
+  
+#if defined(SX126X_RXEN) && defined(SX126X_TXEN)
+  radio.setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
+#endif
+
+#ifdef SX126X_CURRENT_LIMIT
+  radio.setCurrentLimit(SX126X_CURRENT_LIMIT);
+#endif
+#ifdef SX126X_DIO2_AS_RF_SWITCH
+  radio.setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
+#endif
+#ifdef SX126X_RX_BOOSTED_GAIN
+  radio.setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#endif
+
+  return true;  // success
 }
 
 uint32_t radio_get_rng_seed() {