diff --git a/docs/_utils/javadoc.sh b/docs/_utils/javadoc.sh
index d7669dd1ed8..a35aa5db43b 100755
--- a/docs/_utils/javadoc.sh
+++ b/docs/_utils/javadoc.sh
@@ -15,3 +15,5 @@ mvn javadoc:javadoc
 [ -d $OUTPUT_DIR ] && rm -r $OUTPUT_DIR
 mkdir -p "$OUTPUT_DIR"
 mv -f core/target/site/apidocs/* $OUTPUT_DIR
+cp -an query-builder/target/site/apidocs/* $OUTPUT_DIR
+cp -an mapper-runtime/target/site/apidocs/* $OUTPUT_DIR
diff --git a/manual/core/reconnection/README.md b/manual/core/reconnection/README.md
index c383b887fcc..528b141236c 100644
--- a/manual/core/reconnection/README.md
+++ b/manual/core/reconnection/README.md
@@ -84,7 +84,7 @@ Note that the session is not accessible until it is fully ready: the `CqlSession
 call — or the future returned by `buildAsync()` — will not complete until the connection
 was established.
 
-[ConstantReconnectionPolicy]:    https://docs.datastax.com/en/drivers/java/4.14/com/datastax/oss/driver/internal/core/connection/ConstantReconnectionPolicy.html
-[DriverContext]:                 https://docs.datastax.com/en/drivers/java/4.14/com/datastax/oss/driver/api/core/context/DriverContext.html
-[ExponentialReconnectionPolicy]: https://docs.datastax.com/en/drivers/java/4.14/com/datastax/oss/driver/internal/core/connection/ExponentialReconnectionPolicy.html
-[ReconnectionPolicy]:            https://docs.datastax.com/en/drivers/java/4.14/com/datastax/oss/driver/api/core/connection/ReconnectionPolicy.html
\ No newline at end of file
+[ConstantReconnectionPolicy]:    https://github.com/scylladb/java-driver/blob/scylla-4.15.0.x/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ConstantReconnectionPolicy.java
+[DriverContext]:                 https://docs.datastax.com/en/drivers/java/4.17/com/datastax/oss/driver/api/core/context/DriverContext.html
+[ExponentialReconnectionPolicy]: https://github.com/scylladb/java-driver/blob/scylla-4.15.0.x/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ExponentialReconnectionPolicy.java
+[ReconnectionPolicy]:            https://docs.datastax.com/en/drivers/java/4.17/com/datastax/oss/driver/api/core/connection/ReconnectionPolicy.html
diff --git a/manual/mapper/daos/getentity/README.md b/manual/mapper/daos/getentity/README.md
index 6c37bb1169b..96a6268291b 100644
--- a/manual/mapper/daos/getentity/README.md
+++ b/manual/mapper/daos/getentity/README.md
@@ -89,7 +89,7 @@ The method can return:
 * a single entity instance. If the argument is a result set type, the generated code will extract
   the first row and convert it, or return `null` if the result set is empty.
 
-    ````java
+    ```java
     @GetEntity
     Product asProduct(Row row);