diff --git a/module/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index b539371484c..25f10ce2939 100644
--- a/module/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/module/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -201,7 +201,7 @@
     },
     {
       "name": "management.wavefront.api-token-type",
-      "type": "org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties$TokenType",
+      "type": "java.lang.String",
       "deprecation": {
         "level": "error",
         "reason": "Wavefront is end-of-life.",
diff --git a/module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 7693e1632c6..6a16a6effc3 100644
--- a/module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -44,7 +44,7 @@
     },
     {
       "name": "spring.datasource.initialization-mode",
-      "type": "org.springframework.boot.jdbc.DataSourceInitializationMode",
+      "type": "org.springframework.boot.sql.init.DatabaseInitializationMode",
       "deprecation": {
         "level": "error",
         "replacement": "spring.sql.init.mode",
diff --git a/module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index a7e22911136..fffe84880b7 100644
--- a/module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -10,7 +10,7 @@
     {
       "name": "spring.mail.test-connection",
       "description": "Whether to test that the mail server is available on startup.",
-      "sourceType": "org.springframework.boot.autoconfigure.mail.MailProperties",
+      "sourceType": "org.springframework.boot.mail.autoconfigure.MailSenderValidatorAutoConfiguration",
       "type": "java.lang.Boolean",
       "defaultValue": false
     }
diff --git a/module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 3211a0894c5..b33b36aab41 100644
--- a/module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1393,7 +1393,7 @@
     },
     {
       "name": "management.metrics.export.prometheus.pushgateway.shutdown-operation",
-      "type": "org.springframework.boot.actuate.metrics.export.prometheus.PrometheusPushGatewayManager$ShutdownOperation",
+      "type": "org.springframework.boot.micrometer.metrics.export.prometheus.PrometheusPushGatewayManager$ShutdownOperation",
       "deprecation": {
         "level": "error",
         "replacement": "management.prometheus.metrics.export.pushgateway.shutdown-operation",
diff --git a/module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index cf378fb275e..fcea9892d6d 100644
--- a/module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,84 +1,84 @@
 {
-	"groups": [],
-	"properties": [
-		{
-			"name": "management.logging.export.otlp.enabled",
-			"type": "java.lang.Boolean",
-			"defaultValue": true,
-			"description": "Whether auto-configuration of logging is enabled to export logs over OTLP."
-		},
-		{
-			"name": "management.otlp.logging.compression",
-			"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression",
-			"description": "Method used to compress the payload.",
-			"defaultValue": "none",
-			"deprecation": {
-				"level": "error",
-				"replacement": "management.opentelemetry.logging.export.otlp.compression",
-				"since": "4.0.0"
-			}
-		},
-		{
-			"name": "management.otlp.logging.connect-timeout",
-			"type": "java.time.Duration",
-			"description": "Connect timeout for the OTel collector connection.",
-			"defaultValue": "10s",
-			"deprecation": {
-				"level": "error",
-				"replacement": "management.opentelemetry.logging.export.otlp.connect-timeout",
-				"since": "4.0.0"
-			}
-		},
-		{
-			"name": "management.otlp.logging.endpoint",
-			"type": "java.lang.String",
-			"description": "URL to the OTel collector's HTTP API.",
-			"deprecation": {
-				"level": "error",
-				"replacement": "management.opentelemetry.logging.export.otlp.endpoint",
-				"since": "4.0.0"
-			}
-		},
-		{
-			"name": "management.otlp.logging.export.enabled",
-			"deprecation": {
-				"level": "error",
-				"replacement": "management.logging.export.otlp.enabled",
-				"since": "4.0.0"
-			}
-		},
-		{
-			"name": "management.otlp.logging.headers",
-			"type": "java.util.Map<java.lang.String,java.lang.String>",
-			"description": "Custom HTTP headers you want to pass to the collector, for example auth headers.",
-			"deprecation": {
-				"level": "error",
-				"replacement": "management.opentelemetry.logging.export.otlp.headers",
-				"since": "4.0.0"
-			}
-		},
-		{
-			"name": "management.otlp.logging.timeout",
-			"type": "java.time.Duration",
-			"description": "Call timeout for the OTel Collector to process an exported batch of data. This timeout spans the entire call: resolving DNS, connecting, writing the request body, server processing, and reading the response body. If the call requires redirects or retries all must complete within one timeout period.",
-			"defaultValue": "10s",
-			"deprecation": {
-				"level": "error",
-				"replacement": "management.opentelemetry.logging.export.otlp.timeout",
-				"since": "4.0.0"
-			}
-		},
-		{
-			"name": "management.otlp.logging.transport",
-			"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.Transport",
-			"description": "Transport used to send the logs.",
-			"defaultValue": "http",
-			"deprecation": {
-				"level": "error",
-				"replacement": "management.opentelemetry.logging.export.otlp.transport",
-				"since": "4.0.0"
-			}
-		}
-	],
-	"hints": []
+  "groups": [],
+  "properties": [
+    {
+      "name": "management.logging.export.otlp.enabled",
+      "type": "java.lang.Boolean",
+      "defaultValue": true,
+      "description": "Whether auto-configuration of logging is enabled to export logs over OTLP."
+    },
+    {
+      "name": "management.otlp.logging.compression",
+      "type": "org.springframework.boot.opentelemetry.autoconfigure.logging.otlp.OtlpLoggingProperties$Compression",
+      "description": "Method used to compress the payload.",
+      "defaultValue": "none",
+      "deprecation": {
+        "level": "error",
+        "replacement": "management.opentelemetry.logging.export.otlp.compression",
+        "since": "4.0.0"
+      }
+    },
+    {
+      "name": "management.otlp.logging.connect-timeout",
+      "type": "java.time.Duration",
+      "description": "Connect timeout for the OTel collector connection.",
+      "defaultValue": "10s",
+      "deprecation": {
+        "level": "error",
+        "replacement": "management.opentelemetry.logging.export.otlp.connect-timeout",
+        "since": "4.0.0"
+      }
+    },
+    {
+      "name": "management.otlp.logging.endpoint",
+      "type": "java.lang.String",
+      "description": "URL to the OTel collector's HTTP API.",
+      "deprecation": {
+        "level": "error",
+        "replacement": "management.opentelemetry.logging.export.otlp.endpoint",
+        "since": "4.0.0"
+      }
+    },
+    {
+      "name": "management.otlp.logging.export.enabled",
+      "deprecation": {
+        "level": "error",
+        "replacement": "management.logging.export.otlp.enabled",
+        "since": "4.0.0"
+      }
+    },
+    {
+      "name": "management.otlp.logging.headers",
+      "type": "java.util.Map<java.lang.String,java.lang.String>",
+      "description": "Custom HTTP headers you want to pass to the collector, for example auth headers.",
+      "deprecation": {
+        "level": "error",
+        "replacement": "management.opentelemetry.logging.export.otlp.headers",
+        "since": "4.0.0"
+      }
+    },
+    {
+      "name": "management.otlp.logging.timeout",
+      "type": "java.time.Duration",
+      "description": "Call timeout for the OTel Collector to process an exported batch of data. This timeout spans the entire call: resolving DNS, connecting, writing the request body, server processing, and reading the response body. If the call requires redirects or retries all must complete within one timeout period.",
+      "defaultValue": "10s",
+      "deprecation": {
+        "level": "error",
+        "replacement": "management.opentelemetry.logging.export.otlp.timeout",
+        "since": "4.0.0"
+      }
+    },
+    {
+      "name": "management.otlp.logging.transport",
+      "type": "org.springframework.boot.opentelemetry.autoconfigure.logging.otlp.Transport",
+      "description": "Transport used to send the logs.",
+      "defaultValue": "http",
+      "deprecation": {
+        "level": "error",
+        "replacement": "management.opentelemetry.logging.export.otlp.transport",
+        "since": "4.0.0"
+      }
+    }
+  ],
+  "hints": []
 }