diff --git a/faq/osgi/README.md b/faq/osgi/README.md
index dde5bee194e..37122b8e957 100644
--- a/faq/osgi/README.md
+++ b/faq/osgi/README.md
@@ -1,4 +1,4 @@
-```{eval-rst}
+```eval_rst
 :orphan:
 ```
 ## Frequently Asked Questions - OSGi
diff --git a/manual/README.md b/manual/README.md
index a7c8f3c9427..9a50c2d2c38 100644
--- a/manual/README.md
+++ b/manual/README.md
@@ -306,7 +306,7 @@ simply navigate to each sub-directory.
 [NoHostAvailableException]: https://docs.datastax.com/en/drivers/java/3.11/com/datastax/driver/core/exceptions/NoHostAvailableException.html
 [LocalDate]: https://docs.datastax.com/en/drivers/java/3.11/com/datastax/driver/core/LocalDate.html
 
-```{eval-rst}
+```eval_rst
 .. toctree::
    :hidden:
    :glob:
diff --git a/manual/custom_codecs/extras/README.md b/manual/custom_codecs/extras/README.md
index 2a431268b5f..da8187352d5 100644
--- a/manual/custom_codecs/extras/README.md
+++ b/manual/custom_codecs/extras/README.md
@@ -1,4 +1,4 @@
-```{eval-rst}
+```eval_rst
 :orphan:
 ```
 ## Optional codecs
diff --git a/manual/object_mapper/README.md b/manual/object_mapper/README.md
index 2edbc895eac..2222f41c4ac 100644
--- a/manual/object_mapper/README.md
+++ b/manual/object_mapper/README.md
@@ -21,7 +21,7 @@ See the child pages for more information:
 * [using the mapper](using/)
 * [using custom codecs](custom_codecs/)
 
-```{eval-rst}
+```eval_rst
 .. toctree::
    :hidden:
    :glob:
diff --git a/manual/statements/README.md b/manual/statements/README.md
index c8a605b5b56..7066a73480d 100644
--- a/manual/statements/README.md
+++ b/manual/statements/README.md
@@ -41,7 +41,7 @@ wrap your statements in a custom [StatementWrapper] implementation.
 [execute]:                    https://docs.datastax.com/en/drivers/java/3.11/com/datastax/driver/core/Session.html#execute-com.datastax.driver.core.Statement-
 [executeAsync]:               https://docs.datastax.com/en/drivers/java/3.11/com/datastax/driver/core/Session.html#executeAsync-com.datastax.driver.core.Statement-
 
-```{eval-rst}
+```eval_rst
 .. toctree::
    :hidden:
    :glob:
diff --git a/pom.xml b/pom.xml
index 6bea6944d38..760df6544b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -541,7 +541,7 @@
                             <link>http://www.joda.org/joda-time/apidocs/</link>
                             <link>http://fasterxml.github.io/jackson-core/javadoc/2.8/</link>
                             <link>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</link>
-                            <link>https://javaee-spec.java.net/nonav/javadocs/</link>
+                            <link>https://javaee.github.io/javaee-spec/javadocs/</link>
                         </links>
                         <!-- optional dependencies from other modules (must be explicitly declared here in order to be correctly resolved) -->
                         <additionalDependencies>
diff --git a/upgrade_guide/README.md b/upgrade_guide/README.md
index 6a413a7f547..081cb571c26 100644
--- a/upgrade_guide/README.md
+++ b/upgrade_guide/README.md
@@ -827,7 +827,7 @@ exhaustive list of new features in 2.0.
       (`ResultSet#getAvailableWithoutFetching` and `ResultSet#isFullyFetched`)
       as well as a mean to force the pre-fetching of the next page (`ResultSet#fetchMoreResults`).
 
-```{eval-rst}
+```eval_rst
 .. toctree::
    :hidden:
    :glob:
diff --git a/upgrade_guide/migrating_from_astyanax/README.md b/upgrade_guide/migrating_from_astyanax/README.md
index bfddda5ae86..32174cdd2fe 100644
--- a/upgrade_guide/migrating_from_astyanax/README.md
+++ b/upgrade_guide/migrating_from_astyanax/README.md
@@ -9,7 +9,7 @@ See the child pages for more information:
 * [Migrating Astyanax configurations to ScyllaDB Java driver configurations](configuration/)
 * [Querying and retrieving results comparisons.](queries_and_results/)
 
-```{eval-rst}
+```eval_rst
 .. toctree::
    :hidden:
    :glob: