diff --git a/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc b/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc
index 9a19a2e7..b6961e9d 100644
--- a/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc
+++ b/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc
@@ -1,6 +1,6 @@
 [[geode-samples-boot-actuator]]
 = Spring Boot Actuator for Apache Geode & Pivotal GemFire
-:apache-geode-version: 16
+:apache-geode-version: {master-apache-geode-version}
 :apache-geode-docs:https://geode.apache.org/docs/guide/{apache-geode-version}
 :images-dir: ../images
 :spring-boot-docs: https://docs.spring.io/spring-boot/docs/current/reference/html
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 6ad3f08d..ad062d53 100644
--- a/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc
+++ b/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc
@@ -1,7 +1,7 @@
 [[geode-samples-boot-configuration]]
 = Spring Boot Auto-configuration for Apache Geode & Pivotal GemFire
 John Blum
-:apache-geode-version: 16
+:apache-geode-version: {master-apache-geode-version}
 :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version}
 :toc:
 :toclevels: 2
diff --git a/spring-geode-docs/src/docs/asciidoc/guides/caching-http-session.adoc b/spring-geode-docs/src/docs/asciidoc/guides/caching-http-session.adoc
index 68f7366c..289ebc5b 100644
--- a/spring-geode-docs/src/docs/asciidoc/guides/caching-http-session.adoc
+++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-http-session.adoc
@@ -1,7 +1,7 @@
 [[geode-samples-caching-http-session]]
 = HTTP Session State Caching with Spring
 :images-dir: ../images
-:apache-geode-version: 16
+:apache-geode-version: {master-apache-geode-version}
 :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version}
 :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc
 :apache-geode-website: https://geode.apache.org/
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 75bdf870..c51af935 100644
--- a/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc
+++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc
@@ -1,7 +1,7 @@
 [[geode-samples-caching-inline]]
 = Inline Caching with Spring
 :images-dir: ../images
-:apache-geode-version: 16
+:apache-geode-version: {master-apache-geode-version}
 :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version}
 :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc
 :spring-boot-docs: https://docs.spring.io/spring-boot/docs/current/reference/html
diff --git a/spring-geode-docs/src/docs/asciidoc/guides/caching-look-aside.adoc b/spring-geode-docs/src/docs/asciidoc/guides/caching-look-aside.adoc
index 5c752faa..0d9db4a1 100644
--- a/spring-geode-docs/src/docs/asciidoc/guides/caching-look-aside.adoc
+++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-look-aside.adoc
@@ -1,7 +1,7 @@
 [[geode-samples-caching-lookaside]]
 = Look-Aside Caching with Spring
 :images-dir: ../images
-:apache-geode-version: 16
+:apache-geode-version: {master-apache-geode-version}
 :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version}
 :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc
 :spring-boot-docs: https://docs.spring.io/spring-boot/docs/current/reference/html
@@ -214,7 +214,7 @@ include::{samples-dir}/caching/look-aside/src/main/java/example/app/caching/look
 Essentially, we just inject our `CounterService` application class and wrap the service operations in Web service
 endpoints, accessible by URL using HTTP:
 
-.Example Apache Geode Applications using Spring Boot
+.Counter Web service endpoints
 |===
 | URL | Description
 
diff --git a/spring-geode-docs/src/docs/asciidoc/guides/caching-near.adoc b/spring-geode-docs/src/docs/asciidoc/guides/caching-near.adoc
index 2d17f17d..5b348223 100644
--- a/spring-geode-docs/src/docs/asciidoc/guides/caching-near.adoc
+++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-near.adoc
@@ -1,7 +1,7 @@
 [[geode-samples-caching-near]]
 = Near Caching with Spring
 :images-dir: ../images
-:apache-geode-version: 16
+:apache-geode-version: {master-apache-geode-version}
 :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version}
 :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc
 :spring-boot-docs: https://docs.spring.io/spring-boot/docs/current/reference/html
diff --git a/spring-geode-docs/src/docs/asciidoc/index.adoc b/spring-geode-docs/src/docs/asciidoc/index.adoc
index a5fa2510..eab7c4ed 100644
--- a/spring-geode-docs/src/docs/asciidoc/index.adoc
+++ b/spring-geode-docs/src/docs/asciidoc/index.adoc
@@ -10,7 +10,7 @@ John Blum
 :numbered:
 :icons: font
 :hide-uri-scheme:
-:apache-geode-version: 19
+:apache-geode-version: {master-apache-geode-version}
 :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version}
 :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc
 :apache-geode-website: https://geode.apache.org/