diff --git a/source/includes/changelogs/releases/3.6.23.rst b/source/includes/changelogs/releases/3.6.23.rst
new file mode 100644
index 00000000000..f7c3f65cc32
--- /dev/null
+++ b/source/includes/changelogs/releases/3.6.23.rst
@@ -0,0 +1,21 @@
+.. _3.6.23-changelog:
+
+3.6.23 Changelog
+----------------
+
+Query
+~~~~~
+
+:issue:`SERVER-40361` Reduce memory footprint of plan cache entries
+
+Internals
+~~~~~~~~~
+
+- :issue:`SERVER-43973` jsTestName() should return a unique name for each thread in the parallel suite
+- :issue:`SERVER-46686` Explain does not respect maxTimeMS
+- :issue:`SERVER-50267` Set output limit for 'rawMongoProgramOutput()'
+- :issue:`SERVER-52969` Disable Powercyle on non-master branches
+- :issue:`SERVER-53992` Remove calls to detect-outliers from performance tasks
+- :issue:`SERVER-54134` Ignore newer mongo versions on older branches of setup_multiversion_mongodb.py
+- :issue:`TOOLS-2803` [v3.6] Add --config option for password values
+
diff --git a/source/release-notes/3.6-changelog.txt b/source/release-notes/3.6-changelog.txt
index 20fe09d0727..8ba2c9352b3 100644
--- a/source/release-notes/3.6-changelog.txt
+++ b/source/release-notes/3.6-changelog.txt
@@ -10,6 +10,8 @@
    :depth: 1
    :class: twocols
 
+.. include:: /includes/changelogs/releases/3.6.23.rst
+
 .. include:: /includes/changelogs/releases/3.6.22.rst
 
 .. include:: /includes/changelogs/releases/3.6.21.rst
diff --git a/source/release-notes/3.6.txt b/source/release-notes/3.6.txt
index 91827e8950a..eb84cc2e5a7 100644
--- a/source/release-notes/3.6.txt
+++ b/source/release-notes/3.6.txt
@@ -13,6 +13,21 @@ Release Notes for MongoDB 3.6
 Minor Releases
 --------------
 
+3.6.23 - Upcoming
+~~~~~~~~~~~~~~~~~
+
+Issues Fixed:
+
+- :issue:`SERVER-40361`: Reduce memory footprint of plan cache entries
+- :issue:`SERVER-46686`: Explain does not respect maxTimeMS
+- :issue:`SERVER-50267`: Set output limit for 'rawMongoProgramOutput()'
+- :issue:`TOOLS-2803`: [v3.6] Add --config option for password values
+
+- `All JIRA issues closed in 3.6.23
+  <https://jira.mongodb.org/issues/?jql=project%20in%20(SERVER%2CTOOLS%2CWT)%20AND%20resolution%3D%27Fixed%27%20and%20fixversion%3D%273.6.23%27>`_
+
+- :ref:`3.6.23-changelog`
+
 3.6.22 - Feb 8, 2021
 ~~~~~~~~~~~~~~~~~~~~