diff --git a/boards/waveshare-esp32-s3-zero.json b/boards/waveshare-esp32-s3-zero.json
index 9e48bd498..824c3a493 100644
--- a/boards/waveshare-esp32-s3-zero.json
+++ b/boards/waveshare-esp32-s3-zero.json
@@ -7,9 +7,11 @@
     "core": "esp32",
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_ESP32_S3_ZERO",
+      "-DARDUINO_WAVESHARE_ESP32_S3_ZERO",
       "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_USB_CDC_ON_BOOT=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
diff --git a/boards/waveshare_esp32-s3-lcd-1_69.json b/boards/waveshare_esp32-s3-lcd-1_69.json
index bbb89820b..50d87a125 100644
--- a/boards/waveshare_esp32-s3-lcd-1_69.json
+++ b/boards/waveshare_esp32-s3-lcd-1_69.json
@@ -7,9 +7,11 @@
     "core": "esp32",
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_ESP32_S3_LCD_1_69",
+      "-DARDUINO_WAVESHARE_ESP32_S3_LCD_1_69",
       "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_USB_CDC_ON_BOOT=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
diff --git a/boards/waveshare_esp32-s3-touch-lcd-1_69.json b/boards/waveshare_esp32-s3-touch-lcd-1_69.json
index ea4ceefba..3ed27d5a7 100644
--- a/boards/waveshare_esp32-s3-touch-lcd-1_69.json
+++ b/boards/waveshare_esp32-s3-touch-lcd-1_69.json
@@ -7,9 +7,11 @@
     "core": "esp32",
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_ESP32_S3_TOUCH_LCD_1_69",
+      "-DARDUINO_WAVESHARE_ESP32_S3_TOUCH_LCD_1_69",
       "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_USB_CDC_ON_BOOT=1"
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",