diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 709b0a7a86..6f86a8a4ef 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,6 +74,7 @@ jobs:
           - "esp32dev-ble-datatest"
           - "esp32s3-dev-c1-ble"
           - "esp32c3-dev-m1-ble"
+          - "airm2m_core_esp32c3"
           - "thingpulse-espgateway"
           - "thingpulse-espgateway-ethernet"
     runs-on: ubuntu-latest
diff --git a/environments.ini b/environments.ini
index 774dd11fa7..e2656304c4 100644
--- a/environments.ini
+++ b/environments.ini
@@ -1483,6 +1483,25 @@ build_flags =
   '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"'
 custom_description = BLE gateway on the C3
 
+[env:airm2m_core_esp32c3]
+platform = ${com.esp32_c3_s3_platform}
+board = airm2m_core_esp32c3
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp.lib_deps}
+  ${libraries.wifimanager32}
+  ${libraries.ble}
+  ${libraries.decoder}
+build_flags =
+  ${com-esp.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DLED_INFO=19'
+  '-DLED_SEND_RECEIVE=20'
+  '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
+  '-DGateway_Name="OpenMQTTGateway_AirM2M_Core_ESP32C3"'
+custom_description = BLE gateway on the C3
+custom_hardware = AirM2M ESP32C3-CORE
+
 [env:thingpulse-espgateway]
 platform = ${com.esp32_platform}
 board = esp32dev
diff --git a/platformio.ini b/platformio.ini
index 179762a8f1..1f04a9410a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -68,6 +68,7 @@ extra_configs =
 ;default_envs = heltec-wifi-lora-32-915
 ;default_envs = heltec-rtl_433
 ;default_envs = esp32c3-dev-m1-ble
+;default_envs = airm2m_core_esp32c3
 ;default_envs = esp32s3-dev-c1-ble
 ;default_envs = nodemcuv2-rf
 ;default_envs = nodemcuv2-rf-cc1101