diff --git a/hawkbit-autoconfigure/src/main/resources/META-INF/spring.factories b/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories
similarity index 63%
rename from hawkbit-autoconfigure/src/main/resources/META-INF/spring.factories
rename to hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories
index 501071626..9220326de 100644
--- a/hawkbit-autoconfigure/src/main/resources/META-INF/spring.factories
+++ b/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories
@@ -1,16 +1,14 @@
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.eclipse.hawkbit.autoconfigure.cache.CacheAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.cache.DownloadIdCacheAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.ddi.DDiApiAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.dmf.amqp.DmfApiAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.mgmt.MgmtApiAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.repository.event.EventPublisherAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.repository.ArtifactFilesystemAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.repository.JpaRepositoryAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.scheduling.AsyncConfigurerAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.scheduling.ExecutorAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.security.SecurityAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.security.InMemoryUserManagementAutoConfiguration,\
-org.eclipse.hawkbit.autoconfigure.security.OidcUserManagementAutoConfiguration,\
+org.eclipse.hawkbit.autoconfigure.cache.CacheAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.cache.DownloadIdCacheAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.ddi.DDiApiAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.dmf.amqp.DmfApiAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.mgmt.MgmtApiAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.repository.event.EventPublisherAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.repository.ArtifactFilesystemAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.repository.JpaRepositoryAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.scheduling.AsyncConfigurerAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.scheduling.ExecutorAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.security.SecurityAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.security.InMemoryUserManagementAutoConfiguration
+org.eclipse.hawkbit.autoconfigure.security.OidcUserManagementAutoConfiguration
 org.eclipse.hawkbit.autoconfigure.PropertyHostnameResolverAutoConfiguration