diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eebcbc69d8..f4bce91139 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,6 +76,7 @@ jobs:
           - "esp32s3-dev-c1-ble"
           - "esp32c3-dev-m1-ble"
           - "airm2m_core_esp32c3"
+          - "lolin_c3_mini"
           - "thingpulse-espgateway"
           - "thingpulse-espgateway-ethernet"
     runs-on: ubuntu-latest
diff --git a/environments.ini b/environments.ini
index c37fa4547a..e591b87477 100644
--- a/environments.ini
+++ b/environments.ini
@@ -1539,6 +1539,43 @@ build_flags =
 custom_description = BLE gateway on the C3
 custom_hardware = AirM2M ESP32C3-CORE
 
+; Wemos Lolin C3 mini v2.3.0
+[env:lolin_c3_mini]
+;platform = ${com.esp32_c3_s3_platform} ; standard is @5.2.0, causes `assert rwble.c 261` error
+platform = espressif32@5.3.0  ; override to @5.3.0. Includes a fixed for the `assert rwble.c 261` error
+board = lolin_c3_mini
+board_build.partitions = min_spiffs.csv
+monitor_speed = 115200
+lib_deps =
+  ${com-esp.lib_deps}
+  ${libraries.wifimanager32}
+  ${libraries.ble}
+  ${libraries.decoder}
+build_flags =
+  ${com-esp.build_flags}
+  '-DZgatewayBT="BT"'
+; FastLED must be disabled. FastLED is not compatible with this board at the current moment.
+; The LED pins must still be defined, to avoid an error loop on pin definitions.
+; Available GPIOs are 0 - 8, 10, 20, 21.
+; See https://community.openmqttgateway.com/t/watchdog-kills-omg-on-esp32-c3-within-seconds/2192/15
+  '-DLED_SEND_RECEIVE=10'
+  '-DLED_INFO=6'
+  '-DLED_ERROR=7'
+  '-DTRIGGER_GPIO=9'
+  '-DNO_INT_TEMP_READING=true' ; No internal temperature on ESP32 C3 or S3
+  '-DGateway_Name="OpenMQTTGateway_ESP32C3_BLE"'
+custom_description = BLE gateway on ESP32C3
+custom_hardware = Wemos Lolin C3 mini v2.3.0
+
+; Serial output currently causes a delay on each message, if no serial listener is connected.
+; Use the _no_serial environment unless you are actively debugging.
+[env:lolin_c3_mini_no_serial]
+extends = env:lolin_c3_mini
+build_flags =
+  ${env:lolin_c3_mini.build_flags}
+  '-DLOG_LEVEL=LOG_LEVEL_SILENT'  ; disable serial logging.
+  '-DWM_DEBUG_LEVEL=0'
+
 [env:thingpulse-espgateway]
 platform = ${com.esp32_platform}
 board = esp32dev
diff --git a/platformio.ini b/platformio.ini
index 0a18c6d222..df3d6ae573 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -98,6 +98,7 @@ extra_configs =
 ;default_envs = esp32s3-dev-c1-ble
 ;default_envs = esp32c3-dev-m1-ble
 ;default_envs = airm2m_core_esp32c3
+;default_envs = lolin_c3_mini
 ;default_envs = thingpulse-espgateway
 ;default_envs = thingpulse-espgateway-ethernet