diff --git a/springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 2a54fe1dc..000000000
--- a/springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,12 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.core.configuration.SpringDocConfiguration,\
-org.springdoc.core.properties.SpringDocConfigProperties,\
-org.springdoc.core.configuration.SpringDocJavadocConfiguration,\
-org.springdoc.core.configuration.SpringDocGroovyConfiguration,\
-org.springdoc.core.configuration.SpringDocSecurityConfiguration,\
-org.springdoc.core.configuration.SpringDocFunctionCatalogConfiguration,\
-org.springdoc.core.configuration.SpringDocHints,\
-org.springdoc.core.configuration.SpringDocHateoasConfiguration,\
-org.springdoc.core.configuration.SpringDocPageableConfiguration,\
-org.springdoc.core.configuration.SpringDocSortConfiguration,\
-org.springdoc.core.configuration.SpringDocDataRestConfiguration
\ No newline at end of file
diff --git a/springdoc-openapi-starter-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springdoc-openapi-starter-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..1c4294dd4
--- /dev/null
+++ b/springdoc-openapi-starter-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,11 @@
+org.springdoc.core.configuration.SpringDocConfiguration
+org.springdoc.core.properties.SpringDocConfigProperties
+org.springdoc.core.configuration.SpringDocJavadocConfiguration
+org.springdoc.core.configuration.SpringDocGroovyConfiguration
+org.springdoc.core.configuration.SpringDocSecurityConfiguration
+org.springdoc.core.configuration.SpringDocFunctionCatalogConfiguration
+org.springdoc.core.configuration.SpringDocHints
+org.springdoc.core.configuration.SpringDocHateoasConfiguration
+org.springdoc.core.configuration.SpringDocPageableConfiguration
+org.springdoc.core.configuration.SpringDocSortConfiguration
+org.springdoc.core.configuration.SpringDocDataRestConfiguration
\ No newline at end of file
diff --git a/springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 65%
rename from springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring.factories
rename to springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 71597e281..422ea18b0 100644
--- a/springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring.factories
+++ b/springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,2 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.webflux.core.configuration.SpringDocWebFluxConfiguration,\
+org.springdoc.webflux.core.configuration.SpringDocWebFluxConfiguration
 org.springdoc.webflux.core.configuration.MultipleOpenApiSupportConfiguration
\ No newline at end of file
diff --git a/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index eaf933679..000000000
--- a/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,5 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.webflux.ui.SwaggerConfig,\
-org.springdoc.core.properties.SwaggerUiConfigProperties,\
-org.springdoc.core.properties.SwaggerUiConfigParameters,\
-org.springdoc.core.properties.SwaggerUiOAuthProperties
\ No newline at end of file
diff --git a/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..2edd37d8b
--- /dev/null
+++ b/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,4 @@
+org.springdoc.webflux.ui.SwaggerConfig
+org.springdoc.core.properties.SwaggerUiConfigProperties
+org.springdoc.core.properties.SwaggerUiConfigParameters
+org.springdoc.core.properties.SwaggerUiOAuthProperties
\ No newline at end of file
diff --git a/springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 65%
rename from springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring.factories
rename to springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 8af944a1d..290979d4a 100644
--- a/springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring.factories
+++ b/springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,2 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.webmvc.core.configuration.SpringDocWebMvcConfiguration,\
+org.springdoc.webmvc.core.configuration.SpringDocWebMvcConfiguration
 org.springdoc.webmvc.core.configuration.MultipleOpenApiSupportConfiguration
\ No newline at end of file
diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 2ea346084..000000000
--- a/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,5 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springdoc.webmvc.ui.SwaggerConfig,\
-org.springdoc.core.properties.SwaggerUiConfigProperties,\
-org.springdoc.core.properties.SwaggerUiConfigParameters,\
-org.springdoc.core.properties.SwaggerUiOAuthProperties
\ No newline at end of file
diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..29ea41456
--- /dev/null
+++ b/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,4 @@
+org.springdoc.webmvc.ui.SwaggerConfig
+org.springdoc.core.properties.SwaggerUiConfigProperties
+org.springdoc.core.properties.SwaggerUiConfigParameters
+org.springdoc.core.properties.SwaggerUiOAuthProperties
\ No newline at end of file