diff --git a/Makefile b/Makefile
index c860bdc79..e39169edb 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ DEFINES += -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DAR
 DEFINES += -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST -D__linux__ -DEMC_RX_BUFFER_SIZE=1500
 DEFINES += $(ARGS)
 
-DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
+DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 
 #----------------------------------------------------------------------
 # Sources & Files
diff --git a/mock-api/server.js b/mock-api/server.js
index 2b2d6e4ab..5d3279d5d 100644
--- a/mock-api/server.js
+++ b/mock-api/server.js
@@ -299,7 +299,7 @@ const SIGN_IN_ENDPOINT = REST_ENDPOINT_ROOT + 'signIn';
 const GENERATE_TOKEN_ENDPOINT = REST_ENDPOINT_ROOT + 'generateToken';
 
 let system_status = {
-  emsesp_version: '3.7.0-demo',
+  emsesp_version: '3.x-demo',
   esp_platform: 'ESP32',
   max_alloc_heap: 89,
   psram_size: 0,
@@ -2627,7 +2627,7 @@ rest_server.get(EMSESP_BOARDPROFILE_ENDPOINT, (req, res) => {
 // EMS-ESP API specific
 const emsesp_info = {
   System: {
-    version: '3.7.0',
+    version: '3.6.2',
     uptime: '001+06:40:34.018',
     'uptime (seconds)': 110434,
     freemem: 131,
diff --git a/platformio.ini b/platformio.ini
index 199c53d7d..6fe1ff688 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -49,7 +49,8 @@ extra_scripts =
 
 [espressi32_base_tasmota]
 ; use Tasmota's libary which removes some libs (like mbedtsl) and increases available heap
-; based on Core 2.0.12 https://github.com/espressif/arduino-esp32/releases/tag/2.0.12
+; based on Core 2.0.12/ESP-IDF v4.4.5 https://github.com/espressif/arduino-esp32/releases/tag/2.0.12 use https://github.com/tasmota/platform-espressif32/archive/refs/tags/2023.09.00.zip
+; based on Core 2.0.13/ESP-IDF v4.4.5 https://github.com/espressif/arduino-esp32/releases/tag/2.0.13 use https://github.com/tasmota/platform-espressif32/releases/download/2023.09.01/platform-espressif32-2023.09.01.zip
 platform = https://github.com/tasmota/platform-espressif32/archive/refs/tags/2023.09.00.zip
 framework = arduino
 build_flags = ${common.build_flags}
@@ -153,7 +154,7 @@ platform = native
 build_flags =
   -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0
   -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST -D__linux__
-  -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
+  -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 	-lpthread
   -std=gnu++11 -Og -ggdb
 build_src_flags =
diff --git a/sonar-project.properties b/sonar-project.properties
index c2ed8a4d3..d06f4752a 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.organization=emsesp
 sonar.projectKey=emsesp_EMS-ESP32
 sonar.projectName=EMS-ESP32
-sonar.projectVersion=3.7.0
+sonar.projectVersion=3.6.0
 sonar.sources=./src
 sonar.cfamily.build-wrapper-output=build_wrapper_output_directory
 sonar.sourceEncoding=UTF-8
diff --git a/src/version.h b/src/version.h
index 915467bd0..149046701 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.7.0-dev.0"
+#define EMSESP_APP_VERSION "3.6.2-dev.0"