diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad1efc7..492881f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -77,6 +77,7 @@ jobs:
           - "airm2m_core_esp32c3"
           - "lolin_c3_mini"
           - "thingpulse-espgateway"
+          - "theengs-bridge"
     runs-on: ubuntu-latest
     name: Build with PlatformIO
     steps:
diff --git a/environments.ini b/environments.ini
index 8f56b16..2792830 100644
--- a/environments.ini
+++ b/environments.ini
@@ -48,6 +48,44 @@ board_build.ldscript = eagle.flash.1m64.ld ;this frees more space for firmware u
 custom_description = RF gateway for the Sonoff RF Bridge requiring direct hack, relying on ESPilight library, [tutorial](https://1technophile.blogspot.com/2019/04/sonoff-rf-bridge-pilight-or-how-to.html).
 custom_hardware = RFBridge v1
 
+[env:theengs-bridge]
+platform = ${com.esp32_platform}
+board = esp32dev
+board_build.partitions = min_spiffs.csv
+lib_deps =
+  ${com-esp32.lib_deps}
+  ${libraries.ble}
+  ${libraries.adafruit_neopixel}
+  ${libraries.decoder}
+build_flags =
+  ${com-esp32.build_flags}
+  '-DZgatewayBT="BT"'
+  '-DLED_SEND_RECEIVE=2'
+  '-DLED_SEND_RECEIVE_ON=0'
+  '-DESP32_ETHERNET=true'
+  '-DETH_PHY_TYPE=ETH_PHY_LAN8720'
+  '-DETH_PHY_ADDR=0'
+  '-DETH_PHY_POWER=5'
+  '-DETH_PHY_MDC=23'
+  '-DETH_PHY_MDIO=18'
+  '-DETH_CLK_MODE=ETH_CLOCK_GPIO16_OUT'
+  '-DANEOPIX_IND_DATA_GPIO=32'
+  '-DANEOPIX_IND_NUM_LEDS=4'
+  '-DANEOPIX_INFO_LED=0'
+  '-DANEOPIX_SEND_RECEIVE_LED=1'
+  '-DANEOPIX_ERROR_LED=1'
+  '-DANEOPIX_BRIGHTNESS=10'
+  '-DRGB_INDICATORS=true'
+  '-DAttemptBLEConnect=false'
+  '-DUSE_MAC_AS_GATEWAY_NAME'
+  '-DGATEWAY_MANUFACTURER="Theengs"'
+  '-DGATEWAY_MODEL="TBRIDGE01"'
+  ;'-DBOARD_HAS_PSRAM'
+  '-UZwebUI="WebUI"' ; Disable WebUI
+  ;'-mfix-esp32-psram-cache-issue'
+custom_description = BLE gateway with external antenna and Ethernet/WiFi connectivity, [user guide](https://tbridge01.theengs.io/)
+custom_hardware = Theengs Bridge gateway ethernet
+
 [env:esp32dev-all-test]
 platform = ${com.esp32_platform}
 board = esp32dev
diff --git a/platformio.ini b/platformio.ini
index b208df6..222e5b3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -100,6 +100,7 @@ extra_configs =
 ;default_envs = esp32c3-dev-c2-ble
 ;default_envs = lolin_c3_mini
 ;default_envs = thingpulse-espgateway
+;default_envs = theengs-bridge
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;                              ENVIRONMENTS PARAMETERS                                 ;
diff --git a/scripts/gen_wu.py b/scripts/gen_wu.py
index ab5f85c..a440a4f 100644
--- a/scripts/gen_wu.py
+++ b/scripts/gen_wu.py
@@ -124,7 +124,7 @@ with open(manif_path + filename, 'wb') as output_file:
 
 for item in range(len(assets)):
     name = assets[item]['name']
-    if 'firmware.bin' in name and ('esp32' in name or 'ttgo' in name or 'heltec' in name or 'thingpulse' in name or 'lilygo' in name or 'shelly' in name or 'lolin_c3' in name or 'tinypico' in name):
+    if 'firmware.bin' in name and ('esp32' in name or 'ttgo' in name or 'heltec' in name or 'thingpulse' in name or 'theengs' in name or 'lilygo' in name or 'shelly' in name or 'lolin_c3' in name or 'tinypico' in name):
         fw = name.split('-firmware')[0]
         man_file = fw + '.manifest.json'
         fw_url = assets[item]['browser_download_url']
diff --git a/scripts/gen_wu_dev.py b/scripts/gen_wu_dev.py
index 9457d09..36e3127 100644
--- a/scripts/gen_wu_dev.py
+++ b/scripts/gen_wu_dev.py
@@ -111,7 +111,7 @@ with open(manif_path + filename, 'wb') as output_file:
     output_file.write(boot_bin.content)
 
 for name in os.listdir(bin_path):
-    if 'firmware.bin' in name and ('esp32' in name or 'ttgo' in name or 'heltec' in name or 'thingpulse' in name or 'lilygo' in name or 'shelly' in name or 'lolin_c3' in name or 'tinypico' in name):
+    if 'firmware.bin' in name and ('esp32' in name or 'ttgo' in name or 'heltec' in name or 'thingpulse' in name or 'theengs' in name or 'lilygo' in name or 'shelly' in name or 'lolin_c3' in name or 'tinypico' in name):
         fw = name.split('-firmware')[0]
         man_file = fw + '.manifest.json'
         print('Bin name:' + name)