diff --git a/platformio.ini b/platformio.ini
index ae2a623..d33506f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,14 +9,14 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = generic
+default_envs = generic_esp32
 extra_configs =
     platformio_override.ini
 
 [env]
 ; Make sure to NOT add any spaces in the custom_ci_action property
 ; (also the position in the file is important)
-custom_ci_action = generic
+custom_ci_action = generic,generic_esp32
 
 framework = arduino
 platform = espressif32@6.3.1
@@ -54,15 +54,9 @@ upload_protocol = esptool
 ; upload_port = COM4
 
 
-[env:generic]
+[env:generic_esp32]
 board = esp32dev
 build_flags = ${env.build_flags}
-    -DHOYMILES_PIN_MISO=19
-    -DHOYMILES_PIN_MOSI=23
-    -DHOYMILES_PIN_SCLK=18
-    -DHOYMILES_PIN_IRQ=16
-    -DHOYMILES_PIN_CE=4
-    -DHOYMILES_PIN_CS=5
 
 
 [env:generic_esp32c3]
@@ -70,10 +64,28 @@ board = esp32dev
 board_build.mcu = esp32c3
 custom_patches = esp32c3
 build_flags = ${env.build_flags}
-    -DHOYMILES_PIN_MISO=9
-    -DHOYMILES_PIN_MOSI=10
-    -DHOYMILES_PIN_SCLK=8
-    -DHOYMILES_PIN_IRQ=3
+
+
+[env:generic_esp32s3]
+board = esp32-s3-devkitc-1
+build_flags = ${env.build_flags}
+
+
+[env:generic_esp32s3_usb]
+board = esp32-s3-devkitc-1
+upload_protocol = esp-builtin
+build_flags = ${env.build_flags}
+    -DARDUINO_USB_MODE=1
+    -DARDUINO_USB_CDC_ON_BOOT=1
+
+
+[env:generic]
+board = esp32dev
+build_flags = ${env.build_flags}
+    -DHOYMILES_PIN_MISO=19
+    -DHOYMILES_PIN_MOSI=23
+    -DHOYMILES_PIN_SCLK=18
+    -DHOYMILES_PIN_IRQ=16
     -DHOYMILES_PIN_CE=4
     -DHOYMILES_PIN_CS=5