diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 3a269d17472..a98ec320652 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,44 +1,32 @@
-Release Notes -- Apache Jackrabbit -- Version 2.23.4-beta
+Release Notes -- Apache Jackrabbit -- Version 2.23.5-beta
 
 Introduction
 ------------
 
-This is Apache Jackrabbit(TM) 2.23.4-beta, a fully compliant implementation of the
+This is Apache Jackrabbit(TM) 2.23.5-beta, a fully compliant implementation of the
 Content Repository for Java(TM) Technology API, version 2.0 (JCR 2.0) as
 specified in the Java Specification Request 283 (JSR 283).
 
-Apache Jackrabbit 2.23.4-beta is an unstable release cut directly from
+Apache Jackrabbit 2.23.5-beta is an unstable release cut directly from
 Jackrabbit trunk, with a focus on new features and other
-improvements. For production use we recommend the latest stable 2.20.x
+improvements. For production use we recommend the latest stable 2.22.x
 release.
 
-Changes in Jackrabbit 2.23.4-beta
+Changes in Jackrabbit 2.23.5-beta
 ----------------------------------
 
-Bug
+** Sub-task
+    * [JCR-5244] - improve test coverage for HttpMultipartPost
 
-    [JCR-5226] - Base64 decoder does not handle input without padding correctly
-    [JCR-5229] - LockedWrapperTest.testSequenceWithSessionRefresh() may fail due to race conditions
+** Improvement
+    * [JCR-5249] - jackrabbit-spi-commons: add broken namepace names / prefixes to exception message
 
-Improvement
-
-    [JCR-4521] - upgrade to commons-dbcp2
-
-Test
-
-    [JCR-4945] - Ensure OSGi-enabled Jackrabbit bundles deploy in environments featuring only Slf4j v2 or even Tika v2.9
-
-Task
-
-    [JCR-5211] - package-version jcr2spi
-    [JCR-5216] - Update Jackrabbit Trunk to Oak 1.90.0
-    [JCR-5217] - Update Mockito dependency to 5.23.0
-    [JCR-5218] - webapp: bump htmlunit to 4.21.0
-    [JCR-5219] - set baseline comparisonVersion to latest stable (2.22.3)
-    [JCR-5223] - update Apache parent pom to version 37
-    [JCR-5224] - remove jackrabbit 2.0 compatibility and performance tests
-    [JCR-5230] - improve diagnostics in IndexingQueueTest
-    [JCR-5232] - Update Jackrabbit Trunk to Oak 1.92.0
+** Task
+    * [JCR-5233] - commons-fileupload (1.6) restricts header size in upload parts
+    * [JCR-5242] - Update Jackrabbit Trunk to Oak 2.2.0
+    * [JCR-5243] - Update oak-jackrabbit-api.version.used to Oak 1.22.24
+    * [JCR-5246] - webapp: update tomcat dependency to 9.0.118
+    * [JCR-5247] - update Apache parent pom to version 39
 
 
 For more detailed information about all the changes in this and other
@@ -86,4 +74,3 @@ Trademarks
 
 Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
 Jackrabbit project logo are trademarks of The Apache Software Foundation.
-
diff --git a/jackrabbit-aws-ext/pom.xml b/jackrabbit-aws-ext/pom.xml
index 03939b7686e..36b2dd44539 100644
--- a/jackrabbit-aws-ext/pom.xml
+++ b/jackrabbit-aws-ext/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-parent</artifactId>
-        <version>2.23.5-beta-SNAPSHOT</version>
+        <version>2.23.6-beta-SNAPSHOT</version>
         <relativePath>../jackrabbit-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jackrabbit-aws-ext</artifactId>
