diff --git a/docs/java-api/client.asciidoc b/docs/java-api/client.asciidoc
index 0c0e12e0a73f1..89b7d2b20c059 100644
--- a/docs/java-api/client.asciidoc
+++ b/docs/java-api/client.asciidoc
@@ -41,8 +41,8 @@ https://github.com/elastic/elasticsearch/issues/27205[Java high-level REST
 client completeness].
 
 Any missing APIs can always be implemented today by using the
-link:/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html[low
-level Java REST Client] with JSON request and response bodies.
+{java-rest}/java-rest-low.html[low level Java REST Client] with JSON request and
+response bodies.
 
 ===================================
 
diff --git a/docs/java-api/index.asciidoc b/docs/java-api/index.asciidoc
index d24636e09b204..453becbaad281 100644
--- a/docs/java-api/index.asciidoc
+++ b/docs/java-api/index.asciidoc
@@ -35,8 +35,8 @@ https://github.com/elastic/elasticsearch/issues/27205[Java high-level REST
 client completeness].
 
 Any missing APIs can always be implemented today by using the
-link:/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html[low
-level Java REST Client] with JSON request and response bodies.
+{java-rest}/java-rest-low.html[low level Java REST Client] with JSON request and
+response bodies.
 
 ===================================
 
diff --git a/docs/reference/setup/setup-xclient.asciidoc b/docs/reference/setup/setup-xclient.asciidoc
index 17f21c2aa3eb0..426ad3797a66b 100644
--- a/docs/reference/setup/setup-xclient.asciidoc
+++ b/docs/reference/setup/setup-xclient.asciidoc
@@ -25,8 +25,8 @@ https://github.com/elastic/elasticsearch/issues/27205[Java high-level REST
 client completeness].
 
 Any missing APIs can always be implemented today by using the
-link:/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html[low
-level Java REST Client] with JSON request and response bodies.
+{java-rest}/java-rest-low.html[low level Java REST Client] with JSON request and
+response bodies.
 
 ===================================
 
diff --git a/x-pack/docs/en/security/tribe-clients-integrations/java.asciidoc b/x-pack/docs/en/security/tribe-clients-integrations/java.asciidoc
index c9c08cec296d4..c564c20da5182 100644
--- a/x-pack/docs/en/security/tribe-clients-integrations/java.asciidoc
+++ b/x-pack/docs/en/security/tribe-clients-integrations/java.asciidoc
@@ -1,9 +1,9 @@
 [[java-clients]]
 === Java Client and security
 
-The {es} {security-features} support the Java 
-http://www.elastic.co/guide/en/elasticsearch/client/java-api/current/transport-client.html[transport client]
-for Elasticsearch.
+The {es} {security-features} support the Java
+{javaclient}/transport-client.html[transport client] for Elasticsearch.
+
 The transport client uses the same transport protocol that the cluster nodes use
 for inter-node communication. It is very efficient as it does not have to marshall
 and unmarshall JSON requests like a typical REST client.
@@ -33,8 +33,8 @@ https://github.com/elastic/elasticsearch/issues/27205[Java high-level REST
 client completeness].
 
 Any missing APIs can always be implemented today by using the
-link:/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html[low
-level Java REST Client] with JSON request and response bodies.
+{java-rest}/java-rest-low.html[low level Java REST Client] with JSON request and
+response bodies.
 
 ===================================
 
diff --git a/x-pack/docs/en/watcher/java.asciidoc b/x-pack/docs/en/watcher/java.asciidoc
index 37a375d19adb4..cd790f08f7c5e 100644
--- a/x-pack/docs/en/watcher/java.asciidoc
+++ b/x-pack/docs/en/watcher/java.asciidoc
@@ -19,8 +19,8 @@ https://github.com/elastic/elasticsearch/issues/27205[Java high-level REST
 client completeness].
 
 Any missing APIs can always be implemented today by using the
-link:/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html[low
-level Java REST Client] with JSON request and response bodies.
+{java-rest}/java-rest-low.html[low level Java REST Client] with JSON request and
+response bodies.
 
 ===================================