diff --git a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 87acb85081c..943924932f4 100644
--- a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -106,5 +106,88 @@
     "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
     "sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter"
   }
+],"hints": [
+  {
+    "name": "endpoints.cors.allowed-headers",
+    "values": [
+      {
+        "value": "*"
+      }
+    ],
+    "providers": [
+      {
+        "name": "any"
+      }
+    ]
+  },
+  {
+    "name": "endpoints.cors.allowed-methods",
+    "values": [
+      {
+        "value": "*"
+      }
+    ],
+    "providers": [
+      {
+        "name": "any"
+      }
+    ]
+  },
+  {
+    "name": "endpoints.cors.allowed-origins",
+    "values": [
+      {
+        "value": "*"
+      }
+    ],
+    "providers": [
+      {
+        "name": "any"
+      }
+    ]
+  },
+  {
+    "name": "management.health.status.order",
+    "values": [
+      {
+        "value": "UNKNOWN"
+      },
+      {
+        "value": "UP"
+      },
+      {
+        "value": "DOWN"
+      },
+      {
+        "value": "OUT_OF_SERVICE"
+      }
+    ],
+    "providers": [
+      {
+        "name": "any"
+      }
+    ]
+  },
+  {
+    "name": "shell.auth",
+    "values": [
+      {
+        "value": "simple",
+        "description": "Use a simple user/password based authentication."
+      },
+      {
+        "value": "spring",
+        "description": "Integrate with Spring Security."
+      },
+      {
+        "value": "key",
+        "description": "Use a Key-based authentication."
+      },
+      {
+        "value": "jaas",
+        "description": "Use JAAS authentication."
+      }
+    ]
+  }
 ]}
 
diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 47cbe47bccb..b09f535118e 100644
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -158,5 +158,146 @@
     "description": "Spring MVC view suffix.",
     "deprecated": true
   }
+],"hints": [
+  {
+    "name": "server.jsp-servlet.class-name",
+    "providers": [
+      {
+        "name": "class-reference",
+        "parameters": {
+          "target": "javax.servlet.http.HttpServlet"
+        }
+      }
+    ]
+  },
+  {
+    "name": "server.tomcat.compression",
+    "values": [
+      {
+        "value": "off",
+        "description": "Disable compression."
+      },
+      {
+        "value": "on",
+        "description": "Enable compression of responses over 2048 bytes."
+      },
+      {
+        "value": "force",
+        "description": "Enable compression of all responses."
+      }
+    ],
+    "providers": [
+      {
+        "name": "any"
+      }
+    ]
+  },
+  {
+    "name": "spring.cache.jcache.provider",
+    "providers": [
+      {
+        "name": "class-reference",
+        "parameters": {
+          "target": "javax.cache.spi.CachingProvider"
+        }
+      }
+    ]
+  },
+  {
+    "name": "spring.datasource.driver-class-name",
+    "providers": [
+      {
+        "name": "class-reference",
+        "parameters": {
+          "target": "java.sql.Driver"
+        }
+      }
+    ]
+  },
+  {
+    "name": "spring.datasource.xa.data-source-class-name",
+    "providers": [
+      {
+        "name": "class-reference",
+        "parameters": {
+          "target": "javax.sql.XADataSource"
+        }
+      }
+    ]
+  },
+  {
+    "name": "spring.http.converters.preferred-json-mapper",
+    "values": [
+      {
+        "value": "gson"
+      },
+      {
+        "value": "jackson"
+      }
+    ],
+    "providers": [
+      {
+        "name": "any"
+      }
+    ]
+  },
+  {
+    "name": "spring.jooq.sql-dialect",
+    "providers": [
+      {
+        "name": "enum",
+        "parameters": {
+          "target": "org.jooq.SQLDialect"
+        }
+      }
+    ]
+  },
+  {
+    "name": "spring.jmx.server",
+    "providers": [
+      {
+        "name": "spring-bean-reference",
+        "parameters": {
+          "target": "javax.management.MBeanServer"
+        }
+      }
+    ]
+  },
+  {
+    "name": "spring.jpa.hibernate.ddl-auto",
+    "values": [
+      {
+        "value": "none",
+        "description": "Disable DDL handling."
+      },
+      {
+        "value": "validate",
+        "description": "Validate the schema, make no changes to the database."
+      },
+      {
+        "value": "update",
+        "description": "Update the schema if necessary."
+      },
+      {
+        "value": "create",
+        "description": "Create the schema and destroy previous data."
+      },
+      {
+        "value": "create-drop",
+        "description": "Create and then destroy the schema at the end of the session."
+      }
+    ]
+  },
+  {
+    "name": "spring.jpa.hibernate.naming-strategy",
+    "providers": [
+      {
+        "name": "class-reference",
+        "parameters": {
+          "target": "org.hibernate.cfg.NamingStrategy"
+        }
+      }
+    ]
+  }
 ]}
 
diff --git a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index d46a7a18c42..8175ccdb8eb 100644
--- a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -113,5 +113,68 @@
     "type": "java.lang.String",
     "description": "Unconditionally activate the specified comma separated profiles."
   }
+],"hints": [
+  {
+    "name": "logger.level.keys",
+    "values": [
+      {
+        "value": "root",
+        "description": "Root logger used to assign the default logging level."
+      }
+    ],
+    "providers": [
+      {
+        "name": "logger-name"
+      }
+    ]
+  },
+  {
+    "name": "logger.level.values",
+    "values": [
+      {
+        "value": "trace"
+      },
+      {
+        "value": "debug"
+      },
+      {
+        "value": "info"
+      },
+      {
+        "value": "warn"
+      },
+      {
+        "value": "error"
+      },
+      {
+        "value": "fatal"
+      },
+      {
+        "value": "off"
+      }
+
+    ],
+    "providers": [
+      {
+        "name": "any"
+      }
+    ]
+  },
+  {
+    "name": "spring.profiles.active",
+    "providers": [
+      {
+        "name": "spring-profile-name"
+      }
+    ]
+  },
+  {
+    "name": "spring.profiles.include",
+    "providers": [
+      {
+        "name": "spring-profile-name"
+      }
+    ]
+  }
 ]}