diff --git a/spring-cloud-commons/src/main/resources/META-INF/spring.factories b/spring-cloud-commons/src/main/resources/META-INF/spring.factories
index 3220950b..69967501 100644
--- a/spring-cloud-commons/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-commons/src/main/resources/META-INF/spring.factories
@@ -1,23 +1,3 @@
-# AutoConfiguration
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.client.CommonsClientAutoConfiguration,\
-org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration,\
-org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientAutoConfiguration,\
-org.springframework.cloud.client.discovery.composite.reactive.ReactiveCompositeDiscoveryClientAutoConfiguration,\
-org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration,\
-org.springframework.cloud.client.discovery.simple.reactive.SimpleReactiveDiscoveryClientAutoConfiguration,\
-org.springframework.cloud.client.hypermedia.CloudHypermediaAutoConfiguration,\
-org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration,\
-org.springframework.cloud.client.loadbalancer.LoadBalancerDefaultMappingsProviderAutoConfiguration,\
-org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerBeanPostProcessorAutoConfiguration,\
-org.springframework.cloud.client.loadbalancer.reactive.ReactorLoadBalancerClientAutoConfiguration,\
-org.springframework.cloud.client.serviceregistry.ServiceRegistryAutoConfiguration,\
-org.springframework.cloud.commons.httpclient.HttpClientConfiguration,\
-org.springframework.cloud.commons.util.UtilAutoConfiguration,\
-org.springframework.cloud.configuration.CompatibilityVerifierAutoConfiguration,\
-org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration,\
-org.springframework.cloud.commons.security.ResourceServerTokenRelayAutoConfiguration,\
-org.springframework.cloud.commons.config.CommonsConfigAutoConfiguration
 # Environment Post Processors
 org.springframework.boot.env.EnvironmentPostProcessor=\
 org.springframework.cloud.client.HostInfoEnvironmentPostProcessor
diff --git a/spring-cloud-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..f6359aa0
--- /dev/null
+++ b/spring-cloud-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,18 @@
+org.springframework.cloud.client.CommonsClientAutoConfiguration
+org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration
+org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientAutoConfiguration
+org.springframework.cloud.client.discovery.composite.reactive.ReactiveCompositeDiscoveryClientAutoConfiguration
+org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration
+org.springframework.cloud.client.discovery.simple.reactive.SimpleReactiveDiscoveryClientAutoConfiguration
+org.springframework.cloud.client.hypermedia.CloudHypermediaAutoConfiguration
+org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration
+org.springframework.cloud.client.loadbalancer.LoadBalancerDefaultMappingsProviderAutoConfiguration
+org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerBeanPostProcessorAutoConfiguration
+org.springframework.cloud.client.loadbalancer.reactive.ReactorLoadBalancerClientAutoConfiguration
+org.springframework.cloud.client.serviceregistry.ServiceRegistryAutoConfiguration
+org.springframework.cloud.commons.httpclient.HttpClientConfiguration
+org.springframework.cloud.commons.util.UtilAutoConfiguration
+org.springframework.cloud.configuration.CompatibilityVerifierAutoConfiguration
+org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration
+org.springframework.cloud.commons.security.ResourceServerTokenRelayAutoConfiguration
+org.springframework.cloud.commons.config.CommonsConfigAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-context/src/main/resources/META-INF/spring.factories b/spring-cloud-context/src/main/resources/META-INF/spring.factories
index 3565caad..6d43199b 100644
--- a/spring-cloud-context/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-context/src/main/resources/META-INF/spring.factories
@@ -1,10 +1,3 @@
-# AutoConfiguration
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration,\
-org.springframework.cloud.autoconfigure.LifecycleMvcEndpointAutoConfiguration,\
-org.springframework.cloud.autoconfigure.RefreshAutoConfiguration,\
-org.springframework.cloud.autoconfigure.RefreshEndpointAutoConfiguration,\
-org.springframework.cloud.autoconfigure.WritableEnvironmentEndpointAutoConfiguration
 # Application Listeners
 org.springframework.context.ApplicationListener=\
 org.springframework.cloud.bootstrap.BootstrapApplicationListener,\
diff --git a/spring-cloud-context/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-context/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..e214b115
--- /dev/null
+++ b/spring-cloud-context/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,5 @@
+org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration
+org.springframework.cloud.autoconfigure.LifecycleMvcEndpointAutoConfiguration
+org.springframework.cloud.autoconfigure.RefreshAutoConfiguration
+org.springframework.cloud.autoconfigure.RefreshEndpointAutoConfiguration
+org.springframework.cloud.autoconfigure.WritableEnvironmentEndpointAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-loadbalancer/src/main/resources/META-INF/spring.factories b/spring-cloud-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 62%
rename from spring-cloud-loadbalancer/src/main/resources/META-INF/spring.factories
rename to spring-cloud-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 03d4e739..90372340 100644
--- a/spring-cloud-loadbalancer/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,7 +1,5 @@
-# AutoConfiguration
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration,\
-org.springframework.cloud.loadbalancer.config.BlockingLoadBalancerClientAutoConfiguration,\
-org.springframework.cloud.loadbalancer.config.LoadBalancerCacheAutoConfiguration,\
-org.springframework.cloud.loadbalancer.security.OAuth2LoadBalancerClientAutoConfiguration,\
+org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration
+org.springframework.cloud.loadbalancer.config.BlockingLoadBalancerClientAutoConfiguration
+org.springframework.cloud.loadbalancer.config.LoadBalancerCacheAutoConfiguration
+org.springframework.cloud.loadbalancer.security.OAuth2LoadBalancerClientAutoConfiguration
 org.springframework.cloud.loadbalancer.config.LoadBalancerStatsAutoConfiguration
\ No newline at end of file