diff --git a/client/implementation/src/main/resources/META-INF/beans.xml b/client/implementation/src/main/resources/META-INF/beans.xml
index 8983449de..bf519b89d 100644
--- a/client/implementation/src/main/resources/META-INF/beans.xml
+++ b/client/implementation/src/main/resources/META-INF/beans.xml
@@ -1,5 +1,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_3_0.xsd"
-       bean-discovery-mode="all">
+       bean-discovery-mode="annotated">
 </beans>
diff --git a/server/implementation-cdi/src/main/resources/META-INF/beans.xml b/server/implementation-cdi/src/main/resources/META-INF/beans.xml
index 8983449de..bf519b89d 100644
--- a/server/implementation-cdi/src/main/resources/META-INF/beans.xml
+++ b/server/implementation-cdi/src/main/resources/META-INF/beans.xml
@@ -1,5 +1,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_3_0.xsd"
-       bean-discovery-mode="all">
+       bean-discovery-mode="annotated">
 </beans>
diff --git a/server/implementation/src/main/resources/META-INF/beans.xml b/server/implementation/src/main/resources/META-INF/beans.xml
index 8983449de..bf519b89d 100644
--- a/server/implementation/src/main/resources/META-INF/beans.xml
+++ b/server/implementation/src/main/resources/META-INF/beans.xml
@@ -1,5 +1,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_3_0.xsd"
-       bean-discovery-mode="all">
+       bean-discovery-mode="annotated">
 </beans>
diff --git a/server/runner/src/main/resources/META-INF/beans.xml b/server/runner/src/main/resources/META-INF/beans.xml
index 8983449de..bf519b89d 100644
--- a/server/runner/src/main/resources/META-INF/beans.xml
+++ b/server/runner/src/main/resources/META-INF/beans.xml
@@ -1,5 +1,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_3_0.xsd"
-       bean-discovery-mode="all">
+       bean-discovery-mode="annotated">
 </beans>
diff --git a/server/runner/src/main/webapp/WEB-INF/beans.xml b/server/runner/src/main/webapp/WEB-INF/beans.xml
index 8983449de..bf519b89d 100644
--- a/server/runner/src/main/webapp/WEB-INF/beans.xml
+++ b/server/runner/src/main/webapp/WEB-INF/beans.xml
@@ -1,5 +1,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_3_0.xsd"
-       bean-discovery-mode="all">
+       bean-discovery-mode="annotated">
 </beans>