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..c2ddfff2b77 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
@@ -9,7 +9,7 @@
 		},
 		{
 			"name": "management.otlp.logging.compression",
-			"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression",
+			"type": "org.springframework.boot.opentelemetry.autoconfigure.logging.otlp.OtlpLoggingProperties$Compression",
 			"description": "Method used to compress the payload.",
 			"defaultValue": "none",
 			"deprecation": {
@@ -70,7 +70,7 @@
 		},
 		{
 			"name": "management.otlp.logging.transport",
-			"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.Transport",
+			"type": "org.springframework.boot.opentelemetry.autoconfigure.logging.otlp.Transport",
 			"description": "Transport used to send the logs.",
 			"defaultValue": "http",
 			"deprecation": {