diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedSimplyTimedMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedSimplyTimedMethodBean.java
index 550a9218..1390fe47 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedSimplyTimedMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedSimplyTimedMethodBean.java
@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class InheritedSimplyTimedMethodBean extends VisibilitySimplyTimedMethodBean {
 
     @SimplyTimed
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedTimedMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedTimedMethodBean.java
index 9bd1f0e1..6274b652 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedTimedMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedTimedMethodBean.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class InheritedTimedMethodBean extends VisibilityTimedMethodBean {
 
     @Timed
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilitySimplyTimedMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilitySimplyTimedMethodBean.java
index 97ee249a..d2f72ae9 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilitySimplyTimedMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilitySimplyTimedMethodBean.java
@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class VisibilitySimplyTimedMethodBean {
 
     @SimplyTimed
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilityTimedMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilityTimedMethodBean.java
index 1c89af66..9c4800b4 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilityTimedMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilityTimedMethodBean.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class VisibilityTimedMethodBean {
 
     @Timed
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteExtendedTimedBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteExtendedTimedBean.java
index 8e30a0e4..79603a4b 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteExtendedTimedBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteExtendedTimedBean.java
@@ -15,6 +15,9 @@
  */
 package org.eclipse.microprofile.metrics.tck.metrics;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class ConcreteExtendedTimedBean extends AbstractTimedBean {
 
     public void anotherTimedMethod() {
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteTimedBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteTimedBean.java
index db84414f..57369d60 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteTimedBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteTimedBean.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 @Timed
 public class ConcreteTimedBean extends AbstractGenericBean {
 
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedClassBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedClassBean.java
index 6d86a5c0..0b760547 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedClassBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedClassBean.java
@@ -40,6 +40,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.ConcurrentGauge;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 @ConcurrentGauge(name = "cGaugedClass")
 public class ConcurrentGaugedClassBean {
 
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedConstructorBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedConstructorBean.java
index 481b3c3e..84324295 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedConstructorBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedConstructorBean.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.ConcurrentGauge;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class ConcurrentGaugedConstructorBean {
 
     @ConcurrentGauge(name = "cGaugedConstructor")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedMethodBean.java
index 01d46a8f..87c14d01 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedMethodBean.java
@@ -19,6 +19,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.ConcurrentGauge;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class ConcurrentGaugedMethodBean<T> {
 
     @ConcurrentGauge(name = "cGaugedMethod", absolute = true)
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedClassBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedClassBean.java
index a1e34f7f..36a2fc5e 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedClassBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedClassBean.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Counted;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 @Counted(name = "countedClass")
 public class CountedClassBean {
 
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodBean.java
index feff7470..1d23ece8 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodBean.java
@@ -19,6 +19,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Counted;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class CountedMethodBean<T> {
 
     @Counted(name = "countedMethod", absolute = true)
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodTagBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodTagBean.java
index 539923be..a45a0208 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodTagBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodTagBean.java
@@ -23,6 +23,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Counted;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class CountedMethodTagBean {
 
     @Counted(name = "countedMethod", absolute = true, tags = {"number=one"})
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CounterFieldBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CounterFieldBean.java
index 53aff3ef..ed43768a 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CounterFieldBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CounterFieldBean.java
@@ -18,8 +18,10 @@
 import org.eclipse.microprofile.metrics.Counter;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class CounterFieldBean {
 
     @Inject
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/DefaultNameMetricMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/DefaultNameMetricMethodBean.java
index b5e7687a..be5de088 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/DefaultNameMetricMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/DefaultNameMetricMethodBean.java
@@ -19,6 +19,9 @@
 import org.eclipse.microprofile.metrics.annotation.Metered;
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class DefaultNameMetricMethodBean {
 
     @Counted
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/HistogramFieldBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/HistogramFieldBean.java
index 91eb24d1..d7e560d2 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/HistogramFieldBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/HistogramFieldBean.java
@@ -18,8 +18,10 @@
 import org.eclipse.microprofile.metrics.Histogram;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class HistogramFieldBean {
 
     @Inject
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredClassBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredClassBean.java
index 34241ef4..5785a255 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredClassBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredClassBean.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 @Metered(name = "meteredClass")
 public class MeteredClassBean {
 
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredConstructorBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredConstructorBean.java
index 048cf837..cdd2165c 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredConstructorBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredConstructorBean.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MeteredConstructorBean {
 
     @Metered(name = "meteredConstructor", absolute = true)
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean1.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean1.java
index 1e0ced6d..1ec31b90 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean1.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean1.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MeteredMethodBean1 {
 
     @Metered(name = "meteredMethod")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean2.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean2.java
index 612d9084..479f880a 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean2.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean2.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MeteredMethodBean2 {
 
     @Metered(name = "meteredMethod")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MultipleMetricsConstructorBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MultipleMetricsConstructorBean.java
index 4f11b8f3..cae64615 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MultipleMetricsConstructorBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MultipleMetricsConstructorBean.java
@@ -19,6 +19,9 @@
 import org.eclipse.microprofile.metrics.annotation.Metered;
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MultipleMetricsConstructorBean {
 
     @Counted(name = "counter")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/OverloadedTimedMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/OverloadedTimedMethodBean.java
index a9621bde..f2f75856 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/OverloadedTimedMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/OverloadedTimedMethodBean.java
@@ -19,6 +19,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class OverloadedTimedMethodBean {
 
     @Timed(name = "overloadedTimedMethodWithNoArguments")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimpleTimerFieldBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimpleTimerFieldBean.java
index 277a1db5..eac5f8f5 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimpleTimerFieldBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimpleTimerFieldBean.java
@@ -26,8 +26,10 @@
 import org.eclipse.microprofile.metrics.SimpleTimer;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class SimpleTimerFieldBean {
 
     @Inject
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedConstructorBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedConstructorBean.java
index 2ad0954f..4d6cfd0a 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedConstructorBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedConstructorBean.java
@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedConstructorBean {
 
     @SimplyTimed(name = "simplyTimedConstructor")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean1.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean1.java
index a3f2d750..d1db5431 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean1.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean1.java
@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedMethodBean1 {
 
     @SimplyTimed(name = "simplyTimedMethod")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean2.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean2.java
index 8bcd4e55..f4c019da 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean2.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean2.java
@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedMethodBean2 {
 
     @SimplyTimed(name = "simplyTimedMethod")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean3.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean3.java
index 2e434f7e..26ed9d1b 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean3.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean3.java
@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedMethodBean3 {
 
     @SimplyTimed(name = "simplyTimedMethod")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedConstructorBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedConstructorBean.java
index ddb22694..e9be858f 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedConstructorBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedConstructorBean.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedConstructorBean {
 
     @Timed(name = "timedConstructor")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean1.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean1.java
index 17ff86af..2ed49f86 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean1.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean1.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedMethodBean1 {
 
     @Timed(name = "timedMethod")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean2.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean2.java
index 5a08f3b7..5e42e070 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean2.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean2.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedMethodBean2 {
 
     @Timed(name = "timedMethod")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean3.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean3.java
index b86f9c20..e874e3f3 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean3.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean3.java
@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedMethodBean3 {
 
     @Timed(name = "timedMethod")
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimerFieldBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimerFieldBean.java
index 29ece3eb..ae8a933a 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimerFieldBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimerFieldBean.java
@@ -18,8 +18,10 @@
 import org.eclipse.microprofile.metrics.Timer;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class TimerFieldBean {
 
     @Inject
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/CounterFieldTagBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/CounterFieldTagBean.java
index 5593bc79..e9fb2b21 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/CounterFieldTagBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/CounterFieldTagBean.java
@@ -24,8 +24,10 @@
 import org.eclipse.microprofile.metrics.Counter;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class CounterFieldTagBean {
 
     @Inject
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/HistogramTagFieldBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/HistogramTagFieldBean.java
index 1020c713..5367327f 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/HistogramTagFieldBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/HistogramTagFieldBean.java
@@ -24,8 +24,10 @@
 import org.eclipse.microprofile.metrics.Histogram;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class HistogramTagFieldBean {
 
     @Inject
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/MeteredTagMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/MeteredTagMethodBean.java
index dc41f9dc..573281da 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/MeteredTagMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/MeteredTagMethodBean.java
@@ -23,6 +23,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MeteredTagMethodBean {
 
     @Metered(name = "meteredMethod", tags = {"number=one"})
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimpleTimerTagFieldBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimpleTimerTagFieldBean.java
index 0e6bea8a..d4214040 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimpleTimerTagFieldBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimpleTimerTagFieldBean.java
@@ -24,8 +24,10 @@
 import org.eclipse.microprofile.metrics.SimpleTimer;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class SimpleTimerTagFieldBean {
 
     @Inject
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimplyTimedTagMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimplyTimedTagMethodBean.java
index 4719c9e8..5bf1450a 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimplyTimedTagMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimplyTimedTagMethodBean.java
@@ -23,6 +23,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedTagMethodBean {
 
     @SimplyTimed(name = "simplyTimedMethod", tags = {"number=one"})
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimedTagMethodBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimedTagMethodBean.java
index 2805866c..d4d8d9ae 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimedTagMethodBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimedTagMethodBean.java
@@ -23,6 +23,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedTagMethodBean {
 
     @Timed(name = "timedMethod", tags = {"number=one"})
diff --git a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimerTagFieldBean.java b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimerTagFieldBean.java
index 8db81483..0f90c533 100644
--- a/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimerTagFieldBean.java
+++ b/tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimerTagFieldBean.java
@@ -24,8 +24,10 @@
 import org.eclipse.microprofile.metrics.Timer;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class TimerTagFieldBean {
 
     @Inject
diff --git a/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/multipleinstances/DependentScopedBean.java b/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/multipleinstances/DependentScopedBean.java
index 83e4ee39..1ec4a675 100644
--- a/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/multipleinstances/DependentScopedBean.java
+++ b/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/multipleinstances/DependentScopedBean.java
@@ -26,6 +26,9 @@
 import org.eclipse.microprofile.metrics.annotation.Metered;
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class DependentScopedBean {
 
     @Counted(name = "counter", absolute = true)