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 864127e365..882d3a0bf2 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
@@ -22,6 +22,10 @@
         "vcap_services"
       ]
     },
+    {
+      "name": "management.endpoint.health.show-details",
+      "defaultValue": "when-authorized"
+    },
     {
       "name": "management.endpoints.enabled-by-default",
       "type": "java.lang.Boolean",
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index b1807d5072..7dc43dd14e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -68,6 +68,10 @@
       "type": "java.util.List<java.lang.Class>",
       "description": "Auto-configuration classes to exclude."
     },
+    {
+      "name": "spring.batch.initialize-schema",
+      "defaultValue": "embedded"
+    },
     {
       "name": "spring.batch.job.enabled",
       "type": "java.lang.Boolean",
@@ -170,6 +174,10 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.data.neo4j.auto-index",
+      "defaultValue": "none"
+    },
     {
       "name": "spring.data.neo4j.open-in-view",
       "defaultValue": true
@@ -237,6 +245,10 @@
       "type": "java.lang.String",
       "description": "Preferred JSON mapper to use for HTTP message conversion. By default, auto-detected according to the environment."
     },
+    {
+      "name": "spring.integration.jdbc.initialize-schema",
+      "defaultValue": "embedded"
+    },
     {
       "name": "spring.jersey.type",
       "defaultValue": "servlet"
@@ -422,6 +434,10 @@
       "name": "spring.mvc.locale-resolver",
       "defaultValue": "accept-header"
     },
+    {
+      "name": "spring.quartz.jdbc.initialize-schema",
+      "defaultValue": "embedded"
+    },
     {
       "name": "spring.quartz.job-store-type",
       "defaultValue": "memory"
@@ -436,6 +452,10 @@
       "description": "Whether to create an AmqpAdmin bean.",
       "defaultValue": true
     },
+    {
+      "name": "spring.rabbitmq.listener.type",
+      "defaultValue": "simple"
+    },
     {
       "name": "spring.security.filter.dispatcher-types",
       "defaultValue": [
@@ -444,6 +464,10 @@
         "request"
       ]
     },
+    {
+      "name": "spring.session.jdbc.initialize-schema",
+      "defaultValue": "embedded"
+    },
     {
       "name": "spring.session.hazelcast.flush-mode",
       "defaultValue": "on-save"