diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 491d865..08c5df7 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         board: [esp32, esp32-s3, esp32-s3-oct, esp32-c3, esp32-c6, esp32-h2, esp32-solo1]
-        build: [release, debug]
+        build: [release]
     env:
       BOARD: ${{ matrix.board }}
       VARIANT: ${{ matrix.name || matrix.board }}
@@ -107,24 +107,16 @@ jobs:
         with:
           path: release
           pattern: '*-release-assets'
-      - name: Download debug assets
-        uses: actions/download-artifact@v4
-        with:
-          path: debug
-          pattern: '*-debug-assets'
       - name: Copy binaries to ota/beta
         env:
           Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
         run: |
           mkdir -p ota/beta/
-          mkdir -p ota/debug/beta/
           mkdir -p ota/master/
-          mkdir -p ota/debug/master/
           mkdir -p webflash/
           mkdir -p resources/
           mkdir -p src/
           cp -vf release/*/nuki_hub_*.bin ota/beta/
-          cp -vf debug/*/nuki_hub_*.bin ota/debug/beta/
           cp -vf master/resources/ota_manifest.py resources/ota_manifest.py
           cp -vf master/src/Config.h src/Config.h
           python3 resources/ota_manifest.py beta $Version
@@ -132,14 +124,12 @@ jobs:
           rm -rf .github .gitignore .gitmodules
           touch ota/beta/empty
           touch ota/master/empty
-          touch ota/debug/beta/empty
-          touch ota/debug/master/empty
           touch webflash/empty
       - name: Commit binaries to binary
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "Update binaries"
-          file_pattern: 'ota/* ota/debug/* ota/master/* ota/debug/master/* ota/beta/* ota/debug/beta/* webflash/*'
+          file_pattern: 'ota/* ota/master/* ota/beta/* webflash/*'
           branch: binary
           skip_dirty_check: true
           skip_fetch: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6305dc1..6c9b069 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         board: [esp32, esp32-s3, esp32-s3-oct, esp32-c3, esp32-c6, esp32-h2, esp32-solo1]
