diff --git a/extensions/cdi/src/main/java/org/apache/batchee/cdi/scope/JobScoped.java b/extensions/cdi/src/main/java/org/apache/batchee/cdi/scope/JobScoped.java
index 7d4d4a1..40dbbe5 100644
--- a/extensions/cdi/src/main/java/org/apache/batchee/cdi/scope/JobScoped.java
+++ b/extensions/cdi/src/main/java/org/apache/batchee/cdi/scope/JobScoped.java
@@ -20,10 +20,12 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static java.lang.annotation.ElementType.TYPE;
 
-@Target(TYPE)
+@Target({TYPE, METHOD, FIELD})
 @Retention(RUNTIME)
 @NormalScope
 public @interface JobScoped {
diff --git a/extensions/cdi/src/main/java/org/apache/batchee/cdi/scope/StepScoped.java b/extensions/cdi/src/main/java/org/apache/batchee/cdi/scope/StepScoped.java
index aaba852..ff57767 100644
--- a/extensions/cdi/src/main/java/org/apache/batchee/cdi/scope/StepScoped.java
+++ b/extensions/cdi/src/main/java/org/apache/batchee/cdi/scope/StepScoped.java
@@ -20,10 +20,12 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-@Target(TYPE)
+@Target({TYPE, METHOD, FIELD})
 @Retention(RUNTIME)
 @NormalScope
 public @interface StepScoped {