diff --git a/geode/pom.xml b/geode/pom.xml
index 72e20edb..714e83f7 100755
--- a/geode/pom.xml
+++ b/geode/pom.xml
@@ -25,13 +25,11 @@
 		<module>security</module>
 		<module>storage</module>
 		<module>transactions</module>
-
-		<!-- WAN Server does not stop. Disabled for now -->
-		<!-- <module>wan</module> -->
+		<module>wan</module>
 	</modules>
 
 	<properties>
-		<spring.test.data.geode.version>0.0.14.RELEASE</spring.test.data.geode.version>
+		<spring.test.data.geode.version>0.1.2</spring.test.data.geode.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/geode/wan/src/main/java/example/springdata/geode/server/wan/event/server/WanServerConfig.java b/geode/wan/src/main/java/example/springdata/geode/server/wan/event/server/WanServerConfig.java
index 0ea4acd9..b6eda78c 100755
--- a/geode/wan/src/main/java/example/springdata/geode/server/wan/event/server/WanServerConfig.java
+++ b/geode/wan/src/main/java/example/springdata/geode/server/wan/event/server/WanServerConfig.java
@@ -57,7 +57,8 @@ public class WanServerConfig {
 	@Bean(name = "DiskStore")
 	DiskStoreFactoryBean diskStore(GemFireCache gemFireCache, Faker faker) throws IOException {
 		DiskStoreFactoryBean diskStoreFactoryBean = new DiskStoreFactoryBean();
-		File tempDirectory = File.createTempFile(faker.name().firstName(), faker.name().firstName());
+		File tempDirectory = File.createTempFile("prefix-" + faker.name().firstName(),
+				"suffix-" + faker.name().firstName());
 		tempDirectory.delete();
 		tempDirectory.mkdirs();
 		tempDirectory.deleteOnExit();
diff --git a/pom.xml b/pom.xml
index 1e3697ca..8db7785f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 		<!-- <module>couchbase</module> Bug in Couchbase SDK -->
 		<module>cassandra</module>
 		<module>elasticsearch</module>
-		<!-- <module>geode</module> Geode isn't Java 16-ready -->
+		<module>geode</module>
 		<module>jdbc</module>
 		<module>jpa</module>
 		<module>ldap</module>