diff --git a/platformio.ini b/platformio.ini
index b53b165..38da924 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -27,3 +27,18 @@ lib_deps =
 	ottowinter/ESPAsyncWebServer-esphome@^2.0.1
 build_flags = -D BOARD_M5ATOM
 upload_port = /dev/esp32
+[env:m5stack-atom-canunit]
+board = m5stack-atom-canunit
+lib_deps =
+        ${env.lib_deps}
+        ottowinter/ESPAsyncWebServer-esphome@^2.0.1
+build_flags = -D BOARD_M5ATOM_CANUNIT
+upload_port = /dev/esp32
+[env:m5stick-atom-canunit]
+board = m5stick-atom-canunit
+lib_deps =
+        ${env.lib_deps}
+        ottowinter/ESPAsyncWebServer-esphome@^2.0.1
+build_flags = -D BOARD_M5STICK_CANUNIT
+upload_port = /dev/esp32
+
diff --git a/src/GwHardware.h b/src/GwHardware.h
index 483afd1..8e0fd9a 100644
--- a/src/GwHardware.h
+++ b/src/GwHardware.h
@@ -17,6 +17,12 @@
 #ifdef BOARD_M5ATOM
 #define ESP32_CAN_TX_PIN GPIO_NUM_22
 #define ESP32_CAN_RX_PIN GPIO_NUM_19
+#elif BOARD_M5ATOM_CANUNIT
+#define ESP32_CAN_TX_PIN GPIO_NUM_26
+#define ESP32_CAN_RX_PIN GPIO_NUM_32
+#elif BOARD_M5STICK_CANUNIT
+#define ESP32_CAN_TX_PIN GPIO_NUM_32
+#define ESP32_CAN_RX_PIN GPIO_NUM_33
 #else
 #define ESP32_CAN_TX_PIN GPIO_NUM_5  // Set CAN TX port to 5 (Caution!!! Pin 2 before)
 #define ESP32_CAN_RX_PIN GPIO_NUM_4  // Set CAN RX port to 4