diff --git a/docs/developer/best-practices/index.asciidoc b/docs/developer/best-practices/index.asciidoc
index c3f8239e9af91..c610c787d2b8d 100644
--- a/docs/developer/best-practices/index.asciidoc
+++ b/docs/developer/best-practices/index.asciidoc
@@ -22,7 +22,7 @@ Are you planning with scalability in mind?
 
 Did you know {kib} makes a public statement about our commitment to
 creating an accessible product for people with disabilities?
-https://www.elastic.co/guide/en/kibana/master/accessibility.html[We do]!
+<<accessibility,We do>>!
 It’s very important all of our apps are accessible.
 
 * Learn how https://elastic.github.io/eui/#/guidelines/accessibility[EUI
diff --git a/docs/setup/connect-to-elasticsearch.asciidoc b/docs/setup/connect-to-elasticsearch.asciidoc
index 9e1ee62f093fe..f459150b0ee8d 100644
--- a/docs/setup/connect-to-elasticsearch.asciidoc
+++ b/docs/setup/connect-to-elasticsearch.asciidoc
@@ -13,7 +13,7 @@ All integrations are available in a single view, and
 image::images/add-integration.png[Integrations page from which you can choose integrations to start collecting and analyzing data]
 
 NOTE: When an integration is available for both
-https://www.elastic.co/guide/en/fleet/master/beats-agent-comparison.html[Elastic Agent and Beats],
+{fleet-guide}/beats-agent-comparison.html[Elastic Agent and Beats],
 the *Integrations* view defaults to the
 Elastic Agent integration, if it is generally available (GA).
 To show a