diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 2e63948e6..12146ec10 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -78,6 +78,11 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>gradle-tooling-rcs</id>
+			<name>Gradle Tooling</name>
+			<url>https://repo.gradle.org/gradle/libs-releases/</url>
+		</repository>
 	</repositories>
 
 	<pluginRepositories>
@@ -108,8 +113,8 @@
 		<commons-codec-version>1.13</commons-codec-version>
 
 		<!-- Rewrite specific properties -->
-		<rewrite-version>7.39.0-SNAPSHOT</rewrite-version>
-		<rewrite-spring-version>4.35.0-SNAPSHOT</rewrite-spring-version>
+		<rewrite-version>7.40.0-SNAPSHOT</rewrite-version>
+		<rewrite-spring-version>4.36.0-SNAPSHOT</rewrite-spring-version>
 
 		<signing.skip>true</signing.skip>
 		<signing.alias>vmware</signing.alias>