diff --git a/gradle.properties b/gradle.properties
index 5789e40..c91b7fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,9 @@
 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 apacheGeodeVersion=1.14.4
 micrometerVersion=1.10.0-M2
-# The Spring Boot & Spring Session versions are the only required version properties.
-# The other Spring version properties are for overriding/testing purposes.
 springVersion=6.0.0-M4
-springBootVersion=3.0.0-M2
+## NOTE: Spring Boot 3.0.0-M2+ requires Gradle 7.4+ which breaks the GemFireServer Gradle Plugin! Fix!
+springBootVersion=3.0.0-M1
 springDataBomVersion=2022.0.0-M4
 springDataCommonsVersion=3.0.0-M4
 springDataGeodeVersion=3.0.0-M4
diff --git a/spring-session-data-geode/src/main/resources/changelog.txt b/spring-session-data-geode/src/main/resources/changelog.txt
index 52fe312..b28ba1f 100644
--- a/spring-session-data-geode/src/main/resources/changelog.txt
+++ b/spring-session-data-geode/src/main/resources/changelog.txt
@@ -9,7 +9,6 @@ Changes in version 3.0.0-M3 (2022-05-18)
 Aligns Spring Session for Apache Geode (SSDG) with Spring Session (core) 3.0.0-M2.
 
 * Upgrades to Spring Framework 6.0.0-M4.
-* Upgrades to Spring Boot 3.0.0-M2.
 * Upgrades to Spring Data BOM 2022.0.0-M4.
 * Upgrades to Spring Data Commons 3.0.0-M4.
 * Upgrades to Spring Data for Apache Geode 3.0.0-M4.