diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76a163c0c7a7..a0233fff0e7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## [v4.3.6](https://github.com/codeigniter4/CodeIgniter4/tree/v4.3.6) (2023-06-18)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.5...v4.3.6)
+
+### Breaking Changes
+
+* fix: [Validation] DBGroup is ignored when checking the value of a placeholder by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7549
+* fix: [Auto Routing Improved] feature testing may not find controller/method by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7543
+
+### Fixed Bugs
+
+* fix: feature test with validation by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7548
+* fix: [Postgre] Semicolon in the connection parameters break the DSN string by @michalsn in https://github.com/codeigniter4/CodeIgniter4/pull/7552
+* fix: [QueryBuilder] incorrect SQL without space before "ON DUPLICATE KEY UPDATE" by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7564
+* fix: wrong classname in exception message in Cell by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7569
+* fix: `imagecreatefrompng()` gd-png: libpng warning by @ping-yee in https://github.com/codeigniter4/CodeIgniter4/pull/7570
+
+### Refactoring
+
+* refactor: remove unneeded code in IncomingRequest by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7525
+* refactor: View by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7534
+* refactor: [Entity] fix incorrect return value by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7542
+* refactor: Database::initDriver() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7553
+* refactor: remove Factories::models() by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/7566
+* refactor: Validation::processRules() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7565
+* refactor: [Auto Routing Improved] ensure $httpVerb is lower case by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7575
+
 ## [v4.3.5](https://github.com/codeigniter4/CodeIgniter4/tree/v4.3.5) (2023-05-21)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.4...v4.3.5)
 
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index c7a93a802fb4..829b65ea952b 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -47,7 +47,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.3.5';
+    public const CI_VERSION = '4.3.6';
 
     /**
      * App startup time.
diff --git a/user_guide_src/source/changelogs/v4.3.6.rst b/user_guide_src/source/changelogs/v4.3.6.rst
index 34551c1ede03..fb4538a7e957 100644
--- a/user_guide_src/source/changelogs/v4.3.6.rst
+++ b/user_guide_src/source/changelogs/v4.3.6.rst
@@ -1,9 +1,9 @@
 Version 4.3.6
 #############
 
-Release Date: Unreleased
+Release Date: June 18, 2023
 
-**{version} release of CodeIgniter4**
+**4.3.6 release of CodeIgniter4**
 
 .. contents::
     :local:
@@ -39,12 +39,6 @@ Validation::check()
 - The second parameter has changed from ``string $rule`` to ``$rules``.
 - The optional fourth parameter ``$dbGroup = null`` has been added.
 
-Message Changes
-***************
-
-Changes
-*******
-
 Deprecations
 ************
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 63748f794fb2..9d86d441c660 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -26,7 +26,7 @@
 version = '4.3'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.3.5'
+release = '4.3.6'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/installation/upgrade_436.rst b/user_guide_src/source/installation/upgrade_436.rst
index 7d4e99bb602a..cd4ff8bdeeb1 100644
--- a/user_guide_src/source/installation/upgrade_436.rst
+++ b/user_guide_src/source/installation/upgrade_436.rst
@@ -12,9 +12,6 @@ Please refer to the upgrade instructions corresponding to your installation meth
     :local:
     :depth: 2
 
-Mandatory File Changes
-**********************
-
 Breaking Changes
 ****************
 
@@ -30,22 +27,7 @@ Breaking Enhancements
 Project Files
 *************
 
-Some files in the **project space** (root, app, public, writable) received updates. Due to
-these files being outside of the **system** scope they will not be changed without your intervention.
-
-There are some third-party CodeIgniter modules available to assist with merging changes to
-the project space: `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
-
-Content Changes
-===============
-
-The following files received significant changes (including deprecations or visual adjustments)
-and it is recommended that you merge the updated versions with your application:
-
-Config
-------
-
-- @TODO
+Version 4.3.6 did not alter any executable code in project files.
 
 All Changes
 ===========
@@ -53,4 +35,4 @@ All Changes
 This is a list of all files in the **project space** that received changes;
 many will be simple comments or formatting that have no effect on the runtime:
 
-- @TODO
+- composer.json