diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 316f60f..8fc4fcb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,6 +33,7 @@ jobs:
           - "esp32-m5tough-ble"
           - "esp32-m5stick-c-ble"
           - "esp32-m5stick-cp-ble"
+          - "esp32s3-atomS3U"
           - "esp32-m5atom-matrix"
           - "esp32-m5atom-lite"
           - "esp32dev-rtl_433"
diff --git a/environments.ini b/environments.ini
index 8f7cecb..dcb8db0 100644
--- a/environments.ini
+++ b/environments.ini
@@ -1476,6 +1476,30 @@ build_flags =
   '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = BLE gateway on the S3
 
+[env:esp32s3-atomS3U]
+platform = ${com.esp32_platform}
+board = m5stack-atoms3
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.ble}
+  ${libraries.decoder}
+  ${libraries.adafruit_neopixel}
+  ${libraries.irremoteesp}
+build_flags =
+  ${com-esp32.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DZgatewayIR="IR"'
+  '-DANEOPIX_IND_DATA_GPIO=35'
+  '-DANEOPIX_IND_NUM_LEDS=1'
+  '-DRGB_INDICATORS=true'
+  '-DTRIGGER_GPIO=41'
+  '-DIR_EMITTER_GPIO=12'
+  '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
+  '-DGateway_Name="OMG_ATOMS3_BLE"'
+board_upload.speed = 921600
+custom_description = USB module with BLE gateway, and IR emitter
+custom_hardware = AtomS3U ESP32S3
+
 [env:esp32c3-dev-m1-ble]
 platform = ${com.esp32_platform}
 board = esp32-c3-devkitm-1
diff --git a/platformio.ini b/platformio.ini
index 818bae7..282091a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -57,6 +57,7 @@ extra_configs =
 ;default_envs = esp32-m5stick-cp-ble
 ;default_envs = esp32-m5atom-matrix
 ;default_envs = esp32-m5atom-lite
+;default_envs = esp32s3-atomS3U
 ;default_envs = esp32doitv1-aithinker-r01-sx1278
 ;default_envs = esp32dev-rtl_433
 ;default_envs = heltec-rtl_433