diff --git a/jackrabbit-core/pom.xml b/jackrabbit-core/pom.xml
index f5ade1fbd53..dfe031315d8 100644
--- a/jackrabbit-core/pom.xml
+++ b/jackrabbit-core/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-core</artifactId>
diff --git a/jackrabbit-data/pom.xml b/jackrabbit-data/pom.xml
index af55599dcef..08145079f9a 100644
--- a/jackrabbit-data/pom.xml
+++ b/jackrabbit-data/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.jackrabbit</groupId>
 		<artifactId>jackrabbit-parent</artifactId>
-		<version>2.23.5-beta-SNAPSHOT</version>
+		<version>2.23.6-beta-SNAPSHOT</version>
 		<relativePath>../jackrabbit-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>jackrabbit-data</artifactId>
diff --git a/jackrabbit-it-osgi/pom.xml b/jackrabbit-it-osgi/pom.xml
index 1989aacb6bd..6503f5edd6a 100644
--- a/jackrabbit-it-osgi/pom.xml
+++ b/jackrabbit-it-osgi/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/jackrabbit-jca/pom.xml b/jackrabbit-jca/pom.xml
index e2b829c1531..8b8a43504cb 100644
--- a/jackrabbit-jca/pom.xml
+++ b/jackrabbit-jca/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-jca</artifactId>
diff --git a/jackrabbit-jcr-client/pom.xml b/jackrabbit-jcr-client/pom.xml
index f9bb0c0b85c..f46d7a57b11 100644
--- a/jackrabbit-jcr-client/pom.xml
+++ b/jackrabbit-jcr-client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-parent</artifactId>
-        <version>2.23.5-beta-SNAPSHOT</version>
+        <version>2.23.6-beta-SNAPSHOT</version>
         <relativePath>../jackrabbit-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jackrabbit-jcr-client</artifactId>
diff --git a/jackrabbit-jcr-commons/pom.xml b/jackrabbit-jcr-commons/pom.xml
index ad5ac8e82bf..cc6850c4d8c 100644
--- a/jackrabbit-jcr-commons/pom.xml
+++ b/jackrabbit-jcr-commons/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-jcr-commons</artifactId>
diff --git a/jackrabbit-jcr-server/pom.xml b/jackrabbit-jcr-server/pom.xml
index 22afd85ed6b..500842ef6de 100644
--- a/jackrabbit-jcr-server/pom.xml
+++ b/jackrabbit-jcr-server/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-jcr-server</artifactId>
diff --git a/jackrabbit-jcr-servlet/pom.xml b/jackrabbit-jcr-servlet/pom.xml
index eb81a85886c..d8e46174998 100644
--- a/jackrabbit-jcr-servlet/pom.xml
+++ b/jackrabbit-jcr-servlet/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/jackrabbit-jcr-tests/pom.xml b/jackrabbit-jcr-tests/pom.xml
index bd07178c6b7..9f97b8e5212 100644
--- a/jackrabbit-jcr-tests/pom.xml
+++ b/jackrabbit-jcr-tests/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-jcr-tests</artifactId>
diff --git a/jackrabbit-jcr2dav/pom.xml b/jackrabbit-jcr2dav/pom.xml
index c547bde34b0..195d3a9bd33 100644
--- a/jackrabbit-jcr2dav/pom.xml
+++ b/jackrabbit-jcr2dav/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-jcr2dav</artifactId>
diff --git a/jackrabbit-jcr2spi/pom.xml b/jackrabbit-jcr2spi/pom.xml
index b0ea548c8dc..2d5c2cc6233 100644
--- a/jackrabbit-jcr2spi/pom.xml
+++ b/jackrabbit-jcr2spi/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-jcr2spi</artifactId>
diff --git a/jackrabbit-parent/pom.xml b/jackrabbit-parent/pom.xml
index 528812925ac..8bbf36182d2 100644
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -34,7 +34,7 @@
   <groupId>org.apache.jackrabbit</groupId>
   <artifactId>jackrabbit-parent</artifactId>
   <name>Jackrabbit Parent POM</name>
