diff --git a/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories
index 43c87e4c..3768e9e3 100644
--- a/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories
@@ -1,7 +1,2 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration,\
-org.springframework.cloud.kubernetes.client.KubernetesClientActuatorConfiguration
-
-
 org.springframework.boot.env.EnvironmentPostProcessor=\
 org.springframework.cloud.kubernetes.client.profile.KubernetesClientProfileEnvironmentPostProcessor
diff --git a/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..42d61d84
--- /dev/null
+++ b/spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration
+org.springframework.cloud.kubernetes.client.KubernetesClientActuatorConfiguration
diff --git a/spring-cloud-kubernetes-client-config/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-client-config/src/main/resources/META-INF/spring.factories
index 107ff95e..4006bda9 100644
--- a/spring-cloud-kubernetes-client-config/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-client-config/src/main/resources/META-INF/spring.factories
@@ -1,5 +1,3 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.client.config.reload.KubernetesClientConfigReloadAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.kubernetes.client.config.KubernetesClientBootstrapConfiguration,\
 org.springframework.cloud.kubernetes.client.config.KubernetesClientRetryBootstrapConfiguration
diff --git a/spring-cloud-kubernetes-client-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-client-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..6a9e6f8e
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.springframework.cloud.kubernetes.client.config.reload.KubernetesClientConfigReloadAutoConfiguration
diff --git a/spring-cloud-kubernetes-client-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-client-discovery/src/main/resources/META-INF/spring.factories
index 507576df..31842ad6 100644
--- a/spring-cloud-kubernetes-client-discovery/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-client-discovery/src/main/resources/META-INF/spring.factories
@@ -1,7 +1,3 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.client.discovery.KubernetesDiscoveryClientAutoConfiguration,\
-org.springframework.cloud.kubernetes.client.discovery.reactive.KubernetesInformerReactiveDiscoveryClientAutoConfiguration
-
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.kubernetes.client.discovery.KubernetesDiscoveryClientConfigClientBootstrapConfiguration
 
diff --git a/spring-cloud-kubernetes-client-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-client-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..0b5d75f9
--- /dev/null
+++ b/spring-cloud-kubernetes-client-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+org.springframework.cloud.kubernetes.client.discovery.KubernetesDiscoveryClientAutoConfiguration
+org.springframework.cloud.kubernetes.client.discovery.reactive.KubernetesInformerReactiveDiscoveryClientAutoConfiguration
diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-client-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 61%
rename from spring-cloud-kubernetes-client-loadbalancer/src/main/resources/META-INF/spring.factories
rename to spring-cloud-kubernetes-client-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 870a69d7..e2edbe02 100644
--- a/spring-cloud-kubernetes-client-loadbalancer/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-client-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.kubernetes.client.loadbalancer.KubernetesClientLoadBalancerAutoConfiguration
diff --git a/spring-cloud-kubernetes-commons/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-commons/src/main/resources/META-INF/spring.factories
index c9658215..03349b4b 100644
--- a/spring-cloud-kubernetes-commons/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-commons/src/main/resources/META-INF/spring.factories
@@ -1,6 +1,3 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration,\
-org.springframework.cloud.kubernetes.commons.config.reload.ConfigReloadAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.kubernetes.commons.config.KubernetesBootstrapConfiguration
 
