diff --git a/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsComponentProviderTest.java b/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsComponentProviderTest.java
index 1d1590d3a..c2869d265 100644
--- a/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsComponentProviderTest.java
+++ b/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsComponentProviderTest.java
@@ -20,7 +20,12 @@ class AwsComponentProviderTest {
 
   @Test
   void endToEnd() {
-    String yaml = "file_format: 0.3\n" + "propagator:\n" + "  composite: [xray, xray-lambda]\n";
+    String yaml =
+        "file_format: 0.4\n"
+            + "propagator:\n"
+            + "  composite:\n"
+            + "    - xray:\n"
+            + "    - xray-lambda:\n";
 
     OpenTelemetrySdk openTelemetrySdk =
         DeclarativeConfiguration.parseAndCreate(
diff --git a/cloudfoundry-resources/README.md b/cloudfoundry-resources/README.md
index 355f9ce6e..b44181d15 100644
--- a/cloudfoundry-resources/README.md
+++ b/cloudfoundry-resources/README.md
@@ -17,7 +17,7 @@ This variable contains a JSON structure, which is parsed to fill the following a
 | cloudfoundry.space.id        | space_id                 |
 | cloudfoundry.space.name      | space_name               |
 
-The resource attributes follow the [CloudFoundry semantic convention.](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/attributes-registry/cloudfoundry.md).
+The resource attributes follow the [CloudFoundry semantic convention.](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/registry/attributes/cloudfoundry.md).
 A description of `VCAP_APPLICATION` is available in the [CloudFoundry documentation](https://docs.cloudfoundry.org/devguide/deploy-apps/environment-variable.html#VCAP-APPLICATION).
 
 ## Component owners
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index d8cc0188b..7b3581281 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
   `java-platform`
 }
 
-val otelInstrumentationVersion = "2.15.0-alpha"
+val otelInstrumentationVersion = "2.16.0-alpha"
 val semconvVersion = "1.32.0"
 
 javaPlatform {
diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java
index 6c4069638..29b698eb5 100644
--- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java
+++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java
@@ -32,12 +32,12 @@ protected JmxScraperContainer customizeScraperContainer(
       JmxScraperContainer scraper, GenericContainer<?> target, Path tempDir) {
     return scraper
         .withTargetSystem("jvm")
-        // TODO when JVM metrics will be added to instrumentation, the default "auto" source
+        // Since JVM metrics were be added to instrumentation, the default "auto" source
         // means that the definitions in instrumentation will be used, and thus this test will fail
         // due to metrics differences, adding an explicit "legacy" source is required to continue
         // testing the JVM metrics defined in this project.
         // https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13392
-        // .withTargetSystem("legacy")
+        .withTargetSystemSource("legacy")
         // also testing custom yaml
         .withCustomYaml("custom-metrics.yaml");
   }
diff --git a/processors/src/test/java/io/opentelemetry/contrib/eventbridge/internal/EventToSpanBridgeComponentProviderTest.java b/processors/src/test/java/io/opentelemetry/contrib/eventbridge/internal/EventToSpanBridgeComponentProviderTest.java
index a2f6165ae..55746e61d 100644
--- a/processors/src/test/java/io/opentelemetry/contrib/eventbridge/internal/EventToSpanBridgeComponentProviderTest.java
+++ b/processors/src/test/java/io/opentelemetry/contrib/eventbridge/internal/EventToSpanBridgeComponentProviderTest.java
@@ -18,7 +18,7 @@ class EventToSpanBridgeComponentProviderTest {
   @Test
   void endToEnd() {
     String yaml =
-        "file_format: 0.3\n"
+        "file_format: 0.4\n"
             + "logger_provider:\n"
             + "  processors:\n"
             + "    - event_to_span_event_bridge:\n";
diff --git a/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java b/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java
index 384707843..02611c9d5 100644
--- a/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java
+++ b/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java
@@ -38,7 +38,7 @@ class RuleBasedRoutingSamplerComponentProviderTest {
   @Test
   void endToEnd() {
     String yaml =
-        "file_format: 0.3\n"
+        "file_format: 0.4\n"
             + "tracer_provider:\n"
             + "  sampler:\n"
             + "    parent_based:\n"