diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fe60ca33..7e1da56db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.6.3] November 18 2023
+## [3.6.4] November 24 2023
 
 ## **IMPORTANT! BREAKING CHANGES**
 
@@ -34,6 +34,7 @@ Writeable Text entities have moved from type `sensor` to `text` in Home Assistan
 - fixed helper text in Web Device Entity dialog box for numerical ranges
 - MQTT base with paths not working in HA [#1393](https://github.com/emsesp/EMS-ESP32/issues/1393)
 - set/read thermostat mode for RC100-RC300, [#1440](https://github.com/emsesp/EMS-ESP32/issues/1440) [#1442](https://github.com/emsesp/EMS-ESP32/issues/1442)
+- some setting commands for ems-boiler have used wrong ems+ telegram in 3.6.3
 
 ## Changed
 
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index c325fe9d7..c48e0672e 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [3.6.4]
+## [3.6.5]
 
 ## **IMPORTANT! BREAKING CHANGES**
 
@@ -8,6 +8,4 @@
 
 ## Fixed
 
-- some setting commands for ems-boiler have used wrong ems+ telegram in 3.6.3
-
 ## Changed
diff --git a/Makefile b/Makefile
index 64e4b61b5..1beb818c8 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.6.3-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
+DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.4-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 
 #----------------------------------------------------------------------
 # Sources & Files
diff --git a/interface/package.json b/interface/package.json
index f8c6bd82a..5a8fd4fb1 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EMS-ESP",
-  "version": "3.6.3",
+  "version": "3.6.5",
   "description": "build EMS-ESP WebUI",
   "homepage": "https://emsesp.github.io/docs",
   "author": "proddy",
diff --git a/mock-api/server.js b/mock-api/server.js
index 2dc90b50d..88e478349 100644
--- a/mock-api/server.js
+++ b/mock-api/server.js
@@ -324,7 +324,7 @@ security_settings = {
   ]
 };
 const features = {
-  version: 'v3.6.3-demo',
+  version: 'v3.6-demo',
   // platform: 'ESP32'
   platform: 'ESP32-S3'
 };
@@ -355,7 +355,7 @@ const EMSESP_WRITE_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'entities';
 
 const emsesp_info = {
   System: {
-    version: '3.6.3',
+    version: '3.6.5',
     uptime: '001+06:40:34.018',
     'uptime (seconds)': 110434,
     freemem: 131,
diff --git a/platformio.ini b/platformio.ini
index 2fe2a578d..69521fe02 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -172,7 +172,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.6.3-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
+  -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.4-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 877b44ec4..fdd85ff20 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.6.3
+sonar.projectVersion=3.6.5
 sonar.sources=./src
 sonar.cfamily.build-wrapper-output=bw-output
 sonar.sourceEncoding=UTF-8
diff --git a/src/system.cpp b/src/system.cpp
index f1d5b013f..6677c5ff6 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1096,7 +1096,7 @@ bool System::check_upgrade(bool factory_settings) {
         missing_version = (settingsVersion.empty() || (settingsVersion.length() < 5));
         if (missing_version) {
             LOG_WARNING("No version information found (%s)", settingsVersion.c_str());
-            settingsVersion = "3.6.3"; // this was the last stable version
+            settingsVersion = "3.6.4"; // this was the last stable version
         }
     }
 
diff --git a/src/version.h b/src/version.h
index d5365b3ed..fa47481b3 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.4-dev.2"
+#define EMSESP_APP_VERSION "3.6.5-dev.0"