diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/ManagementConfigurationPlugin.java b/buildSrc/src/main/java/org/springframework/shell/gradle/ManagementConfigurationPlugin.java
index 8c5c1dc7..c7aaefff 100644
--- a/buildSrc/src/main/java/org/springframework/shell/gradle/ManagementConfigurationPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/shell/gradle/ManagementConfigurationPlugin.java
@@ -46,10 +46,7 @@ public class ManagementConfigurationPlugin implements Plugin<Project> {
 			management.setCanBeResolved(false);
 			PluginContainer plugins = project.getPlugins();
 			plugins.withType(JavaPlugin.class, (javaPlugin) -> {
-				configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).extendsFrom(management);
-				configurations.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME).extendsFrom(management);
-				configurations.getByName(JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME).extendsFrom(management);
-				configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME).extendsFrom(management);
+				configurations.getByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME).extendsFrom(management);
 			});
 			plugins.withType(JavaTestFixturesPlugin.class, (javaTestFixturesPlugin) -> {
 				configurations.getByName("testFixturesCompileClasspath").extendsFrom(management);
diff --git a/spring-shell-samples/spring-shell-samples.gradle b/spring-shell-samples/spring-shell-samples.gradle
index 3e0c73f7..53932bdb 100644
--- a/spring-shell-samples/spring-shell-samples.gradle
+++ b/spring-shell-samples/spring-shell-samples.gradle
@@ -21,10 +21,3 @@ graalvmNative {
 		version = "0.1.1"
 	}
 }
-
-// TODO: workaround until boot's aot plugin automatically extends
-//       from all super configurations like graalvm's plugin does.
-configurations {
-	aotCompileClasspath.extendsFrom management
-	aotRuntimeClasspath.extendsFrom management
-}