diff --git a/.github/workflows/build_firmware.yml b/.github/workflows/build_firmware.yml
index 6792acf0..b87887e1 100644
--- a/.github/workflows/build_firmware.yml
+++ b/.github/workflows/build_firmware.yml
@@ -1,15 +1,15 @@
-name: Build Firmware
+name: Build ESP8266 Dev Firmware
 
 on:
   push:
     branches:
-      - dev
+      - esp8266_dev
     tags:
     #   - '*.*.*'
     paths:
     - 'CHANGELOG_LATEST.md'
   workflow_dispatch:
-    branches: [ dev ]
+    branches: [ esp8266_dev ]
 
 jobs:
         
@@ -44,7 +44,6 @@ jobs:
       - name: Build images
         run: |
           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 c43c0cda..f1841e80 100644
--- a/.github/workflows/release_main.yml
+++ b/.github/workflows/release_main.yml
@@ -1,8 +1,8 @@
-name: Release Main
+name: Release Stable ESP8266
 
 on:
   workflow_dispatch:
-    branches: [ main ]
+    branches: [ stable_esp8266 ]
 
 jobs:
         
@@ -37,7 +37,6 @@ jobs:
       - name: Build images
         run: |
           platformio run -e esp8266-ci
-          platformio run -e esp32-ci
           
       - name: Changelog
         run: cat RELEASENOTES.md CHANGELOG_LATEST.md > BODY.txt 
diff --git a/.github/workflows/standalone_build.yml b/.github/workflows/standalone_build.yml
index 0b537939..398493a1 100644
--- a/.github/workflows/standalone_build.yml
+++ b/.github/workflows/standalone_build.yml
@@ -2,7 +2,7 @@ name: Standalone Build
 
 on:
   push:
-    branches: [ dev ]
+    branches: [ dev_esp8266 ]
     paths:
     - 'src/**'
     
diff --git a/RELEASENOTES_DEV.md b/RELEASENOTES_DEV.md
index 623978f9..94500684 100644
--- a/RELEASENOTES_DEV.md
+++ b/RELEASENOTES_DEV.md
@@ -1,6 +1,6 @@
 # ![logo](https://github.com/proddy/EMS-ESP/blob/main/media/EMS-ESP_logo_dark.png)
 
-This is a snapshot of the current "beta" development code and firmware binaries using the `dev` branch. It has all the latest features and fixes but please be aware that this is still experimental firmware used for testing and thus may contain the odd bug. Use at your own risk and remember to report an issue if you find something unusual.
+This is a snapshot of the current "beta" development code and firmware binaries for the ESP8266. It has all the latest features and fixes but please be aware that this is still experimental firmware used for testing and thus may contain the odd bug. Use at your own risk and remember to report an issue if you find something unusual.
 
 # Firmware Installation
 
diff --git a/debug_esp32_pio_local.ini b/debug_esp32_pio_local.ini
deleted file mode 100644
index b32b1e3f..00000000
--- a/debug_esp32_pio_local.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-; 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 =
-  ; pre:scripts/build_interface.py
-  scripts/rename_fw.py
-
diff --git a/example_esp8266_pio_local.ini b/pio_local.ini_example
similarity index 100%
rename from example_esp8266_pio_local.ini
rename to pio_local.ini_example
diff --git a/platformio.ini b/platformio.ini
index 520a3412..2bf3a155 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2,7 +2,6 @@
 
 [platformio]
 default_envs = esp8266
-; default_envs = esp32
 
 # override any settings with your own local ones in pio_local.ini
 extra_configs = 
@@ -56,15 +55,6 @@ board_build.filesystem = littlefs
 board_build.f_cpu = 160000000L
 build_flags = ${common.build_flags}
 
-; build for GitHub Actions CI
-[env:esp32-ci]
-extra_scripts = 
-  scripts/rename_fw.py
-board = esp32dev
-platform = espressif32
-board_build.partitions = min_spiffs.csv 
-build_flags = ${common.build_flags}
-
 [env:esp8266]
 extra_scripts =
   pre:scripts/build_interface.py
@@ -80,13 +70,3 @@ board_build.f_cpu = 160000000L ; 160MHz
 build_flags = ${common.build_flags} ${common.debug_flags}
 lib_ignore =
     AsyncTCP
-
-[env:esp32]
-extra_scripts =
-  pre:scripts/build_interface.py
-  scripts/rename_fw.py
-board = esp32dev
-platform = espressif32
-; platform = https://github.com/platformio/platform-espressif32.git
-board_build.partitions = min_spiffs.csv ; https://github.com/espressif/arduino-esp32/blob/master/tools/partitions/
-build_flags = ${common.build_flags} ${common.debug_flags}