diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d67db1e6..1ad73cef 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 
 [versions]
-springBoot = "3.5.8"
-springAi = "1.1.2"
+springBoot = "4.0.2"
+springAi = "2.0.0-M2"
 jmockit = "1.50"
 shadow = "8.3.9"
 asciidoctorJvm = "4.0.5"
@@ -22,6 +22,7 @@ jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-datab
 jmockit = { group = "org.jmockit", name = "jmockit", version.ref = "jmockit" }
 
 spring-boot-starter-test = { group = "org.springframework.boot", name = "spring-boot-starter-test", version.ref = "springBoot" }
+spring-boot-starter-webmvc-test = { group = "org.springframework.boot", name = "spring-boot-starter-webmvc-test", version.ref = "springBoot" }
 spring-boot-starter-data-redis = { group = "org.springframework.boot", name = "spring-boot-starter-data-redis", version.ref = "springBoot" }
 spring-boot = { group = "org.springframework.boot", name = "spring-boot", version.ref = "springBoot" }
 spring-boot-autoconfigure = { group = "org.springframework.boot", name = "spring-boot-autoconfigure", version.ref = "springBoot" }
diff --git a/java-cfenv-boot-tanzu-genai/build.gradle b/java-cfenv-boot-tanzu-genai/build.gradle
index 71229ad2..7854acec 100644
--- a/java-cfenv-boot-tanzu-genai/build.gradle
+++ b/java-cfenv-boot-tanzu-genai/build.gradle
@@ -8,6 +8,7 @@ dependencies {
     api project(':java-cfenv-boot')
     api libs.spring.ai.openai
     implementation libs.spring.boot.autoconfigure
+    implementation 'org.springframework.boot:spring-boot-starter-restclient'
 
     testImplementation project(':java-cfenv-test-support')
     testImplementation libs.jmockit
diff --git a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfServiceEnablingEnvironmentPostProcessor.java b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfServiceEnablingEnvironmentPostProcessor.java
index 9605a909..219768ca 100644
--- a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfServiceEnablingEnvironmentPostProcessor.java
+++ b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfServiceEnablingEnvironmentPostProcessor.java
@@ -15,7 +15,7 @@
  */
 package io.pivotal.cfenv.spring.boot;
 
-import org.springframework.boot.env.EnvironmentPostProcessor;
+import org.springframework.boot.EnvironmentPostProcessor;
 import org.springframework.core.env.Environment;
 
 import io.pivotal.cfenv.core.CfService;
diff --git a/java-cfenv-boot/src/main/resources/META-INF/spring.factories b/java-cfenv-boot/src/main/resources/META-INF/spring.factories
index c25db022..45b81aed 100644
--- a/java-cfenv-boot/src/main/resources/META-INF/spring.factories
+++ b/java-cfenv-boot/src/main/resources/META-INF/spring.factories
@@ -1,5 +1,5 @@
 # Environment Post Processors
-org.springframework.boot.env.EnvironmentPostProcessor=\
+org.springframework.boot.EnvironmentPostProcessor=\
   io.pivotal.cfenv.spring.boot.CfDataSourceEnvironmentPostProcessor,\
   io.pivotal.cfenv.spring.boot.CfEnvironmentPostProcessor
 # Also register as a ApplicationListener to log what occurred in the post processing step
diff --git a/java-cfenv-test-support/build.gradle b/java-cfenv-test-support/build.gradle
index d16ac157..a229fa6b 100644
--- a/java-cfenv-test-support/build.gradle
+++ b/java-cfenv-test-support/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     api platform(libs.spring.boot.dependencies)
     api project(':java-cfenv')
     api testFixtures(project(':java-cfenv'))
-    api libs.spring.boot.starter.test
+    api libs.spring.boot.starter.webmvc.test
     api libs.jackson.core
     api libs.jackson.databind
 }