diff --git a/platformio.ini b/platformio.ini
index 2a3fea0c..9be3be7a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -35,6 +35,8 @@ extra_configs =
 ;default_envs = esp32dev-pilight
 ;default_envs = esp32dev-ir
 ;default_envs = esp32dev-ble
+;default_envs = esp32-m5stick-ble
+;default_envs = esp32-m5stack-ble
 ;default_envs = esp32-m5stick-c-ble
 ;default_envs = ttgo-lora32-v1
 ;default_envs = nodemcuv2-rf
@@ -229,6 +231,39 @@ build_flags =
   '-DZgatewayBT="BT"'
   '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"'
 
+[env:esp32-m5stick-ble]
+platform = ${com.esp32_platform}
+board = m5stack-core-esp32
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp.lib_deps}
+  ${libraries.ble}
+  ${libraries.irremoteesp}
+build_flags = 
+  ${com-esp.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DZgatewayIR="IR"'
+  '-DTRIGGER_PIN=35'
+  '-DIR_EMITTER_PIN=17'
+  '-DGateway_Name="OpenMQTTGateway_ESP32_M5STICK_BLE_IR"'
+board_upload.speed = 921600
+
+[env:esp32-m5stack-ble]
+platform = ${com.esp32_platform}
+board = m5stack-core-esp32
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp.lib_deps}
+  ${libraries.ble}
+build_flags = 
+  ${com-esp.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DZsensorGPIOInput="GPIOInput"'
+  '-DTRIGGER_PIN=37'
+  '-DGPIOInput_PIN=39'
+  '-DGateway_Name="OpenMQTTGateway_ESP32_M5STACK_BLE"'
+board_upload.speed = 921600
+
 [env:esp32-m5stick-c-ble]
 platform = ${com.esp32_platform}
 board = m5stick-c
@@ -243,6 +278,7 @@ build_flags =
   '-DZgatewayIR="IR"'
   '-DZsensorGPIOInput="GPIOInput"'
   '-DGPIOInput_PIN=37'
+  '-DTRIGGER_PIN=39'
   '-DIR_EMITTER_PIN=9'
   '-DGateway_Name="OpenMQTTGateway_ESP32_M5STICK_C_BLE_IR"'
 board_upload.speed = 1500000