diff --git a/spring-cloud-kubernetes-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..903e1a2c
--- /dev/null
+++ b/spring-cloud-kubernetes-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration
+org.springframework.cloud.kubernetes.commons.config.reload.ConfigReloadAutoConfiguration
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 57%
rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/resources/META-INF/spring.factories
rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 453ef580..671d1d06 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.kubernetes.configserver.KubernetesConfigServerAutoConfiguration
-
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/resources/META-INF/spring.factories b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/resources/META-INF/spring.factories
index 86565476..b3e57fd8 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/resources/META-INF/spring.factories
@@ -1,4 +1,2 @@
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.kubernetes.configserver.TestBootstrapConfig
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.configserver.KubernetesConfigServerAutoConfiguration
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..671d1d06
--- /dev/null
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.springframework.cloud.kubernetes.configserver.KubernetesConfigServerAutoConfiguration
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 59%
rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/resources/META-INF/spring.factories
rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index c2377568..1e9ae2d6 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.kubernetes.configuration.watcher.ConfigurationWatcherAutoConfiguration
diff --git a/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 58%
rename from spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories
rename to spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index a82e049f..d9d4dd27 100644
--- a/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientAutoConfiguration
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/resources/META-INF/spring.factories
index ea4ff164..52891ab7 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/resources/META-INF/spring.factories
@@ -1,6 +1,2 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.fabric8.Fabric8AutoConfiguration,\
-org.springframework.cloud.kubernetes.fabric8.Fabric8ActuatorConfiguration
-
 org.springframework.boot.env.EnvironmentPostProcessor=\
 org.springframework.cloud.kubernetes.fabric8.profile.Fabric8ProfileEnvironmentPostProcessor
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..cd027aca
--- /dev/null
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+org.springframework.cloud.kubernetes.fabric8.Fabric8AutoConfiguration
+org.springframework.cloud.kubernetes.fabric8.Fabric8ActuatorConfiguration
diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-fabric8-config/src/main/resources/META-INF/spring.factories
index 95082d62..10f57252 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-fabric8-config/src/main/resources/META-INF/spring.factories
@@ -1,5 +1,3 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.fabric8.config.reload.Fabric8ConfigReloadAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.kubernetes.fabric8.config.Fabric8BootstrapConfiguration,\
 org.springframework.cloud.kubernetes.fabric8.config.Fabric8RetryBootstrapConfiguration
diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-fabric8-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..6273ecc6
--- /dev/null
+++ b/spring-cloud-kubernetes-fabric8-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.springframework.cloud.kubernetes.fabric8.config.reload.Fabric8ConfigReloadAutoConfiguration
diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-fabric8-discovery/src/main/resources/META-INF/spring.factories
index 4746c884..7262a091 100644
--- a/spring-cloud-kubernetes-fabric8-discovery/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/resources/META-INF/spring.factories
@@ -1,6 +1,2 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesCatalogWatchAutoConfiguration, \
-org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesDiscoveryClientAutoConfiguration, \
-org.springframework.cloud.kubernetes.fabric8.discovery.reactive.KubernetesReactiveDiscoveryClientAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesDiscoveryClientConfigClientBootstrapConfiguration
diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-fabric8-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..2c7e95bc
--- /dev/null
+++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesCatalogWatchAutoConfiguration
+org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesDiscoveryClientAutoConfiguration
+org.springframework.cloud.kubernetes.fabric8.discovery.reactive.KubernetesReactiveDiscoveryClientAutoConfiguration
diff --git a/spring-cloud-kubernetes-fabric8-istio/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-fabric8-istio/src/main/resources/META-INF/spring.factories
index c656f161..a0f5ea20 100644
--- a/spring-cloud-kubernetes-fabric8-istio/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-fabric8-istio/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,2 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.fabric8.istio.IstioAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.kubernetes.fabric8.istio.IstioBootstrapConfiguration
diff --git a/spring-cloud-kubernetes-fabric8-istio/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-fabric8-istio/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..e1a8b912
--- /dev/null
+++ b/spring-cloud-kubernetes-fabric8-istio/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.springframework.cloud.kubernetes.fabric8.istio.IstioAutoConfiguration
diff --git a/spring-cloud-kubernetes-fabric8-leader/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-fabric8-leader/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 56%
rename from spring-cloud-kubernetes-fabric8-leader/src/main/resources/META-INF/spring.factories
rename to spring-cloud-kubernetes-fabric8-leader/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 4eed4fdc..d612cac6 100644
--- a/spring-cloud-kubernetes-fabric8-leader/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-fabric8-leader/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.kubernetes.fabric8.leader.Fabric8LeaderAutoConfiguration
diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 59%
rename from spring-cloud-kubernetes-fabric8-loadbalancer/src/main/resources/META-INF/spring.factories
rename to spring-cloud-kubernetes-fabric8-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 45f45201..e86ca428 100644
--- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.kubernetes.fabric8.loadbalancer.Fabric8LoadBalancerAutoConfiguration