diff --git a/README.adoc b/README.adoc
index eb9e5a3e..bfdd1436 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1088,7 +1088,7 @@ Notes:
 
 == Kubernetes Ecosystem Awareness
 
-All of the features described earlier in this guide work equally well, regardless of whether your application is running inside
+All features described earlier in this guide work equally well, regardless of whether your application is running inside
 Kubernetes. This is really helpful for development and troubleshooting.
 From a development point of view, this lets you start your Spring Boot application and debug one
 of the modules that is part of this project. You need not deploy it in Kubernetes,
@@ -1107,6 +1107,12 @@ Be aware that when `spring-cloud-kubernetes-config` is on the classpath, `spring
 Also note that these properties: `spring.cloud.kubernetes.config.enabled` and `spring.cloud.kubernetes.secrets.enabled`
 only take effect when set in `bootstrap.{properties|yml}`.
 
+=== Functional changes since 2.1.x version
+
+In versions prior to `2.1.x`, Kubernetes awareness was implemented using `spring.cloud.kubernetes.enabled` property. This
+property was removed and is un-supported. Instead, we use Spring Boot API: https://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatform.html[ConditionalOnCloudPlatform].
+If it is needed to explicitly enable or disable this awareness, use `spring.main.cloud-platform=NONE/KUBERNETES`.
+
 === Kubernetes Profile Autoconfiguration
 
 When the application runs as a pod inside Kubernetes, a Spring profile named `kubernetes` automatically gets activated.
diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesBootstrapConfigurationTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesBootstrapConfigurationTests.java
index 376fa749..1451d23e 100644
--- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesBootstrapConfigurationTests.java
+++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesBootstrapConfigurationTests.java
@@ -214,8 +214,9 @@ public class KubernetesBootstrapConfigurationTests {
 
 	}
 
-	@SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = App.class, properties = {
-			"spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.config.retry.enabled=false" })
+	@SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = App.class,
+			properties = { "spring.cloud.kubernetes.config.fail-fast=true",
+					"spring.cloud.kubernetes.config.retry.enabled=false" })
 	@Nested
 	public class ConfigFailFastEnabledButRetryDisabled {
 
@@ -229,8 +230,9 @@ public class KubernetesBootstrapConfigurationTests {
 
 	}
 
-	@SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = App.class, properties = {
-			"spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.enabled=false" })
+	@SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = App.class,
+			properties = { "spring.cloud.kubernetes.secrets.fail-fast=true",
+					"spring.cloud.kubernetes.secrets.retry.enabled=false" })
 	@Nested
 	public class SecretsFailFastEnabledButRetryDisabled {
 
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java
index cb8b56a8..3849cfd9 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java
@@ -135,9 +135,9 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests {
 	}
 
 	@Nested
-	@SpringBootTest(
-			webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
-					"spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" },
+	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
+			properties = { "spring.cloud.kubernetes.client.namespace=default",
+					"spring.main.cloud-platform=KUBERNETES" },
 			classes = Application.class)
 	@EnableKubernetesMockClient
 	class ConfigFailFastDisabled {