diff --git a/headless-services/commons/commons-rewrite/pom.xml b/headless-services/commons/commons-rewrite/pom.xml
index c4f9484d9..73af2957d 100644
--- a/headless-services/commons/commons-rewrite/pom.xml
+++ b/headless-services/commons/commons-rewrite/pom.xml
@@ -49,47 +49,48 @@
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-properties</artifactId>
-			<version>${rewrite-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-maven</artifactId>
-			<version>${rewrite-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-groovy</artifactId>
-			<version>${rewrite-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-kotlin</artifactId>
-			<version>${rewrite-kotlin-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-gradle</artifactId>
-			<version>${rewrite-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-yaml</artifactId>
-			<version>${rewrite-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-java</artifactId>
-			<version>${rewrite-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-java-11</artifactId>
-			<version>${rewrite-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-java-17</artifactId>
-			<version>${rewrite-version}</version>
+		</dependency>
+        <dependency>
+            <groupId>org.openrewrite.gradle.tooling</groupId>
+            <artifactId>model</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+		<dependency>
+			<groupId>org.gradle</groupId>
+			<artifactId>gradle-tooling-api</artifactId>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
@@ -105,7 +106,6 @@
 		<dependency>
 			<groupId>org.openrewrite.recipe</groupId>
 			<artifactId>rewrite-spring</artifactId>
-			<version>${rewrite-spring-version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.openrewrite</groupId>
@@ -113,85 +113,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-		<dependency>
-			<groupId>org.openrewrite.gradle.tooling</groupId>
-			<artifactId>model</artifactId>
-			<version>${rewrite-gradle-tooling-api-version}</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-tooling-api</artifactId>
-			<version>${gradle-tooling.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-base-services</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-core-api</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-language-groovy</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-language-java</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-logging</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-messaging</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-native</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-process-services</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-resources</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-testing-base</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-testing-jvm</artifactId>
-			<version>${gradle-core.version}</version>
-			<scope>runtime</scope>
-		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index cbf3ac942..8cacbe059 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.0</version>
+		<version>3.3.1</version>
 		<relativePath></relativePath>
 	</parent>
 
@@ -119,21 +119,34 @@
 		<kotlin.version>1.9.20</kotlin.version>
 
 		<!-- Rewrite specific properties -->
-		<rewrite-version>8.27.1</rewrite-version>
-		<rewrite-kotlin-version>1.16.2</rewrite-kotlin-version>
-		<rewrite-spring-version>5.11.0</rewrite-spring-version>
-		<rewrite-gradle-tooling-api-version>2.3.0</rewrite-gradle-tooling-api-version>
+        <rewrite-recipe-bom.version>2.14.0</rewrite-recipe-bom.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <gradle.version>8.4</gradle.version>
 		<jgit-version>6.9.0.202403050737-r</jgit-version>
 		
-		<gradle-tooling.version>8.5</gradle-tooling.version>
-		<gradle-core.version>6.1.1</gradle-core.version>
-		
 		<antlr.version>4.13.1</antlr.version>
 
 		<signing.skip>true</signing.skip>
 		<signing.alias>vmware</signing.alias>
 	</properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.openrewrite.recipe</groupId>
+                <artifactId>rewrite-recipe-bom</artifactId>
+                <version>${rewrite-recipe-bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.gradle</groupId>
+                <artifactId>gradle-tooling-api</artifactId>
+                <version>${gradle.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 	<build>
 		<plugins>
 			<!-- Set source 1.8 -->
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java
index a6374362f..0da6b4ba2 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java
@@ -169,13 +169,7 @@ public class RewriteRecipeRepository {
 					if (recipes.containsKey(r.getName())) {
 						log.error("Duplicate ids: '" + r.getName() + "'");
 					}
-					recipes.put(r.getName(), r);					
-					// HACK: add Jakarta XML Bind migration recipe again as there are cases when maven dependency isn't added
-					if (r.getName().startsWith("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_")) {
-						AddDependency addDepXmlBindDep = new AddDependency("jakarta.xml.bind", "jakarta.xml.bind-api", "latest.release", null, null, null, "javax.xml.bind..*", null, null, null, null, false);
-						r.getDescriptor().getRecipeList().add(addDepXmlBindDep.getDescriptor());
-						r.getRecipeList().add(addDepXmlBindDep);
-					}
+					recipes.put(r.getName(), r);
 				}
 			}
 			log.info("Done loading Rewrite Recipes");
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepositoryTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepositoryTest.java
index ecdcf89f5..5d19eee42 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepositoryTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepositoryTest.java
@@ -35,7 +35,7 @@ public class RewriteRecipeRepositoryTest {
 	@Test
 	void listSubRecipe() throws Exception {
 		List<Recipe> recipes = recipeRepo.getSubRecipes("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1", List.of()).get();
-		assertEquals(8, recipes.size());
+		assertEquals(7, recipes.size());
 		
 		recipes = recipeRepo.getSubRecipes("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1", List.of(0, 2)).get();
 		assertEquals(20, recipes.size());