diff --git a/modules/ROOT/pages/extending-neo4j/project-setup.adoc b/modules/ROOT/pages/extending-neo4j/project-setup.adoc
index c9c6cb7..a8482a8 100644
--- a/modules/ROOT/pages/extending-neo4j/project-setup.adoc
+++ b/modules/ROOT/pages/extending-neo4j/project-setup.adoc
@@ -38,7 +38,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <description>A template project for building a Neo4j Procedure</description>
 
   <properties>
-    <java.version>17</java.version>
+    <java.version>21</java.version>
     <maven.compiler.release>${java.version}</maven.compiler.release>
 
     <neo4j.version>{neo4j-version-exact}</neo4j.version>
@@ -114,8 +114,8 @@ Once the procedure has been deployed to the _plugins_ directory of each Neo4j in
  <plugin>
    <artifactId>maven-compiler-plugin</artifactId>
    <configuration>
-     <source>17</source>
-     <target>17</target>
+     <source>21</source>
+     <target>21</target>
    </configuration>
  </plugin>
  <plugin>
diff --git a/modules/ROOT/pages/java-embedded/bolt.adoc b/modules/ROOT/pages/java-embedded/bolt.adoc
index 027c52e..f9cc2fe 100644
--- a/modules/ROOT/pages/java-embedded/bolt.adoc
+++ b/modules/ROOT/pages/java-embedded/bolt.adoc
@@ -1,13 +1,10 @@
 :description: How to open a Bolt connector to your embedded instance to get GUI administration and other benefits.
 
-:org-neo4j-graphdb-factory-GraphDatabaseFactory: {neo4j-javadocs-base-uri}/org/neo4j/graphdb/factory/GraphDatabaseFactory.html
-
-
 [[java-embedded-bolt]]
 = Bolt connector
 
 This describes how to open a Bolt connector to your embedded instance to get GUI administration and other benefits.
-Accessing Neo4j embedded via the Bolt protocol.
+Accessing Neo4j embedded via the link:https://neo4j.com/docs/bolt/current/[Bolt protocol].
 
 The Neo4j Browser and the official Neo4j Drivers use the Bolt database protocol to communicate with Neo4j.
 By default, Neo4j embedded does not expose a Bolt connector, but you can enable one.
diff --git a/modules/ROOT/pages/java-embedded/setup.adoc b/modules/ROOT/pages/java-embedded/setup.adoc
index 3c4b6d0..2b69849 100644
--- a/modules/ROOT/pages/java-embedded/setup.adoc
+++ b/modules/ROOT/pages/java-embedded/setup.adoc
@@ -17,9 +17,9 @@ The following examples use the top-level artifact approach.
 
 
 [NOTE]
-.[enterprise-edition]
 ====
 The examples are only valid for Neo4j Community Edition.
+
 To add Neo4j Enterprise Edition as a dependency, please get in contact with link:https://neo4j.com/contact-us/[Neo4j Professional Services^].
 See link:{neo4j-docs-base-uri}/operations-manual/{page-version}/introduction[Operations Manual -> Introduction] for details about the Community and Enterprise Editions.
 ====
@@ -51,7 +51,7 @@ Where the `artifactId` is found in the <<editions>> table.
 
 === Eclipse and Maven
 
-For development in link:http://www.eclipse.org[Eclipse^], it is recommended to install the link:http://www.eclipse.org/m2e/[m2e plugin^] and let Maven manage the project build classpath instead.
+For development in link:https://www.eclipse.org[Eclipse^], it is recommended to install the link:https://www.eclipse.org/m2e/[m2e plugin^] and let Maven manage the project build classpath instead.
 This also adds the possibility to build your project both via the command line with Maven and have a working Eclipse setup for development.
 
 
diff --git a/modules/ROOT/pages/jmx-metrics.adoc b/modules/ROOT/pages/jmx-metrics.adoc
index fd877d8..32d9b57 100644
--- a/modules/ROOT/pages/jmx-metrics.adoc
+++ b/modules/ROOT/pages/jmx-metrics.adoc
@@ -43,7 +43,7 @@ server.jvm.additional=-Dcom.sun.management.jmxremote.ssl=false
 
 [IMPORTANT]
 ====
-Although SSL for JMX Remote Management is disabled throughout this document, to configure it based on your requirements, you can follow the instructions in the link:https://docs.oracle.com/en/java/javase/11/management/monitoring-and-management-using-jmx-technology.html[Java SE 11 Monitoring and Management Guide^].
+Although SSL for JMX Remote Management is disabled throughout this document, to configure it based on your requirements, you can follow the instructions in the link:https://docs.oracle.com/en/java/javase/21/management/monitoring-and-management-using-jmx-technology.html[Java SE 21 Monitoring and Management Guide^].
 ====
 
 
@@ -53,7 +53,7 @@ Although SSL for JMX Remote Management is disabled throughout this document, to
 Password authentication is enabled by default in JMX Remote Management.
 You can find information about setting up authentication with LDAP and file-based approach in the following sections.
 
-Refer to the link:https://docs.oracle.com/en/java/javase/11/management/monitoring-and-management-using-jmx-technology.html[Java SE 11 Monitoring and Management Guide^] for more options, including configuration steps for SSL client authentication.
+Refer to the link:https://docs.oracle.com/en/java/javase/21/management/monitoring-and-management-using-jmx-technology.html[Java SE 21 Monitoring and Management Guide^] for more options, including configuration steps for SSL client authentication.
 
 
 [[ldap]]
@@ -184,7 +184,7 @@ The `<port>` value is configured by the `com.sun.management.jmxremote.port` prop
 Besides the MBeans, exposed by the JVM, you also see be default `neo4j.metrics` section in the MBeans tab.
 Under that, you have access to all the monitoring information exposed by Neo4j.
 
-For opening JMX to remote monitoring access, please see <<jmx-remote>> and link:https://docs.oracle.com/en/java/javase/11/management/monitoring-and-management-using-jmx-technology.html#GUID-805517EC-2D33-4D61-81D8-4D0FA770D1B8[the JMX documention^].
+For opening JMX to remote monitoring access, please see <<jmx-remote>> and link:https://docs.oracle.com/en/java/javase/21/management/monitoring-and-management-using-jmx-technology.html#GUID-805517EC-2D33-4D61-81D8-4D0FA770D1B8[the JMX documention^].
 
 .Neo4j MBeans view
 image::jconsole-beans1.png[alt="Neo4j MBeans view", width=600]