diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4361b12..63b481b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -81,6 +81,8 @@ jobs:
           - "theengs-bridge-v11"
           - "theengs-plug"
           - "esp32dev-ble-broker"
+          - "esp32s3-m5stack-stamps3"
+          - "esp32c3u-m5stamp"
     runs-on: ubuntu-latest
     name: Build with PlatformIO
     steps:
diff --git a/environments.ini b/environments.ini
index d7ac3a8..e244eef 100644
--- a/environments.ini
+++ b/environments.ini
@@ -1654,6 +1654,24 @@ build_flags =
   '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = BLE gateway on the S3
 
+[env:esp32s3-m5stack-stamps3]
+platform = ${com.esp32_platform}
+board = esp32-s3-devkitc-1
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.ble}
+  ${libraries.decoder}
+  ${libraries.adafruit_neopixel}
+build_flags =
+  ${com-esp32.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DLED_ADDRESSABLE_PIN1=21'
+  '-DLED_ADDRESSABLE_NUM=1'
+  '-DLED_ADDRESSABLE=true'
+  '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
+  '-DGateway_Name="OMG_ESP32_BLE"'
+custom_description = BLE gateway on the M5Stack StampS3
+
 [env:esp32s3-atomS3U]
 platform = ${com.esp32_platform}
 board = m5stack-atoms3
@@ -1787,6 +1805,7 @@ build_flags =
   '-DCONFIG_ESP_CONSOLE_UART=ESP_CONSOLE_USB_SERIAL_JTAG'
 
 [env:esp32c3-m5stamp]
+; https://docs.m5stack.com/en/core/stamp_c3 
 platform = ${com.esp32_platform}
 board = esp32-c3-devkitm-1
 board_build.partitions = min_spiffs.csv
@@ -1808,6 +1827,29 @@ build_flags =
 custom_description = BLE gateway on ESP32C3
 custom_hardware = M5Stamp C3
 
+[env:esp32c3u-m5stamp]
+; https://docs.m5stack.com/en/core/stamp_c3u 
+platform = ${com.esp32_platform}
+board = esp32-c3-devkitm-1
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.wifimanager32}
+  ${libraries.ble}
+  ${libraries.decoder}
+  ${libraries.adafruit_neopixel}
+build_flags =
+  ${com-esp32.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DTRIGGER_GPIO=9'
+  '-DLED_ADDRESSABLE_PIN1=2'
+  '-DLED_ADDRESSABLE_NUM=1'
+  '-DLED_ADDRESSABLE=true'
+  '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
+  '-DUSE_MAC_AS_GATEWAY_NAME'
+custom_description = BLE gateway on ESP32C3
+custom_hardware = M5Stamp C3U
+
 [env:thingpulse-espgateway]
 platform = ${com.esp32_platform}
 board = esp32dev
diff --git a/platformio.ini b/platformio.ini
index 7f724a4..e82ab3f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -103,6 +103,9 @@ extra_configs =
 ;default_envs = thingpulse-espgateway
 ;default_envs = theengs-bridge
 ;default_envs = esp32dev-ble-idf
+;default_envs = esp32s3-m5stack-stamps3
+;default_envs = esp32c3-m5stamp
+;default_envs = esp32c3u-m5stamp
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;                              ENVIRONMENTS PARAMETERS                                 ;