diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
index f10a140..2602dda 100644
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -14,5 +14,9 @@ dependencyManagement {
 		dependency "org.apache.geode:geode-cq:$apacheGeodeVersion"
 		dependency "org.apache.geode:geode-lucene:$apacheGeodeVersion"
 		dependency "org.apache.geode:geode-wan:$apacheGeodeVersion"
+		dependency "io.pivotal.gemfire:geode-core:$pivotalGemFireVersion"
+		dependency "io.pivotal.gemfire:geode-cq:$pivotalGemFireVersion"
+		dependency "io.pivotal.gemfire:geode-lucene:$pivotalGemFireVersion"
+		dependency "io.pivotal.gemfire:geode-wan:$pivotalGemFireVersion"
 	}
 }
diff --git a/pom.xml b/pom.xml
index 5f4554e..23693b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
 		<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
 		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<!--		<apache-geode.version>1.12.0</apache-geode.version>-->
+		<apache-geode.version>1.12.0</apache-geode.version>
 		<assertj.version>3.18.0</assertj.version>
 		<junit.version>4.13.1</junit.version>
 		<log4j.version>2.12.1</log4j.version>
@@ -91,7 +91,7 @@
 		<lombok.version>1.18.16</lombok.version>
 		<mockito.version>3.6.0</mockito.version>
 		<multithreadedtc.version>1.01</multithreadedtc.version>
-<!--		<pivotal-gemfire.version>9.10.2</pivotal-gemfire.version>-->
+		<pivotal-gemfire.version>9.10.4</pivotal-gemfire.version>
 		<spring.version>5.2.10.RELEASE</spring.version>
 		<spring-boot.version>2.3.5.RELEASE</spring-boot.version>
 		<spring-data-releasetrain.version>Neumann-SR5</spring-data-releasetrain.version>
@@ -158,6 +158,7 @@
 				<artifactId>geode-wan</artifactId>
 				<version>${apache-geode.version}</version>
 			</dependency>
+-->
 			<dependency>
 				<groupId>io.pivotal.gemfire</groupId>
 				<artifactId>geode-core</artifactId>
@@ -178,7 +179,6 @@
 				<artifactId>geode-wan</artifactId>
 				<version>${pivotal-gemfire.version}</version>
 			</dependency>
--->
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter</artifactId>