diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9249783..037d12c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,6 +78,7 @@ jobs:
           - "esp32c3-dev-m1-ble"
           - "airm2m_core_esp32c3"
           - "lolin_c3_mini"
+          - "esp32c3-m5stamp"
           - "thingpulse-espgateway"
           - "theengs-bridge"
     runs-on: ubuntu-latest
diff --git a/environments.ini b/environments.ini
index e9daa6d..f6a4c6b 100644
--- a/environments.ini
+++ b/environments.ini
@@ -1731,6 +1731,28 @@ build_flags =
   '-DCONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=true'
   '-DCONFIG_ESP_CONSOLE_UART=ESP_CONSOLE_USB_SERIAL_JTAG'
 
+[env:esp32c3-m5stamp]
+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=3'
+  '-DANEOPIX_IND_DATA_GPIO=2'
+  '-DANEOPIX_IND_NUM_LEDS=1'
+  '-DRGB_INDICATORS=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 C3
+
 [env:thingpulse-espgateway]
 platform = ${com.esp32_platform}
 board = esp32dev