diff --git a/build.gradle b/build.gradle
index 03e9aca6dd..f8176d2251 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,13 +100,13 @@ ext {
     servletApiVersion = '5.0.0'
     smackVersion = '4.4.6'
     springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
-    springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M6'
-    springGraphqlVersion = '1.1.0-M1'
-    springKafkaVersion = '3.0.0-M6'
-    springRetryVersion = '2.0.0-M1'
-    springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M7'
-    springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M6'
-    springWsVersion = '4.0.0-M2'
+    springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
+    springGraphqlVersion = '1.1.0-SNAPSHOT'
+    springKafkaVersion = '3.0.0-SNAPSHOT'
+    springRetryVersion = '2.0.0-SNAPSHOT'
+    springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
+    springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
+    springWsVersion = '4.0.0-SNAPSHOT'
     testcontainersVersion = '1.17.3'
     tomcatVersion = '10.0.23'
     xmlUnitVersion = '2.9.0'
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aot/GatewayProxyBeanRegistrationAotProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aot/GatewayProxyBeanRegistrationAotProcessor.java
index 49059220dd..bdf4128cc9 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/aot/GatewayProxyBeanRegistrationAotProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/aot/GatewayProxyBeanRegistrationAotProcessor.java
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
 import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
 import org.springframework.beans.factory.aot.BeanRegistrationCode;
 import org.springframework.beans.factory.aot.BeanRegistrationCodeFragments;
+import org.springframework.beans.factory.aot.BeanRegistrationCodeFragmentsDecorator;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.DecoratingProxy;
@@ -45,15 +46,15 @@ class GatewayProxyBeanRegistrationAotProcessor implements BeanRegistrationAotPro
 	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
 		if (GatewayProxyFactoryBean.class.isAssignableFrom(registeredBean.getBeanClass())) {
 			return BeanRegistrationAotContribution
-					.ofBeanRegistrationCodeFragmentsCustomizer(GatewayProxyBeanRegistrationCodeFragments::new);
+					.withCustomCodeFragments(GatewayProxyBeanRegistrationCodeFragments::new);
 		}
 		return null;
 	}
 
-	private static class GatewayProxyBeanRegistrationCodeFragments extends BeanRegistrationCodeFragments {
+	private static class GatewayProxyBeanRegistrationCodeFragments extends BeanRegistrationCodeFragmentsDecorator {
 
-		GatewayProxyBeanRegistrationCodeFragments(BeanRegistrationCodeFragments codeFragments) {
-			super(codeFragments);
+		GatewayProxyBeanRegistrationCodeFragments(BeanRegistrationCodeFragments delegate) {
+			super(delegate);
 		}
 
 		@Override