diff --git a/bmt/src/main/webapp/WEB-INF/beans.xml b/bmt/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/bmt/src/main/webapp/WEB-INF/beans.xml
+++ b/bmt/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/cmt/src/main/webapp/WEB-INF/beans.xml b/cmt/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/cmt/src/main/webapp/WEB-INF/beans.xml
+++ b/cmt/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/ee-security/src/main/webapp/WEB-INF/beans.xml b/ee-security/src/main/webapp/WEB-INF/beans.xml
index 2d96d0e249..a6c504cb58 100644
--- a/ee-security/src/main/webapp/WEB-INF/beans.xml
+++ b/ee-security/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/ejb-security-context-propagation/src/main/webapp/WEB-INF/beans.xml b/ejb-security-context-propagation/src/main/webapp/WEB-INF/beans.xml
index f418aba2f0..620545afa4 100644
--- a/ejb-security-context-propagation/src/main/webapp/WEB-INF/beans.xml
+++ b/ejb-security-context-propagation/src/main/webapp/WEB-INF/beans.xml
@@ -14,9 +14,7 @@
 -->
 
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
+   xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/ejb-security-programmatic-auth/src/main/java/webapp/WEB-INF/beans.xml b/ejb-security-programmatic-auth/src/main/java/webapp/WEB-INF/beans.xml
index cae9254552..778baac68c 100644
--- a/ejb-security-programmatic-auth/src/main/java/webapp/WEB-INF/beans.xml
+++ b/ejb-security-programmatic-auth/src/main/java/webapp/WEB-INF/beans.xml
@@ -13,9 +13,7 @@
 -->
 
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
+   xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" bean-discovery-mode="all" version="4.0">
 </beans>
\ No newline at end of file
diff --git a/helloworld-mutual-ssl-secured/src/main/webapp/WEB-INF/beans.xml b/helloworld-mutual-ssl-secured/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/helloworld-mutual-ssl-secured/src/main/webapp/WEB-INF/beans.xml
+++ b/helloworld-mutual-ssl-secured/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/helloworld-mutual-ssl/src/main/webapp/WEB-INF/beans.xml b/helloworld-mutual-ssl/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/helloworld-mutual-ssl/src/main/webapp/WEB-INF/beans.xml
+++ b/helloworld-mutual-ssl/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/hibernate/src/main/webapp/WEB-INF/beans.xml b/hibernate/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/hibernate/src/main/webapp/WEB-INF/beans.xml
+++ b/hibernate/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/jsonp/src/main/webapp/WEB-INF/beans.xml b/jsonp/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/jsonp/src/main/webapp/WEB-INF/beans.xml
+++ b/jsonp/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml b/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml
+++ b/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml b/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml
+++ b/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/jts/application-component-2/src/main/resources/META-INF/beans.xml b/jts/application-component-2/src/main/resources/META-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/jts/application-component-2/src/main/resources/META-INF/beans.xml
+++ b/jts/application-component-2/src/main/resources/META-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/kitchensink/src/main/webapp/WEB-INF/beans.xml b/kitchensink/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/kitchensink/src/main/webapp/WEB-INF/beans.xml
+++ b/kitchensink/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/numberguess/src/main/webapp/WEB-INF/beans.xml b/numberguess/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/numberguess/src/main/webapp/WEB-INF/beans.xml
+++ b/numberguess/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/security-domain-to-domain/ejb/src/main/java/META-INF/beans.xml b/security-domain-to-domain/ejb/src/main/java/META-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/security-domain-to-domain/ejb/src/main/java/META-INF/beans.xml
+++ b/security-domain-to-domain/ejb/src/main/java/META-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/security-domain-to-domain/web/src/main/webapp/WEB-INF/beans.xml b/security-domain-to-domain/web/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/security-domain-to-domain/web/src/main/webapp/WEB-INF/beans.xml
+++ b/security-domain-to-domain/web/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/servlet-async/src/main/webapp/WEB-INF/beans.xml b/servlet-async/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/servlet-async/src/main/webapp/WEB-INF/beans.xml
+++ b/servlet-async/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml b/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml
+++ b/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/servlet-security/src/main/webapp/WEB-INF/beans.xml b/servlet-security/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/servlet-security/src/main/webapp/WEB-INF/beans.xml
+++ b/servlet-security/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/tasks-jsf/src/main/webapp/WEB-INF/beans.xml b/tasks-jsf/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/tasks-jsf/src/main/webapp/WEB-INF/beans.xml
+++ b/tasks-jsf/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/temperature-converter/src/main/webapp/WEB-INF/beans.xml b/temperature-converter/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/temperature-converter/src/main/webapp/WEB-INF/beans.xml
+++ b/temperature-converter/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/thread-racing/src/main/webapp/WEB-INF/beans.xml b/thread-racing/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/thread-racing/src/main/webapp/WEB-INF/beans.xml
+++ b/thread-racing/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/todo-backend/src/main/webapp/WEB-INF/beans.xml b/todo-backend/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/todo-backend/src/main/webapp/WEB-INF/beans.xml
+++ b/todo-backend/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>
diff --git a/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml b/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml
+++ b/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<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" version="4.0">
 </beans>