diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 94777956b4..0ec927e0f6 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -423,7 +423,7 @@
     "type": "java.lang.Boolean",
     "description": "Whether to enable the endpoint.",
     "deprecation": {
-      "replacement": "endpoints.threaddump.enabled",
+      "replacement": "management.endpoint.threaddump.enabled",
       "level": "error"
     }
   },
@@ -460,7 +460,7 @@
     "description": "Whether to enable endpoints.",
     "defaultValue": true,
     "deprecation": {
-      "replacement": "endpoints.default.enabled",
+      "replacement": "management.endpoints.enabled-by-default",
       "level": "error"
     }
   },
@@ -551,7 +551,7 @@
     "description": "Time to live for cached result, in milliseconds.",
     "defaultValue": 1000,
     "deprecation": {
-      "replacement": "endpoints.health.cache.time-to-live",
+      "replacement": "management.endpoint.health.cache.time-to-live",
       "level": "error"
     }
   },
@@ -625,7 +625,7 @@
     "description": "Whether to enable JMX export of all endpoints.",
     "defaultValue": true,
     "deprecation": {
-      "replacement": "endpoints.default.jmx.enabled",
+      "replacement": "management.endpoints.jmx.enabled",
       "level": "error"
     }
   },
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java
index bea1dbe0fe..23af808169 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java
@@ -25,7 +25,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.core.env.Environment;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
-import org.springframework.test.context.TestPropertySource;
 
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
@@ -37,7 +36,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  *
  * @author Andy Wilkinson
  */
-@TestPropertySource(properties = "endpoints.shutdown.enabled=true")
 public class ShutdownEndpointDocumentationTests
 		extends AbstractEndpointDocumentationTests {
 
diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties
index c28a450e0e..bd2c1defce 100644
--- a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-endpoints.metrics.web.enabled=true
+management.endpoints.web.expose=metrics
 
 #
 # Infinispan configuration file location.
diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties
index 06f17c388e..3b8078db7b 100644
--- a/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-endpoints.flyway.web.enabled=true
+management.endpoints.web.expose=flyway
 spring.jpa.hibernate.ddl-auto=validate
 spring.jpa.open-in-view=true
 spring.h2.console.enabled=true
diff --git a/spring-boot-samples/spring-boot-sample-liquibase/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-liquibase/src/main/resources/application.properties
index 5fe199af8a..e58f6144d8 100644
--- a/spring-boot-samples/spring-boot-sample-liquibase/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-liquibase/src/main/resources/application.properties
@@ -1,3 +1,3 @@
-endpoints.liquibase.web.enabled=true
+management.endpoints.web.expose=liquibase
 
 spring.h2.console.enabled=true
diff --git a/spring-boot-samples/spring-boot-sample-session/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-session/src/main/resources/application.properties
index b975771025..6d2a0d7c86 100644
--- a/spring-boot-samples/spring-boot-sample-session/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-session/src/main/resources/application.properties
@@ -1 +1 @@
-endpoints.sessions.web.enabled=true
+management.endpoints.web.expose=sessions