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 e7dc44aee80a..8c1d2461b2b4 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
@@ -345,30 +345,6 @@
         "."
       ]
     },
-    {
-      "name": "management.metrics.export.appoptics.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.datadog.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.defaults.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable default metrics exporters.",
-      "defaultValue": true
-    },
     {
       "name": "management.defaults.metrics.export.enabled",
       "type": "java.lang.Boolean",
@@ -376,127 +352,53 @@
       "defaultValue": true
     },
     {
-      "name": "management.metrics.export.dynatrace.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.elastic.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.ganglia.addressing-mode",
+      "name": "management.ganglia.metrics.export.addressing-mode",
       "defaultValue": "multicast"
     },
     {
-      "name": "management.metrics.export.ganglia.duration-units",
+      "name": "management.ganglia.metrics.export.duration-units",
       "defaultValue": "milliseconds"
     },
     {
-      "name": "management.metrics.export.ganglia.rate-units",
+      "name": "management.ganglia.metrics.export.rate-units",
       "defaultValue": "seconds"
     },
     {
-      "name": "management.metrics.export.graphite.duration-units",
+      "name": "management.graphite.metrics.export.duration-units",
       "defaultValue": "milliseconds"
     },
     {
-      "name": "management.metrics.export.graphite.protocol",
+      "name": "management.graphite.metrics.export.protocol",
       "defaultValue": "pickled"
     },
     {
-      "name": "management.metrics.export.graphite.rate-units",
+      "name": "management.graphite.metrics.export.rate-units",
       "defaultValue": "seconds"
     },
     {
-      "name": "management.metrics.export.humio.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.humio.repository",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.influx.consistency",
+      "name": "management.influx.metrics.export.consistency",
       "defaultValue": "one"
     },
     {
-      "name": "management.metrics.export.influx.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.jmx.enabled",
+      "name": "management.jmx.metrics.export.enabled",
       "type": "java.lang.Boolean",
       "description": "Whether exporting of metrics to JMX is enabled.",
       "defaultValue": true
     },
     {
-      "name": "management.metrics.export.kairos.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.newrelic.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.prometheus.enabled",
+      "name": "management.prometheus.metrics.export.enabled",
       "type": "java.lang.Boolean",
       "description": "Whether exporting of metrics to Prometheus is enabled.",
       "defaultValue": true
     },
     {
-      "name": "management.metrics.export.prometheus.histogram-flavor",
+      "name": "management.prometheus.metrics.export.histogram-flavor",
       "defaultValue": "prometheus"
     },
     {
-      "name": "management.metrics.export.prometheus.pushgateway.shutdown-operation",
+      "name": "management.prometheus.metrics.export.pushgateway.shutdown-operation",
       "defaultValue": "none"
     },
-    {
-      "name": "management.metrics.export.signalfx.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.simple.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether, in the absence of any other exporter, exporting of metrics to an in-memory backend is enabled.",
-      "defaultValue": true
-    },
     {
       "name": "management.simple.metrics.export.enabled",
       "type": "java.lang.Boolean",
@@ -504,54 +406,17 @@
       "defaultValue": true
     },
     {
-      "name": "management.metrics.export.simple.mode",
+      "name": "management.simple.metrics.export.mode",
       "defaultValue": "cumulative"
     },
     {
-      "name": "management.metrics.export.stackdriver.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.statsd.flavor",
+      "name": "management.statsd.metrics.export.flavor",
       "defaultValue": "datadog"
     },
     {
-      "name": "management.metrics.export.statsd.protocol",
+      "name": "management.statsd.metrics.export.protocol",
       "defaultValue": "udp"
     },
-    {
-      "name": "management.metrics.export.statsd.queue-size",
-      "defaultValue": 2147483647,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.wavefront.connect-timeout",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.wavefront.num-threads",
-      "type": "java.lang.Integer",
-      "description": "Number of threads to use with the metrics publishing scheduler.",
-      "defaultValue": 2,
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "management.metrics.export.wavefront.read-timeout",
-      "deprecation": {
-        "level": "error"
-      }
-    },
     {
       "name": "management.metrics.mongo.command.enabled",
       "description": "Whether to enable Mongo client command metrics.",