diff --git a/src/changelog/.2.x.x/update_github_codeql_action.xml b/src/changelog/.2.x.x/update_github_codeql_action.xml
deleted file mode 100644
index 854d457233e..00000000000
--- a/src/changelog/.2.x.x/update_github_codeql_action.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd"
-       type="updated">
-  <issue id="2295" link="https://github.com/apache/logging-log4j2/pull/2295"/>
-  <description format="asciidoc">Update `github/codeql-action` to version `3.24.3`</description>
-</entry>
diff --git a/src/changelog/2.23.0/.release-notes.adoc.ftl b/src/changelog/2.23.0/.release-notes.adoc.ftl
new file mode 100644
index 00000000000..4436587e5e4
--- /dev/null
+++ b/src/changelog/2.23.0/.release-notes.adoc.ftl
@@ -0,0 +1,27 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+== ${release.version}
+
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This release adds support for LMAX Disruptor 4.x and several performance and bug fixes.
+
+In order to maintain compatibility with JRE 8, support for LMAX Disruptor 3.x is maintained.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.23.0/.release.xml b/src/changelog/2.23.0/.release.xml
new file mode 100644
index 00000000000..1ead7bc2390
--- /dev/null
+++ b/src/changelog/2.23.0/.release.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<release xmlns="http://logging.apache.org/log4j/changelog"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd"
+         date="2024-02-17" version="2.23.0"/>
diff --git a/src/changelog/.2.x.x/2238_fix_jdk_string_map.xml b/src/changelog/2.23.0/2238_fix_jdk_string_map.xml
similarity index 100%
rename from src/changelog/.2.x.x/2238_fix_jdk_string_map.xml
rename to src/changelog/2.23.0/2238_fix_jdk_string_map.xml
diff --git a/src/changelog/.2.x.x/2282_fix_1_2_set_level.xml b/src/changelog/2.23.0/2282_fix_1_2_set_level.xml
similarity index 100%
rename from src/changelog/.2.x.x/2282_fix_1_2_set_level.xml
rename to src/changelog/2.23.0/2282_fix_1_2_set_level.xml
diff --git a/src/changelog/.2.x.x/2282_fix_jul_set_level.xml b/src/changelog/2.23.0/2282_fix_jul_set_level.xml
similarity index 100%
rename from src/changelog/.2.x.x/2282_fix_jul_set_level.xml
rename to src/changelog/2.23.0/2282_fix_jul_set_level.xml
diff --git a/src/changelog/.2.x.x/LOG4J2-3680_fix_serial_filter_arrays.xml b/src/changelog/2.23.0/LOG4J2-3680_fix_serial_filter_arrays.xml
similarity index 100%
rename from src/changelog/.2.x.x/LOG4J2-3680_fix_serial_filter_arrays.xml
rename to src/changelog/2.23.0/LOG4J2-3680_fix_serial_filter_arrays.xml
diff --git a/src/changelog/.2.x.x/add_support_for_disruptor_4.xml b/src/changelog/2.23.0/add_support_for_disruptor_4.xml
similarity index 100%
rename from src/changelog/.2.x.x/add_support_for_disruptor_4.xml
rename to src/changelog/2.23.0/add_support_for_disruptor_4.xml
diff --git a/src/changelog/.2.x.x/allow_arbitrary_properties_order.xml b/src/changelog/2.23.0/allow_arbitrary_properties_order.xml
similarity index 100%
rename from src/changelog/.2.x.x/allow_arbitrary_properties_order.xml
rename to src/changelog/2.23.0/allow_arbitrary_properties_order.xml
diff --git a/src/changelog/.2.x.x/deprecate_StatusConsoleListener_filters.xml b/src/changelog/2.23.0/deprecate_StatusConsoleListener_filters.xml
similarity index 100%
rename from src/changelog/.2.x.x/deprecate_StatusConsoleListener_filters.xml
rename to src/changelog/2.23.0/deprecate_StatusConsoleListener_filters.xml
diff --git a/src/changelog/.2.x.x/deprecate_ring_buffer_log_event_handler.xml b/src/changelog/2.23.0/deprecate_ring_buffer_log_event_handler.xml
similarity index 100%
rename from src/changelog/.2.x.x/deprecate_ring_buffer_log_event_handler.xml
rename to src/changelog/2.23.0/deprecate_ring_buffer_log_event_handler.xml
diff --git a/src/changelog/.2.x.x/fix_RingBufferLogEvent_clear.xml b/src/changelog/2.23.0/fix_RingBufferLogEvent_clear.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_RingBufferLogEvent_clear.xml
rename to src/changelog/2.23.0/fix_RingBufferLogEvent_clear.xml
diff --git a/src/changelog/.2.x.x/fix_api_recursive_formatting.xml b/src/changelog/2.23.0/fix_api_recursive_formatting.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_api_recursive_formatting.xml
rename to src/changelog/2.23.0/fix_api_recursive_formatting.xml
diff --git a/src/changelog/.2.x.x/fix_security_manager_use_in_LoaderUtil.xml b/src/changelog/2.23.0/fix_security_manager_use_in_LoaderUtil.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_security_manager_use_in_LoaderUtil.xml
rename to src/changelog/2.23.0/fix_security_manager_use_in_LoaderUtil.xml
diff --git a/src/changelog/.2.x.x/fix_spring_cloud_config_client_deps.xml b/src/changelog/2.23.0/fix_spring_cloud_config_client_deps.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_spring_cloud_config_client_deps.xml
rename to src/changelog/2.23.0/fix_spring_cloud_config_client_deps.xml
diff --git a/src/changelog/.2.x.x/fix_typo_kubernetes.xml b/src/changelog/2.23.0/fix_typo_kubernetes.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_typo_kubernetes.xml
rename to src/changelog/2.23.0/fix_typo_kubernetes.xml
diff --git a/src/changelog/.2.x.x/simplify_configuration_after_bnd_7_update.xml b/src/changelog/2.23.0/simplify_configuration_after_bnd_7_update.xml
similarity index 100%
rename from src/changelog/.2.x.x/simplify_configuration_after_bnd_7_update.xml
rename to src/changelog/2.23.0/simplify_configuration_after_bnd_7_update.xml
diff --git a/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml b/src/changelog/2.23.0/update_com_fasterxml_jackson_jackson_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml
rename to src/changelog/2.23.0/update_com_fasterxml_jackson_jackson_bom.xml
diff --git a/src/changelog/.2.x.x/update_commons_codec_commons_codec.xml b/src/changelog/2.23.0/update_commons_codec_commons_codec.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_commons_codec_commons_codec.xml
rename to src/changelog/2.23.0/update_commons_codec_commons_codec.xml
diff --git a/src/changelog/.2.x.x/update_io_netty_netty_bom.xml b/src/changelog/2.23.0/update_io_netty_netty_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_io_netty_netty_bom.xml
rename to src/changelog/2.23.0/update_io_netty_netty_bom.xml
diff --git a/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/2.23.0/update_org_apache_logging_logging_parent.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml
rename to src/changelog/2.23.0/update_org_apache_logging_logging_parent.xml
diff --git a/src/changelog/.2.x.x/update_org_eclipse_jetty_jetty_bom.xml b/src/changelog/2.23.0/update_org_eclipse_jetty_jetty_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_eclipse_jetty_jetty_bom.xml
rename to src/changelog/2.23.0/update_org_eclipse_jetty_jetty_bom.xml
diff --git a/src/changelog/.2.x.x/update_org_jctools_jctools_core.xml b/src/changelog/2.23.0/update_org_jctools_jctools_core.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_jctools_jctools_core.xml
rename to src/changelog/2.23.0/update_org_jctools_jctools_core.xml
diff --git a/src/changelog/.2.x.x/update_org_springframework_spring_framework_bom.xml b/src/changelog/2.23.0/update_org_springframework_spring_framework_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_springframework_spring_framework_bom.xml
rename to src/changelog/2.23.0/update_org_springframework_spring_framework_bom.xml
diff --git a/src/changelog/.2.x.x/update_org_zeromq_jeromq.xml b/src/changelog/2.23.0/update_org_zeromq_jeromq.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_zeromq_jeromq.xml
rename to src/changelog/2.23.0/update_org_zeromq_jeromq.xml
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index a8faebbe2af..14731d76050 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
 [#release-notes]
 = Release Notes
 
-include::_release-notes/_2.x.x.adoc[]
+include::_release-notes/_2.23.0.adoc[]
 include::_release-notes/_2.22.1.adoc[]
 include::_release-notes/_2.22.0.adoc[]
 include::_release-notes/_2.21.1.adoc[]
diff --git a/src/site/_release-notes/_2.23.0.adoc b/src/site/_release-notes/_2.23.0.adoc
new file mode 100644
index 00000000000..8733255e3bf
--- /dev/null
+++ b/src/site/_release-notes/_2.23.0.adoc
@@ -0,0 +1,68 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+[#release-notes-2-23-0]
+== 2.23.0
+
+Release date:: 2024-02-17
+
+This release adds support for LMAX Disruptor 4.x and several performance and bug fixes.
+
+In order to maintain compatibility with JRE 8, support for LMAX Disruptor 3.x is maintained.
+
+
+[#release-notes-2-23-0-added]
+=== Added
+
+* Added support for LMAX Disruptor 4.x (https://github.com/apache/logging-log4j2/issues/1821[1821])
+
+[#release-notes-2-23-0-changed]
+=== Changed
+
+* Simplify BND configuration after upgrade from version `6.4.1` to `7.0.0`
+
+[#release-notes-2-23-0-deprecated]
+=== Deprecated
+
+* Deprecate the configuration attribute `verbose` (i.e., `<Configuration verbose="..."`) and `StatusConsoleListener` filters (https://github.com/apache/logging-log4j2/pull/2226[2226])
+* Deprecated the `RingBufferLogEventHandler` class for removal from the public API in 3.x
+
+[#release-notes-2-23-0-fixed]
+=== Fixed
+
+* Fix regression in `JdkMapAdapterStringMap` performance. (https://github.com/apache/logging-log4j2/issues/2238[2238])
+* Fix the behavior of `Logger#setLevel` and `Logger#getLevel` in the Log4j 1.2 bridge. (https://github.com/apache/logging-log4j2/issues/2282[2282])
+* Fix the behavior of `CoreLogger#getLevel` and `CoreLogger#setLevel` in the `log4j-jul` module. (https://github.com/apache/logging-log4j2/issues/2282[2282])
+* Allow deserialization of all arrays of allowed classes. (https://issues.apache.org/jira/browse/LOG4J2-3680[LOG4J2-3680])
+* Allow the <Properties> node to appear in any position in the configuration element.
+* Fix forgotten `threadName` field in `RingBufferLogEvent#clear()` (https://github.com/apache/logging-log4j2/issues/2234[2234])
+* Fix `StringBuilder` cache corruption on recursive access
+* Fixed use of `SecurityManager` in `LoaderUtil` where `AccessController::doPrivileged` should only be invoked when a `SecurityManager` is installed. Some runtimes do not seem to have this method available. (https://github.com/apache/logging-log4j2/issues/2129[2129])
+* Fix `log4j-spring-cloud-config-client` dependencies to include only those required. (https://github.com/apache/logging-log4j2/pull/2157[2157])
+* Fix typo in Kubernetes `clientKeyData` configuration property.
+
+[#release-notes-2-23-0-updated]
+=== Updated
+
+* Update `com.fasterxml.jackson:jackson-bom` to version `2.16.1` (https://github.com/apache/logging-log4j2/pull/2126[2126])
+* Update `commons-codec:commons-codec` to version `1.16.1` (https://github.com/apache/logging-log4j2/pull/2277[2277])
+* Update `io.netty:netty-bom` to version `4.1.107.Final` (https://github.com/apache/logging-log4j2/pull/2284[2284])
+* Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j2/pull/2197[2197])
+* Update `org.eclipse.jetty:jetty-bom` to version `9.4.54.v20240208` (https://github.com/apache/logging-log4j2/pull/2287[2287])
+* Update `org.jctools:jctools-core` to version `4.0.3` (https://github.com/apache/logging-log4j2/pull/2270[2270])
+* Update `org.springframework:spring-framework-bom` to version `5.3.32` (https://github.com/apache/logging-log4j2/pull/2293[2293])
+* Update `org.zeromq:jeromq` to version `0.6.0` (https://github.com/apache/logging-log4j2/pull/2271[2271])