diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java
index b9314005bee..2098ce9d87b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java
@@ -1,6 +1,7 @@
 package datadog.trace.civisibility.config;
 
 import com.squareup.moshi.FromJson;
+import com.squareup.moshi.Json;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.ToJson;
@@ -65,6 +66,7 @@ public class ConfigurationApiImpl implements ConfigurationApi {
   private final JsonAdapter<EnvelopeDto<CiVisibilitySettings>> settingsResponseAdapter;
   private final JsonAdapter<MultiEnvelopeDto<TestIdentifierJson>> testIdentifiersResponseAdapter;
   private final JsonAdapter<EnvelopeDto<KnownTestsDto>> testFullNamesResponseAdapter;
+  private final JsonAdapter<EnvelopeDto<TestManagementDto>> testManagementRequestAdapter;
   private final JsonAdapter<EnvelopeDto<TestManagementTestsDto>> testManagementTestsResponseAdapter;
   private final JsonAdapter<EnvelopeDto<ChangedFiles>> changedFilesResponseAdapter;
 
@@ -108,6 +110,11 @@ public ConfigurationApiImpl(BackendApi backendApi, CiVisibilityMetricCollector m
             ConfigurationApiImpl.class, EnvelopeDto.class, KnownTestsDto.class);
     testFullNamesResponseAdapter = moshi.adapter(testFullNamesResponseType);
 
+    ParameterizedType testManagementRequestType =
+        Types.newParameterizedTypeWithOwner(
+            ConfigurationApiImpl.class, EnvelopeDto.class, TestManagementDto.class);
+    testManagementRequestAdapter = moshi.adapter(testManagementRequestType);
+
     ParameterizedType testManagementTestsResponseType =
         Types.newParameterizedTypeWithOwner(
             ConfigurationApiImpl.class, EnvelopeDto.class, TestManagementTestsDto.class);
@@ -329,9 +336,16 @@ public Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTests
             .build();
 
     String uuid = uuidGenerator.get();
-    EnvelopeDto<TracerEnvironment> request =
-        new EnvelopeDto<>(new DataDto<>(uuid, "ci_app_libraries_tests_request", tracerEnvironment));
-    String json = requestAdapter.toJson(request);
+    EnvelopeDto<TestManagementDto> request =
+        new EnvelopeDto<>(
+            new DataDto<>(
+                uuid,
+                "ci_app_libraries_tests_request",
+                new TestManagementDto(
+                    tracerEnvironment.getRepositoryUrl(),
+                    tracerEnvironment.getCommitMessage(),
+                    tracerEnvironment.getConfigurations().getTestBundle())));
+    String json = testManagementRequestAdapter.toJson(request);
     RequestBody requestBody = RequestBody.create(JSON, json);
     TestManagementTestsDto testManagementTestsDto =
         backendApi.post(
@@ -520,6 +534,22 @@ private KnownTestsDto(Map<String, Map<String, List<String>>> tests) {
     }
   }
 
+  private static final class TestManagementDto {
+    @Json(name = "repository_url")
+    private final String repositoryUrl;
+
+    @Json(name = "commit_message")
+    private final String commitMessage;
+
+    private final String module;
+
+    private TestManagementDto(String repositoryUrl, String commitMessage, String module) {
+      this.repositoryUrl = repositoryUrl;
+      this.commitMessage = commitMessage;
+      this.module = module;
+    }
+  }
+
   private static final class TestManagementTestsDto {
     private static final class Properties {
       private final Map<String, Boolean> properties;
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java
index cdca5314c6e..4d93dcf5d38 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java
@@ -1,8 +1,5 @@
 package datadog.trace.civisibility.config;
 
-import datadog.trace.api.Config;
-import datadog.trace.api.civisibility.CIConstants;
-import datadog.trace.api.civisibility.config.LibraryCapability;
 import datadog.trace.api.civisibility.config.TestFQN;
 import datadog.trace.api.civisibility.config.TestIdentifier;
 import datadog.trace.api.civisibility.config.TestMetadata;
@@ -232,44 +229,6 @@ public Diff getPullRequestDiff() {
     return pullRequestDiff;
   }
 
-  @Nonnull
-  public Map<LibraryCapability, Boolean> getCapabilitiesStatus(
-      Collection<LibraryCapability> capabilities) {
-    Map<LibraryCapability, Boolean> status = new EnumMap<>(LibraryCapability.class);
-
-    for (LibraryCapability c : capabilities) {
-      switch (c) {
-        case TIA:
-          status.put(c, isTestSkippingEnabled());
-          break;
-        case EFD:
-          EarlyFlakeDetectionSettings efdSettings = getEarlyFlakeDetectionSettings();
-          status.put(c, efdSettings.isEnabled());
-          break;
-        case ATR:
-          status.put(c, isFlakyTestRetriesEnabled());
-          break;
-        case IMPACTED:
-          status.put(c, isImpactedTestsDetectionEnabled());
-          break;
-        case FAIL_FAST:
-          String testOrder = Config.get().getCiVisibilityTestOrder();
-          status.put(c, CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder));
-          break;
-        case QUARANTINE:
-        case DISABLED:
-        case ATTEMPT_TO_FIX:
-          TestManagementSettings testManagementSettings = getTestManagementSettings();
-          status.put(c, testManagementSettings.isEnabled());
-          break;
-        default:
-          break;
-      }
-    }
-
-    return status;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java
index c0beee97019..3e0a62105e5 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java
@@ -107,6 +107,7 @@ private TracerEnvironment buildTracerEnvironment(JvmInfo jvmInfo, @Nullable Stri
         .repositoryUrl(gitInfo.getRepositoryURL())
         .branch(gitInfo.getBranch())
         .sha(gitInfo.getCommit().getSha())
+        .commitMessage(gitInfo.getCommit().getFullMessage())
         .osPlatform(wellKnownTags.getOsPlatform().toString())
         .osArchitecture(wellKnownTags.getOsArch().toString())
         .osVersion(wellKnownTags.getOsVersion().toString())
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java
index e622bb14021..a405902bd2c 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java
@@ -16,6 +16,9 @@ public class TracerEnvironment {
   private final String branch;
   private final String sha;
 
+  @Json(name = "commit_message")
+  private final String commitMessage;
+
   @Json(name = "test_level")
   private final String testLevel = "test";
 
@@ -27,12 +30,14 @@ private TracerEnvironment(
       String repositoryUrl,
       String branch,
       String sha,
+      String commitMessage,
       Configurations configurations) {
     this.service = service;
     this.env = env;
     this.repositoryUrl = repositoryUrl;
     this.branch = branch;
     this.sha = sha;
+    this.commitMessage = commitMessage;
     this.configurations = configurations;
   }
 
@@ -40,6 +45,10 @@ public String getSha() {
     return sha;
   }
 
+  public String getCommitMessage() {
+    return commitMessage;
+  }
+
   public String getService() {
     return service;
   }
@@ -82,6 +91,9 @@ public String toString() {
         + ", sha='"
         + sha
         + '\''
+        + ", commitMessage='"
+        + commitMessage
+        + '\''
         + ", testLevel='"
         + testLevel
         + '\''
@@ -100,6 +112,7 @@ public static final class Builder {
     private String repositoryUrl;
     private String branch;
     private String sha;
+    private String commitMessage;
     private String osPlatform;
     private String osArchitecture;
     private String osVersion;
@@ -135,6 +148,11 @@ public Builder sha(String sha) {
       return this;
     }
 
+    public Builder commitMessage(String commitMessage) {
+      this.commitMessage = commitMessage;
+      return this;
+    }
+
     public Builder osPlatform(String osPlatform) {
       this.osPlatform = osPlatform;
       return this;
@@ -187,6 +205,7 @@ public TracerEnvironment build() {
           repositoryUrl,
           branch,
           sha,
+          commitMessage,
           new Configurations(
               osPlatform,
               osArchitecture,
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java
index df7a3eaef67..3bb5054dee0 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java
@@ -45,7 +45,6 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Map;
 import java.util.function.Consumer;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -87,7 +86,7 @@ public TestImpl(
       Codeowners codeowners,
       CoverageStore.Factory coverageStoreFactory,
       ExecutionResults executionResults,
-      @Nonnull Map<LibraryCapability, Boolean> libraryCapabilities,
+      @Nonnull Collection<LibraryCapability> capabilities,
       Consumer<AgentSpan> onSpanFinish) {
     this.instrumentation = instrumentation;
     this.metricCollector = metricCollector;
@@ -146,8 +145,8 @@ public TestImpl(
       span.setTag(Tags.ITR_CORRELATION_ID, itrCorrelationId);
     }
 
-    for (Map.Entry<LibraryCapability, Boolean> entry : libraryCapabilities.entrySet()) {
-      span.setTag(entry.getKey().asTag(), entry.getValue());
+    for (LibraryCapability capability : capabilities) {
+      span.setTag(capability.asTag(), capability.getVersion());
     }
 
     testDecorator.afterStart(span);
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java
index db00a8dfba7..0ba81176691 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java
@@ -26,7 +26,6 @@
 import datadog.trace.civisibility.utils.SpanUtils;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import java.util.Map;
 import java.util.function.Consumer;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -54,7 +53,7 @@ public class TestSuiteImpl implements DDTestSuite {
   private final CoverageStore.Factory coverageStoreFactory;
   private final ExecutionResults executionResults;
   private final boolean parallelized;
-  private final Map<LibraryCapability, Boolean> libraryCapabilities;
+  private final Collection<LibraryCapability> capabilities;
   private final Consumer<AgentSpan> onSpanFinish;
 
   public TestSuiteImpl(
@@ -75,7 +74,7 @@ public TestSuiteImpl(
       LinesResolver linesResolver,
       CoverageStore.Factory coverageStoreFactory,
       ExecutionResults executionResults,
-      @Nonnull Map<LibraryCapability, Boolean> libraryCapabilities,
+      @Nonnull Collection<LibraryCapability> capabilities,
       Consumer<AgentSpan> onSpanFinish) {
     this.moduleSpanContext = moduleSpanContext;
     this.moduleName = moduleName;
@@ -92,7 +91,7 @@ public TestSuiteImpl(
     this.linesResolver = linesResolver;
     this.coverageStoreFactory = coverageStoreFactory;
     this.executionResults = executionResults;
-    this.libraryCapabilities = libraryCapabilities;
+    this.capabilities = capabilities;
     this.onSpanFinish = onSpanFinish;
 
     AgentTracer.SpanBuilder spanBuilder =
@@ -263,7 +262,7 @@ public TestImpl testStart(
         codeowners,
         coverageStoreFactory,
         executionResults,
-        libraryCapabilities,
+        capabilities,
         SpanUtils.propagateCiVisibilityTagsTo(span));
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java
index 0b77d2b0824..bd50ba88dc3 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java
@@ -31,7 +31,6 @@
 import datadog.trace.civisibility.test.ExecutionResults;
 import datadog.trace.civisibility.test.ExecutionStrategy;
 import java.util.Collection;
-import java.util.Map;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nonnull;
@@ -62,7 +61,7 @@ public class ProxyTestModule implements TestFrameworkModule {
   private final LinesResolver linesResolver;
   private final CoverageStore.Factory coverageStoreFactory;
   private final Collection<TestFramework> testFrameworks = ConcurrentHashMap.newKeySet();
-  private final Map<LibraryCapability, Boolean> libraryCapabilities;
+  private final Collection<LibraryCapability> capabilities;
 
   public ProxyTestModule(
       AgentSpanContext parentProcessModuleContext,
@@ -77,7 +76,7 @@ public ProxyTestModule(
       CoverageStore.Factory coverageStoreFactory,
       ChildProcessCoverageReporter childProcessCoverageReporter,
       SignalClient.Factory signalClientFactory,
-      Map<LibraryCapability, Boolean> libraryCapabilities) {
+      Collection<LibraryCapability> capabilities) {
     this.parentProcessModuleContext = parentProcessModuleContext;
     this.moduleName = moduleName;
     this.executionStrategy = executionStrategy;
@@ -91,7 +90,7 @@ public ProxyTestModule(
     this.codeowners = codeowners;
     this.linesResolver = linesResolver;
     this.coverageStoreFactory = coverageStoreFactory;
-    this.libraryCapabilities = libraryCapabilities;
+    this.capabilities = capabilities;
   }
 
   @Override
@@ -216,7 +215,7 @@ public TestSuiteImpl testSuiteStart(
         linesResolver,
         coverageStoreFactory,
         executionResults,
-        libraryCapabilities,
+        capabilities,
         this::propagateTestFrameworkData);
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java
index a44dc030bbf..aefb9f05d4b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java
@@ -16,7 +16,6 @@
 import datadog.trace.civisibility.source.SourcePathResolver;
 import datadog.trace.civisibility.test.ExecutionStrategy;
 import java.util.Collection;
-import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -38,7 +37,7 @@ public class ProxyTestSession implements TestFrameworkSession {
   private final ChildProcessCoverageReporter childProcessCoverageReporter;
   private final SignalClient.Factory signalClientFactory;
   private final ExecutionStrategy executionStrategy;
-  private final Map<LibraryCapability, Boolean> libraryCapabilities;
+  private final Collection<LibraryCapability> capabilities;
 
   public ProxyTestSession(
       AgentSpanContext parentProcessModuleContext,
@@ -64,8 +63,7 @@ public ProxyTestSession(
     this.childProcessCoverageReporter = childProcessCoverageReporter;
     this.signalClientFactory = signalClientFactory;
     this.executionStrategy = executionStrategy;
-    this.libraryCapabilities =
-        executionStrategy.getExecutionSettings().getCapabilitiesStatus(capabilities);
+    this.capabilities = capabilities;
   }
 
   @Override
@@ -91,6 +89,6 @@ public TestFrameworkModule testModuleStart(String moduleName, @Nullable Long sta
         coverageStoreFactory,
         childProcessCoverageReporter,
         signalClientFactory,
-        libraryCapabilities);
+        capabilities);
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java
index 96c182990fd..65a75ed685a 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java
@@ -29,7 +29,6 @@
 import datadog.trace.civisibility.test.ExecutionStrategy;
 import datadog.trace.civisibility.utils.SpanUtils;
 import java.util.Collection;
-import java.util.Map;
 import java.util.function.Consumer;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -46,7 +45,7 @@ public class HeadlessTestModule extends AbstractTestModule implements TestFramew
   private final CoverageStore.Factory coverageStoreFactory;
   private final ExecutionStrategy executionStrategy;
   private final ExecutionResults executionResults;
-  private final Map<LibraryCapability, Boolean> libraryCapabilities;
+  private final Collection<LibraryCapability> capabilities;
 
   public HeadlessTestModule(
       AgentSpanContext sessionSpanContext,
@@ -60,7 +59,7 @@ public HeadlessTestModule(
       LinesResolver linesResolver,
       CoverageStore.Factory coverageStoreFactory,
       ExecutionStrategy executionStrategy,
-      Map<LibraryCapability, Boolean> libraryCapabilities,
+      Collection<LibraryCapability> capabilities,
       Consumer<AgentSpan> onSpanFinish) {
     super(
         sessionSpanContext,
@@ -77,7 +76,7 @@ public HeadlessTestModule(
     this.coverageStoreFactory = coverageStoreFactory;
     this.executionStrategy = executionStrategy;
     this.executionResults = new ExecutionResults();
-    this.libraryCapabilities = libraryCapabilities;
+    this.capabilities = capabilities;
   }
 
   @Override
@@ -188,7 +187,7 @@ public TestSuiteImpl testSuiteStart(
         linesResolver,
         coverageStoreFactory,
         executionResults,
-        libraryCapabilities,
+        capabilities,
         SpanUtils.propagateCiVisibilityTagsTo(span));
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java
index 7d43d8db71c..a499793115b 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java
@@ -22,7 +22,6 @@
 import datadog.trace.civisibility.utils.SpanUtils;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -37,7 +36,7 @@ public class HeadlessTestSession extends AbstractTestSession implements TestFram
 
   private final ExecutionStrategy executionStrategy;
   private final CoverageStore.Factory coverageStoreFactory;
-  private final Map<LibraryCapability, Boolean> libraryCapabilities;
+  private final Collection<LibraryCapability> capabilities;
 
   public HeadlessTestSession(
       String projectName,
@@ -65,8 +64,7 @@ public HeadlessTestSession(
         linesResolver);
     this.executionStrategy = executionStrategy;
     this.coverageStoreFactory = coverageStoreFactory;
-    this.libraryCapabilities =
-        executionStrategy.getExecutionSettings().getCapabilitiesStatus(capabilities);
+    this.capabilities = capabilities;
   }
 
   @Override
@@ -83,7 +81,7 @@ public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long star
         linesResolver,
         coverageStoreFactory,
         executionStrategy,
-        libraryCapabilities,
+        capabilities,
         this::propagateModuleTags);
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java
index 627edd654c4..217409521c7 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java
@@ -80,7 +80,7 @@ public TestSuiteImpl testSuiteStart(
         linesResolver,
         coverageStoreFactory,
         executionResults,
-        Collections.emptyMap(),
+        Collections.emptyList(),
         SpanUtils.propagateCiVisibilityTagsTo(span));
   }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy
index f65c434a9c8..6afd6186b4a 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy
@@ -320,6 +320,7 @@ class ConfigurationApiImplTest extends Specification {
     .repositoryUrl("https://github.com/DataDog/foo")
     .branch("prod")
     .sha("d64185e45d1722ab3a53c45be47accae")
+    .commitMessage("full commit message")
     .osPlatform("linux")
     .osArchitecture("amd64")
     .osVersion("bionic")
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy
index 495767cf336..cd9a84e3fd8 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy
@@ -110,23 +110,6 @@ class ExecutionSettingsTest extends DDSpecification {
     ]
   }
 
-  def "test capabilities status: #testcaseName"() {
-    when:
-    def executionSettings = givenExecutionSettings(settingsEnabled)
-
-    def capabilitiesStatus = executionSettings.getCapabilitiesStatus(capabilities)
-    def expectedStatus = capabilities.stream().collect(Collectors.toMap(item -> item, item -> settingsEnabled))
-
-    then:
-    capabilitiesStatus == expectedStatus
-
-    where:
-    testcaseName             | settingsEnabled | capabilities
-    "capabilities-disabled"  | false           | LibraryCapability.values().toList()
-    "capabilities-enabled"   | true            | LibraryCapability.values().toList()
-    "capabilities-filtering" | true            | [LibraryCapability.TIA, LibraryCapability.ATR, LibraryCapability.IMPACTED, LibraryCapability.QUARANTINE]
-  }
-
   private ExecutionSettings givenExecutionSettings(boolean settingsEnabled) {
     if (settingsEnabled) {
       injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER)
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy
index e1e659010f9..eac92fa8474 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy
@@ -35,11 +35,11 @@ class TestImplTest extends SpanWriterTest {
           parent()
           spanType DDSpanTypes.TEST
           tags(false) {
-            "${LibraryCapability.TIA.asTag()}" true
-            "${LibraryCapability.EFD.asTag()}" false
-            "${LibraryCapability.QUARANTINE.asTag()}" true
-            "${LibraryCapability.DISABLED.asTag()}" false
-            "${LibraryCapability.ATTEMPT_TO_FIX.asTag()}" true
+            "${LibraryCapability.TIA.asTag()}" "${LibraryCapability.TIA.getVersion()}"
+            "${LibraryCapability.EFD.asTag()}" "${LibraryCapability.EFD.getVersion()}"
+            "${LibraryCapability.QUARANTINE.asTag()}" "${LibraryCapability.QUARANTINE.getVersion()}"
+            "${LibraryCapability.DISABLED.asTag()}" "${LibraryCapability.DISABLED.getVersion()}"
+            "${LibraryCapability.ATTEMPT_TO_FIX.asTag()}" "${LibraryCapability.ATTEMPT_TO_FIX.getVersion()}"
           }
         }
       }
@@ -114,11 +114,12 @@ class TestImplTest extends SpanWriterTest {
 
     def codeowners = NoCodeowners.INSTANCE
     def libraryCapabilities = [
-      (LibraryCapability.TIA)           : true,
-      (LibraryCapability.EFD)           : false,
-      (LibraryCapability.QUARANTINE)    : true,
-      (LibraryCapability.DISABLED)      : false,
-      (LibraryCapability.ATTEMPT_TO_FIX): true]
+      LibraryCapability.TIA,
+      LibraryCapability.EFD,
+      LibraryCapability.QUARANTINE,
+      LibraryCapability.DISABLED,
+      LibraryCapability.ATTEMPT_TO_FIX
+    ]
 
     new TestImpl(
       moduleSpanContext,
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy
index f51f8df278f..aed8ffa88db 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy
@@ -85,7 +85,7 @@ class TestSuiteImplTest extends SpanWriterTest {
       linesResolver,
       coverageStoreFactory,
       executionResults,
-      [:],
+      [],
       SpanUtils.DO_NOT_PROPAGATE_CI_VISIBILITY_TAGS
       )
   }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy
index 006fe2b9c66..cd8492ce566 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy
@@ -52,7 +52,7 @@ class ProxyTestModuleTest extends DDSpecification {
       Stub(CoverageStore.Factory),
       Stub(ChildProcessCoverageReporter),
       GroovyMock(SignalClient.Factory),
-      [:]
+      []
       )
 
     when:
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy
index 57924803cd3..192b77374e7 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy
@@ -66,7 +66,7 @@ class HeadlessTestModuleTest extends SpanWriterTest {
     Stub(LinesResolver),
     Stub(CoverageStore.Factory),
     executionStrategy,
-    [:],
+    [],
     (span) -> { }
     )
   }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl
index 4b9593e0a43..d16b3e43c8d 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl
@@ -3,26 +3,8 @@
     "type"      : "ci_app_libraries_tests_request",
     "id"        : "${uid}",
     "attributes": {
-      "service"       : "${tracerEnvironment.service}",
-      "env"           : "${tracerEnvironment.env}",
-      "repository_url": "${tracerEnvironment.repositoryUrl}",
-      "branch"        : "${tracerEnvironment.branch}",
-      "sha"           : "${tracerEnvironment.sha}",
-      "test_level"    : "${tracerEnvironment.testLevel}",
-      "configurations": {
-        "os.platform"         : "${tracerEnvironment.configurations.osPlatform}",
-        "os.architecture"     : "${tracerEnvironment.configurations.osArchitecture}",
-        "os.arch"             : "${tracerEnvironment.configurations.osArchitecture}",
-        "os.version"          : "${tracerEnvironment.configurations.osVersion}",
-        "runtime.name"        : "${tracerEnvironment.configurations.runtimeName}",
-        "runtime.version"     : "${tracerEnvironment.configurations.runtimeVersion}",
-        "runtime.vendor"      : "${tracerEnvironment.configurations.runtimeVendor}",
-        "runtime.architecture": "${tracerEnvironment.configurations.runtimeArchitecture}",
-        "custom"              : {
-          <#list tracerEnvironment.configurations.custom as customTag, customValue>
-            "${customTag}": "${customValue}"<#if customTag?has_next>, </#if>
-          </#list>
-        }
+      "repository_url"  : "${tracerEnvironment.repositoryUrl}",
+      "commit_message"  : "${tracerEnvironment.commitMessage}"
       }
     }
   }
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl
index 80821a8a9c0..0be69f618b3 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl
@@ -239,13 +239,13 @@
     "duration" : ${content_duration_7},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -301,13 +301,13 @@
     "duration" : ${content_duration_8},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -365,13 +365,13 @@
     "duration" : ${content_duration_9},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -429,13 +429,13 @@
     "duration" : ${content_duration_10},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -493,13 +493,13 @@
     "duration" : ${content_duration_11},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_11},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
index c60d70b9b19..d39acb2c290 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
@@ -187,13 +187,13 @@
     "duration" : ${content_duration_6},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl
index 2eff4d5848a..ed2f768404d 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl
@@ -239,13 +239,13 @@
     "duration" : ${content_duration_7},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl
index 3462c439bd2..171db88f8f7 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl
@@ -233,14 +233,14 @@
     "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.fail_fast_test_order" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.fail_fast_test_order" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl
index 5807153d23d..2ccf73e373a 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl
@@ -235,14 +235,14 @@
     "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.fail_fast_test_order" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.fail_fast_test_order" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -296,14 +296,14 @@
     "duration" : ${content_duration_8},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.fail_fast_test_order" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.fail_fast_test_order" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
index e67352e1531..cd356199d77 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
@@ -185,13 +185,13 @@
     "duration" : ${content_duration_6},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -245,13 +245,13 @@
     "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl
index 2fe41431bbf..567ef02b425 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl
@@ -1,15 +1,4 @@
 [ {
-  "files" : [ {
-    "bitmap" : "gAw=",
-    "filename" : "src/test/java/datadog/smoke/TestSucceed.java"
-  }, {
-    "bitmap" : "IA==",
-    "filename" : "src/main/java/datadog/smoke/Calculator.java"
-  } ],
-  "span_id" : ${content_span_id_4},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
   "files" : [ {
     "bitmap" : "AAE=",
     "filename" : "src/main/java/datadog/smoke/Calculator.java"
@@ -20,4 +9,15 @@
   "span_id" : ${content_span_id_5},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id_2}
+}, {
+  "files" : [ {
+    "bitmap" : "gAw=",
+    "filename" : "src/test/java/datadog/smoke/TestSucceed.java"
+  }, {
+    "bitmap" : "IA==",
+    "filename" : "src/main/java/datadog/smoke/Calculator.java"
+  } ],
+  "span_id" : ${content_span_id_4},
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id}
 } ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
index 3357f857988..6e69dc1d8fc 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
@@ -184,13 +184,13 @@
     "duration" : ${content_duration_6},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -292,14 +292,14 @@
     "duration" : ${content_duration_8},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.fail_fast_test_order" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.fail_fast_test_order" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl
index 567ef02b425..2fe41431bbf 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl
@@ -1,15 +1,4 @@
 [ {
-  "files" : [ {
-    "bitmap" : "AAE=",
-    "filename" : "src/main/java/datadog/smoke/Calculator.java"
-  }, {
-    "bitmap" : "AAw=",
-    "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java"
-  } ],
-  "span_id" : ${content_span_id_5},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id_2}
-}, {
   "files" : [ {
     "bitmap" : "gAw=",
     "filename" : "src/test/java/datadog/smoke/TestSucceed.java"
@@ -20,4 +9,15 @@
   "span_id" : ${content_span_id_4},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id}
+}, {
+  "files" : [ {
+    "bitmap" : "AAE=",
+    "filename" : "src/main/java/datadog/smoke/Calculator.java"
+  }, {
+    "bitmap" : "AAw=",
+    "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java"
+  } ],
+  "span_id" : ${content_span_id_5},
+  "test_session_id" : ${content_test_session_id},
+  "test_suite_id" : ${content_test_suite_id_2}
 } ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl
index 9d66aab6ad6..f6787d25b40 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl
@@ -233,13 +233,13 @@
     "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -341,14 +341,14 @@
     "duration" : ${content_duration_9},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.fail_fast_test_order" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.fail_fast_test_order" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
index c9d9587c30f..86c8cfc55c6 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
@@ -191,13 +191,13 @@
     "duration" : ${content_duration_5},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_5},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -251,13 +251,13 @@
     "duration" : ${content_duration_6},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl
index a8d9cb20ab2..fb292803f29 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl
@@ -240,13 +240,13 @@
     "duration" : ${content_duration_6},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -300,13 +300,13 @@
     "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl
index 460c9fe9d6c..8ed830161db 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl
@@ -235,13 +235,13 @@
     "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -295,13 +295,13 @@
     "duration" : ${content_duration_8},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl
index 23d159025ef..b3be4e67298 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl
@@ -185,13 +185,13 @@
     "duration" : ${content_duration_6},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -245,13 +245,13 @@
     "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl
index 94e172a837f..3dcdf89901a 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl
@@ -305,13 +305,13 @@
     "duration" : ${content_duration_9},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "false",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -367,13 +367,13 @@
     "duration" : ${content_duration_10},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "false",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -431,13 +431,13 @@
     "duration" : ${content_duration_11},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "false",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_11},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -495,13 +495,13 @@
     "duration" : ${content_duration_12},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "false",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_12},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -559,13 +559,13 @@
     "duration" : ${content_duration_13},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "true",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "false",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_13},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl
index c4515a48f24..028ae502e83 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl
@@ -309,13 +309,13 @@
     "duration" : ${content_duration_9},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -369,13 +369,13 @@
     "duration" : ${content_duration_10},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl
index f2646014b9d..9c08cc57fe1 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl
@@ -273,13 +273,13 @@
     "duration" : ${content_duration_8},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -333,13 +333,13 @@
     "duration" : ${content_duration_9},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl
index 7a4cb662146..73aba91b29f 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl
@@ -271,13 +271,13 @@
     "duration" : ${content_duration_8},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -332,13 +332,13 @@
     "duration" : ${content_duration_9},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl
index a4006651801..721fc4e239a 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl
@@ -326,13 +326,13 @@
     "duration" : ${content_duration_10},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "false",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl
index 67ef45ed060..8affc7a1319 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl
@@ -309,14 +309,14 @@
     "duration" : ${content_duration_9},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.fail_fast_test_order" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.fail_fast_test_order" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -370,14 +370,14 @@
     "duration" : ${content_duration_10},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.fail_fast_test_order" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.fail_fast_test_order" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl
index c4515a48f24..028ae502e83 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl
@@ -309,13 +309,13 @@
     "duration" : ${content_duration_9},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -369,13 +369,13 @@
     "duration" : ${content_duration_10},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl
index c4515a48f24..028ae502e83 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl
@@ -309,13 +309,13 @@
     "duration" : ${content_duration_9},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -369,13 +369,13 @@
     "duration" : ${content_duration_10},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl
index 42cd14dc56e..da63275f2e9 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl
@@ -273,13 +273,13 @@
     "duration" : ${content_duration_8},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "true",
-      "_dd.library_capabilities.test_management.disable" : "true",
-      "_dd.library_capabilities.test_management.quarantine" : "true",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -337,13 +337,13 @@
     "duration" : ${content_duration_9},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "true",
-      "_dd.library_capabilities.test_management.disable" : "true",
-      "_dd.library_capabilities.test_management.quarantine" : "true",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -403,13 +403,13 @@
     "duration" : ${content_duration_10},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "true",
-      "_dd.library_capabilities.test_management.disable" : "true",
-      "_dd.library_capabilities.test_management.quarantine" : "true",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -469,13 +469,13 @@
     "duration" : ${content_duration_11},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "true",
-      "_dd.library_capabilities.test_management.disable" : "true",
-      "_dd.library_capabilities.test_management.quarantine" : "true",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_11},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -535,13 +535,13 @@
     "duration" : ${content_duration_12},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "true",
-      "_dd.library_capabilities.test_management.disable" : "true",
-      "_dd.library_capabilities.test_management.quarantine" : "true",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_12},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -602,13 +602,13 @@
     "duration" : ${content_duration_13},
     "error" : 1,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "true",
-      "_dd.library_capabilities.test_management.disable" : "true",
-      "_dd.library_capabilities.test_management.quarantine" : "true",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_13},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -713,13 +713,13 @@
     "duration" : ${content_duration_15},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "true",
-      "_dd.library_capabilities.test_management.disable" : "true",
-      "_dd.library_capabilities.test_management.quarantine" : "true",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_15},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl
index 3b1e2230da5..43bcef123f8 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl
@@ -265,13 +265,13 @@
     "duration" : ${content_duration_8},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "false",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl
index bc6b96c9fe9..608a5ed70e7 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl
@@ -363,12 +363,12 @@
     "duration" : ${content_duration_11},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.test_impact_analysis" : "false",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_11},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl
index 521e50ac686..15425720a16 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl
@@ -309,13 +309,13 @@
     "duration" : ${content_duration_9},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
@@ -369,13 +369,13 @@
     "duration" : ${content_duration_10},
     "error" : 0,
     "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "false",
-      "_dd.library_capabilities.early_flake_detection" : "false",
-      "_dd.library_capabilities.impacted_tests" : "true",
-      "_dd.library_capabilities.test_impact_analysis" : "true",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "false",
-      "_dd.library_capabilities.test_management.disable" : "false",
-      "_dd.library_capabilities.test_management.quarantine" : "false",
+      "_dd.library_capabilities.auto_test_retries" : "1",
+      "_dd.library_capabilities.early_flake_detection" : "1",
+      "_dd.library_capabilities.impacted_tests" : "1",
+      "_dd.library_capabilities.test_impact_analysis" : "1",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.disable" : "1",
+      "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java
index 7e3980fc51f..7df45849286 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java
@@ -1,22 +1,28 @@
 package datadog.trace.api.civisibility.config;
 
 public enum LibraryCapability {
-  TIA("test_impact_analysis"),
-  EFD("early_flake_detection"),
-  ATR("auto_test_retries"),
-  IMPACTED("impacted_tests"),
-  FAIL_FAST("fail_fast_test_order"),
-  QUARANTINE("test_management.quarantine"),
-  DISABLED("test_management.disable"),
-  ATTEMPT_TO_FIX("test_management.attempt_to_fix");
+  TIA("test_impact_analysis", "1"),
+  EFD("early_flake_detection", "1"),
+  ATR("auto_test_retries", "1"),
+  IMPACTED("impacted_tests", "1"),
+  FAIL_FAST("fail_fast_test_order", "1"),
+  QUARANTINE("test_management.quarantine", "1"),
+  DISABLED("test_management.disable", "1"),
+  ATTEMPT_TO_FIX("test_management.attempt_to_fix", "2");
 
   private final String tag;
+  private final String version;
 
-  LibraryCapability(String tag) {
+  LibraryCapability(String tag, String version) {
     this.tag = tag;
+    this.version = version;
   }
 
   public String asTag() {
     return "_dd.library_capabilities." + tag;
   }
+
+  public String getVersion() {
+    return version;
+  }
 }