diff --git a/custom-html-block-extension.php b/custom-html-block-extension.php
index d66c9f1..b7b3345 100644
--- a/custom-html-block-extension.php
+++ b/custom-html-block-extension.php
@@ -4,7 +4,7 @@
  * Description: Extend Custom HTML block to evolve into the advanced code editor.
  * Requires at least: 6.4
  * Requires PHP: 7.4
- * Version: 3.5.0
+ * Version: 3.6.0
  * Author: Aki Hamano
  * Author URI: https://github.com/t-hamano
  * License: GPL2 or later
diff --git a/package-lock.json b/package-lock.json
index 173550d..b4e2ce4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "custom-html-block-extension",
-	"version": "3.5.0",
+	"version": "3.6.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "custom-html-block-extension",
-			"version": "3.5.0",
+			"version": "3.6.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@wordpress/icons": "^10.1.0",
diff --git a/package.json b/package.json
index c56a691..28270ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "custom-html-block-extension",
-	"version": "3.5.0",
+	"version": "3.6.0",
 	"description": "WordPress plugin to extends \"Custom HTML block\" to evolve into an advanced code editor",
 	"author": "Aki Hamano",
 	"license": "GPL-2.0-or-later",
diff --git a/readme.txt b/readme.txt
index 80637e7..aca42e2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@ Contributors: wildworks
 Tags: gutenberg, block, html, highlighting, emmet
 Donate link: https://www.paypal.me/thamanoJP
 Requires at least: 6.4
-Tested up to: 6.4
-Stable tag: 3.5.0
+Tested up to: 6.6
+Stable tag: 3.6.0
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -69,6 +69,16 @@ Source: https://www.marksimonson.com/fonts/view/anonymous-pro
 
 == Changelog ==
 
+= 3.6.0 =
+* Tested to WordPress 6.6
+* Drop support for WordPress 6.3
+* Fix: Editor duplication on the classic editor
+* Fix: Critical error when clicking tab on the settings page
+* Fix: Ctrl+S shortcut not working on the classic editor
+* Fix: Editor top margin misalignment on the classic editor
+* Fix: Browser console error on the classic editor
+* Fix: Browser console error on the Theme/Plugin Editor
+
 = 3.5.0 =
 * Tested to WordPress 6.5
 * Drop support for WordPress 6.2