diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java
index 0c83612f..310fb975 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java
@@ -30,8 +30,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.security.crypto.encrypt.TextEncryptor;
 
 /**
- * Autoconfiguration for text encryptors and environment encryptors (non-web stuff).
- * Users can provide beans of the same type as any or all of the beans defined here in
+ * Autoconfiguration for text encryptors and environment encryptors (non-web stuff). Users
+ * can provide beans of the same type as any or all of the beans defined here in
  * application code to override the default behaviour.
  *
  * @author Bartosz Wojtkiewicz
diff --git a/spring-cloud-config-server/src/main/resources/META-INF/spring.factories b/spring-cloud-config-server/src/main/resources/META-INF/spring.factories
index a2cb54dd..89f75940 100644
--- a/spring-cloud-config-server/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-config-server/src/main/resources/META-INF/spring.factories
@@ -1,6 +1,8 @@
 # Bootstrap components
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.config.server.bootstrap.ConfigServerBootstrapConfiguration,\
+org.springframework.cloud.config.server.config.DefaultTextEncryptionAutoConfiguration,\
+org.springframework.cloud.config.server.config.RsaEncryptionAutoConfiguration,\
 org.springframework.cloud.config.server.config.EncryptionAutoConfiguration
 
 # Environment PostProcessor
diff --git a/spring-cloud-config-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-config-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index c3634675..a47654bd 100644
--- a/spring-cloud-config-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/spring-cloud-config-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,5 +1,5 @@
 org.springframework.cloud.config.server.config.ConfigServerAutoConfiguration
-org.springframework.cloud.config.server.config.EncryptionAutoConfiguration
-org.springframework.cloud.config.server.config.DefaultTextEncryptionAutoConfiguration
 org.springframework.cloud.config.server.config.RsaEncryptionAutoConfiguration
+org.springframework.cloud.config.server.config.DefaultTextEncryptionAutoConfiguration
+org.springframework.cloud.config.server.config.EncryptionAutoConfiguration
 org.springframework.cloud.config.server.config.VaultEncryptionAutoConfiguration