diff --git a/.github/workflows/build_firmware.yml b/.github/workflows/build_firmware.yml
index 4444e531b..79e0e4ecc 100644
--- a/.github/workflows/build_firmware.yml
+++ b/.github/workflows/build_firmware.yml
@@ -41,8 +41,8 @@ jobs:
 
       - name: Build images
         run: |
-          platformio run -e esp8266
-          platformio run -e esp32
+          platformio run -e esp8266-ci
+          platformio run -e esp32-ci
           
       - name: Delete
         uses: dev-drprasad/delete-tag-and-release@v0.1.2
diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml
index d89e2f30d..c43c0cda4 100644
--- a/.github/workflows/release_main.yml
+++ b/.github/workflows/release_main.yml
@@ -36,8 +36,8 @@ jobs:
 
       - name: Build images
         run: |
-          platformio run -e esp8266
-          platformio run -e esp32
+          platformio run -e esp8266-ci
+          platformio run -e esp32-ci
           
       - name: Changelog
         run: cat RELEASENOTES.md CHANGELOG_LATEST.md > BODY.txt 
diff --git a/debug_esp32_pio_local.ini b/debug_esp32_pio_local.ini
new file mode 100644
index 000000000..5fdf2b1df
--- /dev/null
+++ b/debug_esp32_pio_local.ini
@@ -0,0 +1,25 @@
+; ESP32 with debugger
+; do not build web
+; builds with DEBUG and TEST
+
+[platformio]
+default_envs = esp32
+
+[env]
+upload_port = COM3
+
+; upload_protocol = espota
+; upload_flags = 
+;   --port=8266
+;   --auth=ems-esp-neo
+; upload_port = ems-esp.local
+
+[common]
+debug_flags = -DEMSESP_DEBUG -DEMSESP_TEST -DEMSESP_FORCE_SERIAL
+
+[env:esp32]
+monitor_filters = esp32_exception_decoder
+debug_tool = esp-prog
+debug_init_break = tbreak setup
+build_type = debug
+extra_scripts =
diff --git a/debug_pio_local.ini b/debug_pio_local.ini
deleted file mode 100644
index 89cbe9dad..000000000
--- a/debug_pio_local.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[platformio]
-; default_envs = esp32-local
-default_envs = esp8266-local
-
-[env]
-; upload_port = COM3
-upload_port = COM7
-
-; upload_protocol = espota
-; upload_flags = 
-;   --port=8266
-;   --auth=ems-esp-neo
-; upload_port = ems-esp.local
-
-[common]
-debug_flags = -DEMSESP_DEBUG
-
-[env:esp32-local]
-monitor_filters = esp32_exception_decoder
-debug_tool = esp-prog
-debug_init_break = tbreak setup
-build_type = debug
-extra_scripts =
-  ; pre:scripts/build_interface.py
-
-[env:esp8266-local]
-monitor_filters = esp8266_exception_decoder
-extra_scripts =
-    ; pre:scripts/build_interface.py
-    scripts/main_script.py
-
diff --git a/example_esp8266_pio_local.ini b/example_esp8266_pio_local.ini
new file mode 100644
index 000000000..b7a63ef67
--- /dev/null
+++ b/example_esp8266_pio_local.ini
@@ -0,0 +1,18 @@
+; ESP8266
+; local example the does not build the web UI
+
+[platformio]
+default_envs = esp8266
+
+[env]
+; upload_port = COM3
+
+upload_protocol = espota
+upload_flags = 
+  --port=8266
+  --auth=ems-esp-neo
+upload_port = ems-esp.local
+
+[env:esp8266]
+extra_scripts =
+    scripts/main_script.py
diff --git a/example_pio_local.ini b/example_pio_local.ini
deleted file mode 100644
index 9cd8d72ff..000000000
--- a/example_pio_local.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[platformio]
-; default_envs = esp32-local
-default_envs = esp8266-local
-
-[env]
-; upload_port = COM3
-upload_port = COM7
-
-; upload_protocol = espota
-; upload_flags = 
-;   --port=8266
-;   --auth=ems-esp-neo
-; upload_port = ems-esp.local
-
-[common]
-
-[env:esp32-local]
-extra_scripts =
-  ; pre:scripts/build_interface.py
-
-[env:esp8266-local]
-extra_scripts =
-    ; pre:scripts/build_interface.py
-    scripts/main_script.py
-
diff --git a/platformio.ini b/platformio.ini
index 051069d01..e42dcbd82 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,8 +1,8 @@
 ; PlatformIO Project Configuration File for EMS-ESP
 
 [platformio]
-default_envs = esp8266-local
-; default_envs = esp32-local
+default_envs = esp8266
+; default_envs = esp32
 
 # override any settings with your own local ones in pio_local.ini
 extra_configs = 
@@ -45,7 +45,8 @@ check_flags =
     cppcheck: --std=c++11 -v
     clangtidy: --checks=-*,clang-analyzer-*,performance-*
 
-[env:esp8266]
+; build for GitHub Actions CI
+[env:esp8266-ci]
 extra_scripts = 
   scripts/main_script.py
   scripts/rename_fw.py
@@ -56,7 +57,8 @@ board_build.filesystem = littlefs
 board_build.f_cpu = 160000000L
 build_flags = ${common.build_flags}
 
-[env:esp32]
+; build for GitHub Actions CI
+[env:esp32-ci]
 extra_scripts = 
   scripts/rename_fw.py
   scripts/gzip_fw.py
@@ -65,7 +67,7 @@ platform = espressif32
 board_build.partitions = min_spiffs.csv 
 build_flags = ${common.build_flags}
 
-[env:esp8266-local]
+[env:esp8266]
 extra_scripts =
   pre:scripts/build_interface.py
   scripts/main_script.py
@@ -80,7 +82,7 @@ build_flags = ${common.build_flags} ${common.debug_flags}
 lib_ignore =
     AsyncTCP
 
-[env:esp32-local]
+[env:esp32]
 extra_scripts =
   pre:scripts/build_interface.py
 board = esp32dev