diff --git a/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc b/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc
index 8c5baceb..131a8102 100644
--- a/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc
+++ b/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc
@@ -817,7 +817,7 @@ and specifically, Authentication/Authorization (Auth) along with Transport Layer
 
 In today's age, Security is no laughing matter and making sure your applications are secure is a first-class concern.
 This is why SBDG takes Security very seriously and attempts to make this as simple as possible. You are definitely
-encouraged to read the relevant <<geode-security,chapter>> in this Reference Documentation on the provided Security
+encouraged to read the relevant <<../_includes/security.adoc#geode-security,chapter>> in this Reference Documentation on the provided Security
 _auto-configuration_ support.
 
 We will now expand on our example to secure the client and server processes, with both Auth and TLS using SSL, and then
@@ -859,7 +859,7 @@ include::{samples-dir}/boot/configuration/src/main/resources/geode/bin/start-sec
 
 NOTE: SBDG does provide server-side, peer Security _auto-configuration_ support. However, you must then configure
 and bootstrap your GemFire/Geode servers with Spring. Again, an example of configuring/bootstrapping GemFire/Geode
-servers with Spring is provided <<geode-cluster-configuration-bootstrapping,here>>.
+servers with Spring is provided <<../_includes/configuration-auto.adoc#geode-cluster-configuration-bootstrapping,here>>.
 
 [[geode-samples-boot-configuration-clientserver-security-client]]
 === Securing the client
diff --git a/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc b/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc
index 703ef58c..9589ca0a 100644
--- a/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc
+++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc
@@ -152,7 +152,7 @@ is called 2 or more times with the same input, the cached result will be returne
 expired or been evicted.  We neither configure eviction nor expiration for this example, however.
 
 Both the `factorial(..)` and `sqrt(..)` methods have been annotated with Spring's `@Cacheable` annotation to demarcate
-these methods with caching behavior.  Of course, as explained in SBDG's <<geode-caching-provider,documentation>>,
+these methods with caching behavior.  Of course, as explained in SBDG's <<../_includes/configuration-annotations.adoc#geode-caching-provider,documentation>>,
 caching with Spring's Cache Abstraction using Apache Geode (or Pivotal GemFire, even Pivotal Cloud Cache (PCC)
 when running in Pivotal CloudFoundry (PCF)) as the caching provider is enabled by default.  Therefore, there is nothing
 more you need do to start leverage caching in your Spring Boot applications than to annotate the service methods