diff --git a/docs/modules/ROOT/pages/server/aot-and-native-image-support.adoc b/docs/modules/ROOT/pages/server/aot-and-native-image-support.adoc
index f37cd819..8c51e09b 100644
--- a/docs/modules/ROOT/pages/server/aot-and-native-image-support.adoc
+++ b/docs/modules/ROOT/pages/server/aot-and-native-image-support.adoc
@@ -2,7 +2,7 @@
 =  AOT and Native Image Support
 :page-section-summary-toc: 1
 
-Since `4.0.0`, Spring Cloud Config Server supports Spring AOT transformations. As of `4.1.0` it also supports GraalVM native images, however it requires the user to add some workarounds for known GraalVM issues, as described below.
+Since `4.0.0`, Spring Cloud Config Server supports Spring AOT transformations. As of `4.1.0` it also supports GraalVM native images, as long as GraalVM 21 or higher is used, however it requires the user to add some workarounds for known GraalVM issues, as described below.
 
 ====
 
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java
index 5eb7ca7c..bfadcaf6 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java
@@ -187,6 +187,7 @@ public class CompositeEnvironmentBeanFactoryInitializationAotProcessor
 			});
 		}
 
+		// TODO: switch to reflectionHints.registerForInterfaces(...) after upgrading to Framework 6.2.0
 		// from Spring Framework BeanRegistrationsAotContribution
 		private void introspectPublicMethodsOnAllInterfaces(ReflectionHints hints, Class<?> type) {
 			Class<?> currentClass = type;