-        build: [release, debug]
+        build: [release]
     env:
       BOARD: ${{ matrix.board }}
       VARIANT: ${{ matrix.name || matrix.board }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 652ee9d..58073db 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         board: [esp32, esp32-s3, esp32-s3-oct, esp32-c3, esp32-c6, esp32-h2, esp32-solo1]
-        build: [release, debug]
+        build: [release]
     env:
       BOARD: ${{ matrix.board }}
       VARIANT: ${{ matrix.name || matrix.board }}
@@ -130,19 +130,12 @@ jobs:
         with:
           path: release
           pattern: '*-release-assets'
-      - name: Download debug assets
-        uses: actions/download-artifact@v4
-        with:
-          path: debug
-          pattern: '*-debug-assets'
       - name: Copy binaries to ota/master
         env:
           Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
         run: |
           mkdir -p ota/beta/
-          mkdir -p ota/debug/beta/
           mkdir -p ota/master/
-          mkdir -p ota/debug/master/
           mkdir -p webflash/
           mkdir -p resources/
           mkdir -p src/
@@ -155,14 +148,12 @@ jobs:
           rm -rf .github .gitignore .gitmodules
           touch ota/beta/empty
           touch ota/master/empty
-          touch ota/debug/beta/empty
-          touch ota/debug/master/empty
           touch webflash/empty
       - name: Commit binaries to binary
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "Update binaries"
-          file_pattern: 'ota/* ota/debug/* ota/master/* ota/debug/master/* ota/beta/* ota/debug/beta/* webflash/*'
+          file_pattern: 'ota/* ota/master/* ota/beta/* webflash/*'
           branch: binary
           skip_dirty_check: true
           skip_fetch: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d1765e0..3c8b957 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         board: [esp32, esp32-s3, esp32-s3-oct, esp32-c3, esp32-c6, esp32-h2, esp32-solo1]
-        build: [release, debug]
+        build: [release]
     env:
       BOARD: ${{ matrix.board }}
       VARIANT: ${{ matrix.name || matrix.board }}
@@ -109,11 +109,6 @@ jobs:
         with:
           path: release
           pattern: '*-release-assets'
-      - name: Download debug assets
-        uses: actions/download-artifact@v4
-        with:
-          path: debug
-          pattern: '*-debug-assets'
       - name: Build zip archives
         id: zip
         env:
@@ -171,14 +166,11 @@ jobs:
           Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
         run: |
           mkdir -p ota/beta/
-          mkdir -p ota/debug/beta/
           mkdir -p ota/master/
-          mkdir -p ota/debug/master/
           mkdir -p webflash/
           mkdir -p resources/
           mkdir -p src/
           cp -vf release/*/nuki_hub_*.bin ota/
-          cp -vf debug/*/nuki_hub_*.bin ota/debug/
           cp -vf release/*/webflash_nuki_hub_*.bin webflash/
           cp -vf master/resources/ota_manifest.py resources/ota_manifest.py
           cp -vf master/src/Config.h src/Config.h
@@ -186,18 +178,15 @@ jobs:
           python3 resources/ota_manifest.py beta none
           find * -not -path "ota*" -not -path "webflash*" -delete
           rm -rf ota/beta/*.bin
-          rm -rf ota/debug/beta/*.bin
           rm -rf .github .gitignore .gitmodules
           touch ota/beta/empty
           touch ota/master/empty
-          touch ota/debug/beta/empty
-          touch ota/debug/master/empty
           touch webflash/empty
       - name: Commit binaries to binary
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "Update binaries"
-          file_pattern: 'ota/* ota/debug/* ota/master/* ota/debug/master/* ota/beta/* ota/debug/beta/* webflash/*'
+          file_pattern: 'ota/* ota/master/* ota/beta/* webflash/*'
           branch: binary
           skip_dirty_check: true
           skip_fetch: true
diff --git a/README.md b/README.md
index 85cc049..7d13464 100644
--- a/README.md
+++ b/README.md
@@ -309,7 +309,7 @@ In a browser navigate to the IP address assigned to the ESP32.
 
 - User: Pick a username to enable HTTP authentication for the Web Configuration, Set to "#" to disable authentication.
 - Password/Retype password: Pick a password to enable HTTP authentication for the Web Configuration.
-- Use Digest Authentication (more secure): Enable to use HTTP Digest Authentication instead of HTTP Basic Authentication. Digest authentication is more secure, especially over unencrypted (HTTP) connections.
+- HTTP Authentication type: Select from Basic, Digest or Form based authentication. Digest authentication is more secure than Basic or Form based authentication, especially over unencrypted (HTTP) connections. Form based authentication works best with password managers. Note: Firefox seems to have issues with basic authentication.
 
 #### Nuki Lock PIN / Nuki Opener PIN
 
diff --git a/src/WebCfgServer.cpp b/src/WebCfgServer.cpp
index 924428f..a851b96 100644
--- a/src/WebCfgServer.cpp
+++ b/src/WebCfgServer.cpp
@@ -485,7 +485,8 @@ void WebCfgServer::initialize()
             }
             else if (value == "otadebug")
             {
-                return buildOtaHtml(request, resp, true);
+                return buildOtaHtml(request, resp);
+                //return buildOtaHtml(request, resp, true);
             }
             else if (value == "reboottoota")
             {
@@ -5927,6 +5928,7 @@ esp_err_t WebCfgServer::processUpdate(PsychicRequest *request, PsychicResponse*
 
     if(request->hasParam("beta"))
     {
+        /*
         if(request->hasParam("debug"))
         {
             res = buildConfirmHtml(request, resp, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest DEBUG BETA version", 2, true);
@@ -5935,13 +5937,15 @@ esp_err_t WebCfgServer::processUpdate(PsychicRequest *request, PsychicResponse*
         }
         else
         {
-            res = buildConfirmHtml(request, resp, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest BETA version", 2, true);
-            _preferences->putString(preference_ota_updater_url, GITHUB_BETA_UPDATER_BINARY_URL);
-            _preferences->putString(preference_ota_main_url, GITHUB_BETA_RELEASE_BINARY_URL);
-        }
+        */
+        res = buildConfirmHtml(request, resp, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest BETA version", 2, true);
+        _preferences->putString(preference_ota_updater_url, GITHUB_BETA_UPDATER_BINARY_URL);
+        _preferences->putString(preference_ota_main_url, GITHUB_BETA_RELEASE_BINARY_URL);
+        //}
     }
     else if(request->hasParam("master"))
     {
+        /*
         if(request->hasParam("debug"))
         {
             res = buildConfirmHtml(request, resp, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest DEBUG DEVELOPMENT version", 2, true);
@@ -5950,10 +5954,11 @@ esp_err_t WebCfgServer::processUpdate(PsychicRequest *request, PsychicResponse*
         }
         else
         {
-            res = buildConfirmHtml(request, resp, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest DEVELOPMENT version", 2, true);
-            _preferences->putString(preference_ota_updater_url, GITHUB_MASTER_UPDATER_BINARY_URL);
-            _preferences->putString(preference_ota_main_url, GITHUB_MASTER_RELEASE_BINARY_URL);
-        }
+        */
+        res = buildConfirmHtml(request, resp, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest DEVELOPMENT version", 2, true);
+        _preferences->putString(preference_ota_updater_url, GITHUB_MASTER_UPDATER_BINARY_URL);
+        _preferences->putString(preference_ota_main_url, GITHUB_MASTER_RELEASE_BINARY_URL);
+        //}
     }
     #if defined(CONFIG_IDF_TARGET_ESP32S3)
     else if(request->hasParam("other"))
@@ -5965,6 +5970,7 @@ esp_err_t WebCfgServer::processUpdate(PsychicRequest *request, PsychicResponse*
     #endif
     else
     {
+        /*
         if(request->hasParam("debug"))
         {
             res = buildConfirmHtml(request, resp, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest DEBUG RELEASE version", 2, true);
@@ -5973,10 +5979,11 @@ esp_err_t WebCfgServer::processUpdate(PsychicRequest *request, PsychicResponse*
         }
         else
         {
-            res = buildConfirmHtml(request, resp, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest RELEASE version", 2, true);
-            _preferences->putString(preference_ota_updater_url, GITHUB_LATEST_UPDATER_BINARY_URL);
-            _preferences->putString(preference_ota_main_url, GITHUB_LATEST_RELEASE_BINARY_URL);
-        }
+        */
+        res = buildConfirmHtml(request, resp, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest RELEASE version", 2, true);
+        _preferences->putString(preference_ota_updater_url, GITHUB_LATEST_UPDATER_BINARY_URL);
+        _preferences->putString(preference_ota_main_url, GITHUB_LATEST_RELEASE_BINARY_URL);
+        //}
     }
     waitAndProcess(true, 1000);
     restartEsp(RestartReason::OTAReboot);
diff --git a/src/main.cpp b/src/main.cpp
index ea05698..dde42f7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,9 +10,6 @@
 #include "esp32-hal-log.h"
 #include "hal/wdt_hal.h"
 #include "esp_chip_info.h"
-#include <time.h>
-#include <esp_sntp.h>
-#include "esp_netif.h"
 #include "esp_netif_sntp.h"
 #ifdef CONFIG_SOC_SPIRAM_SUPPORTED
 #include "esp_psram.h"