-  <version>2.23.5-beta-SNAPSHOT</version>
+  <version>2.23.6-beta-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <issueManagement>
@@ -76,7 +76,7 @@
     <minimum.branch.coverage>0.0</minimum.branch.coverage>
     <!-- build time stamp: should be updated prior to a release -->
     <!-- see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>1775547457</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1782909208</project.build.outputTimestamp>
     <minimalMavenBuildVersion>3.6.1</minimalMavenBuildVersion><!-- due to https://issues.apache.org/jira/browse/MNG-6059 -->
     
     <!-- this project uses cross-module reports with one aggregate, https://docs.sonarsource.com/sonarcloud/enriching/test-coverage/java-test-coverage/#add-coverage-in-a-multi-module-maven-project -->
diff --git a/jackrabbit-spi-commons/pom.xml b/jackrabbit-spi-commons/pom.xml
index 091a315dac4..361ac21cde7 100644
--- a/jackrabbit-spi-commons/pom.xml
+++ b/jackrabbit-spi-commons/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-spi-commons</artifactId>
diff --git a/jackrabbit-spi/pom.xml b/jackrabbit-spi/pom.xml
index 537b58307dd..1128361ca28 100644
--- a/jackrabbit-spi/pom.xml
+++ b/jackrabbit-spi/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-spi</artifactId>
diff --git a/jackrabbit-spi2dav/pom.xml b/jackrabbit-spi2dav/pom.xml
index ee78086b8de..ef70fbeda1e 100644
--- a/jackrabbit-spi2dav/pom.xml
+++ b/jackrabbit-spi2dav/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-spi2dav</artifactId>
diff --git a/jackrabbit-spi2jcr/pom.xml b/jackrabbit-spi2jcr/pom.xml
index 50d69fa695a..d5e6e13a475 100644
--- a/jackrabbit-spi2jcr/pom.xml
+++ b/jackrabbit-spi2jcr/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-spi2jcr</artifactId>
diff --git a/jackrabbit-standalone-components/pom.xml b/jackrabbit-standalone-components/pom.xml
index 554ebd7cf26..182f448f031 100644
--- a/jackrabbit-standalone-components/pom.xml
+++ b/jackrabbit-standalone-components/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-standalone-components</artifactId>
diff --git a/jackrabbit-standalone/pom.xml b/jackrabbit-standalone/pom.xml
index 7dee0b2c61a..f72d39b21b9 100644
--- a/jackrabbit-standalone/pom.xml
+++ b/jackrabbit-standalone/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-standalone</artifactId>
diff --git a/jackrabbit-vfs-ext/pom.xml b/jackrabbit-vfs-ext/pom.xml
index f501a6cdd4b..d496581dcdf 100644
--- a/jackrabbit-vfs-ext/pom.xml
+++ b/jackrabbit-vfs-ext/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-parent</artifactId>
-        <version>2.23.5-beta-SNAPSHOT</version>
+        <version>2.23.6-beta-SNAPSHOT</version>
         <relativePath>../jackrabbit-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jackrabbit-vfs-ext</artifactId>
diff --git a/jackrabbit-webapp/pom.xml b/jackrabbit-webapp/pom.xml
index 7f91dac7cb6..528ff63baef 100644
--- a/jackrabbit-webapp/pom.xml
+++ b/jackrabbit-webapp/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-webapp</artifactId>
diff --git a/jackrabbit-webdav/pom.xml b/jackrabbit-webdav/pom.xml
index 13945b6556f..468a93f378e 100644
--- a/jackrabbit-webdav/pom.xml
+++ b/jackrabbit-webdav/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-webdav</artifactId>
diff --git a/pom.xml b/pom.xml
index 57da440b376..00b7d8ab163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.23.5-beta-SNAPSHOT</version>
+    <version>2.23.6-beta-SNAPSHOT</version>
     <relativePath>jackrabbit-parent/pom.xml</relativePath>
   </parent>