diff --git a/sdk-server-common/src/main/java/io/a2a/server/util/async/AsyncExecutorProducer.java b/sdk-server-common/src/main/java/io/a2a/server/util/async/AsyncExecutorProducer.java
index 1b3066ca6..27b4ac12b 100644
--- a/sdk-server-common/src/main/java/io/a2a/server/util/async/AsyncExecutorProducer.java
+++ b/sdk-server-common/src/main/java/io/a2a/server/util/async/AsyncExecutorProducer.java
@@ -6,10 +6,10 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Singleton;
 
-@Singleton
+@ApplicationScoped
 public class AsyncExecutorProducer {
 
     private ExecutorService executor;
diff --git a/sdk-server-common/src/main/resources/META-INF/beans.xml b/sdk-server-common/src/main/resources/META-INF/beans.xml
index 9dfae34df..9b2940fc2 100644
--- a/sdk-server-common/src/main/resources/META-INF/beans.xml
+++ b/sdk-server-common/src/main/resources/META-INF/beans.xml
@@ -2,5 +2,5 @@
 <beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
-       bean-discovery-mode="all">
+       bean-discovery-mode="annotated">
 </beans>
\ No newline at end of file