diff --git a/imixs-workflow-engine/src/main/resources/META-INF/beans.xml b/imixs-workflow-engine/src/main/resources/META-INF/beans.xml
index 51e8caf9f..debd97c1a 100644
--- a/imixs-workflow-engine/src/main/resources/META-INF/beans.xml
+++ b/imixs-workflow-engine/src/main/resources/META-INF/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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_2_0.xsd"
-       bean-discovery-mode="all" version="2.0">
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       bean-discovery-mode="all" version="3.0">
 </beans>
\ No newline at end of file
diff --git a/imixs-workflow-faces/src/main/resources/META-INF/ web-fragment.xml b/imixs-workflow-faces/src/main/resources/META-INF/ web-fragment.xml
index 36b8fdb51..e9bf587fd 100644
--- a/imixs-workflow-faces/src/main/resources/META-INF/ web-fragment.xml	
+++ b/imixs-workflow-faces/src/main/resources/META-INF/ web-fragment.xml	
@@ -1,6 +1,6 @@
-<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="
-        http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd" version="3.0">
+<web-fragment 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/web-app_6_0.xsd"
+         version="6.0">
  
 </web-fragment>
\ No newline at end of file
diff --git a/imixs-workflow-faces/src/main/resources/META-INF/beans.xml b/imixs-workflow-faces/src/main/resources/META-INF/beans.xml
index e7d2c6c7b..5fddcebac 100644
--- a/imixs-workflow-faces/src/main/resources/META-INF/beans.xml
+++ b/imixs-workflow-faces/src/main/resources/META-INF/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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_2_0.xsd"
-       bean-discovery-mode="annotated" version="2.0">
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       bean-discovery-mode="annotated" version="3.0">
 </beans>
\ No newline at end of file
diff --git a/imixs-workflow-faces/src/main/resources/META-INF/faces-config.xml b/imixs-workflow-faces/src/main/resources/META-INF/faces-config.xml
index b4abb26e5..6cf8bb933 100644
--- a/imixs-workflow-faces/src/main/resources/META-INF/faces-config.xml
+++ b/imixs-workflow-faces/src/main/resources/META-INF/faces-config.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-     http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
-	version="2.0">
+<faces-config version="3.0"
+              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/web-facesconfig_3_0.xsd">
 
 
 </faces-config>
\ No newline at end of file
diff --git a/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsDateInput.xhtml b/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsDateInput.xhtml
index 78e5f075c..081a260f7 100644
--- a/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsDateInput.xhtml
+++ b/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsDateInput.xhtml
@@ -1,11 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:cc="http://java.sun.com/jsf/composite"
-	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:cc="http://xmlns.jcp.org/jsf/composite">
 
 <cc:interface>
 	<cc:attribute name="value"></cc:attribute>
@@ -63,6 +60,6 @@
 </cc:implementation>
 
 
-</html>
+</ui:composition>
 
 
diff --git a/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsFileUpload.xhtml b/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsFileUpload.xhtml
index 43d0609c2..cb4e00f08 100644
--- a/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsFileUpload.xhtml
+++ b/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsFileUpload.xhtml
@@ -1,11 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:c="http://java.sun.com/jsp/jstl/core"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:cc="http://java.sun.com/jsf/composite">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:cc="http://xmlns.jcp.org/jsf/composite">
 
 <cc:interface>
 	<cc:attribute name="hideattachments" default="false"	type="java.lang.Boolean"></cc:attribute>
@@ -79,6 +76,6 @@
 
 
 
-</html>
+</ui:composition>
 
 
diff --git a/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsHeader.xhtml b/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsHeader.xhtml
index 686877291..0be57f8d0 100644
--- a/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsHeader.xhtml
+++ b/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsHeader.xhtml
@@ -1,10 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:cc="http://java.sun.com/jsf/composite"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+        xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+	xmlns:cc="http://xmlns.jcp.org/jsf/composite">
 
 <!-- INTERFACE -->
 <cc:interface>
@@ -83,6 +80,6 @@
 
 
 
-</html>
+</ui:composition>
 
 
diff --git a/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsWorkflowActions.xhtml b/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsWorkflowActions.xhtml
index d7ef8a95c..b612cc9e6 100644
--- a/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsWorkflowActions.xhtml
+++ b/imixs-workflow-faces/src/main/resources/META-INF/resources/imixs/imixsWorkflowActions.xhtml
@@ -1,11 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:cc="http://java.sun.com/jsf/composite"
-	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:cc="http://xmlns.jcp.org/jsf/composite">
 
 <cc:interface>
 	<cc:attribute name="workflowController"></cc:attribute>
@@ -35,6 +32,6 @@
 </cc:implementation>
 
 
-</html>
+</ui:composition>
 
 
diff --git a/imixs-workflow-index-lucene/src/main/resources/META-INF/beans.xml b/imixs-workflow-index-lucene/src/main/resources/META-INF/beans.xml
index 51e8caf9f..debd97c1a 100644
--- a/imixs-workflow-index-lucene/src/main/resources/META-INF/beans.xml
+++ b/imixs-workflow-index-lucene/src/main/resources/META-INF/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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_2_0.xsd"
-       bean-discovery-mode="all" version="2.0">
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       bean-discovery-mode="all" version="3.0">
 </beans>
\ No newline at end of file
diff --git a/imixs-workflow-index-solr/src/main/resources/META-INF/beans.xml b/imixs-workflow-index-solr/src/main/resources/META-INF/beans.xml
index e7d2c6c7b..5fddcebac 100644
--- a/imixs-workflow-index-solr/src/main/resources/META-INF/beans.xml
+++ b/imixs-workflow-index-solr/src/main/resources/META-INF/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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_2_0.xsd"
-       bean-discovery-mode="annotated" version="2.0">
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       bean-discovery-mode="annotated" version="3.0">
 </beans>
\ No newline at end of file
diff --git a/imixs-workflow-jax-rs/pom.xml b/imixs-workflow-jax-rs/pom.xml
index d2a22510a..ae9043336 100644
--- a/imixs-workflow-jax-rs/pom.xml
+++ b/imixs-workflow-jax-rs/pom.xml
@@ -21,19 +21,19 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<dependency>
+<!--		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>jsr311-api</artifactId>
 			<version>1.1.1</version>
 			<scope>provided</scope>
-		</dependency>
+		</dependency>-->
 
-		<dependency>
+<!--		<dependency>
 			<groupId>com.sun.jersey</groupId>
 			<artifactId>jersey-server</artifactId>
 			<version>1.1.5.1</version>
 			<scope>provided</scope>
-		</dependency>
+		</dependency>-->
 
 		<!-- apache fop dependency -->
 		<dependency>
diff --git a/imixs-workflow-jax-rs/src/main/resources/META-INF/beans.xml b/imixs-workflow-jax-rs/src/main/resources/META-INF/beans.xml
index e7d2c6c7b..5fddcebac 100644
--- a/imixs-workflow-jax-rs/src/main/resources/META-INF/beans.xml
+++ b/imixs-workflow-jax-rs/src/main/resources/META-INF/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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_2_0.xsd"
-       bean-discovery-mode="annotated" version="2.0">
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       bean-discovery-mode="annotated" version="3.0">
 </beans>
\ No newline at end of file
diff --git a/imixs-workflow-jax-rs/src/main/webapp/WEB-INF/web.xml b/imixs-workflow-jax-rs/src/main/webapp/WEB-INF/web.xml
index 7a98ce4aa..bc2f53de5 100644
--- a/imixs-workflow-jax-rs/src/main/webapp/WEB-INF/web.xml
+++ b/imixs-workflow-jax-rs/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	id="sywappWebApp_ID" version="2.5">
+<web-app 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/web-app_6_0.xsd"
+         version="6.0" id="sywappWebApp_ID">
 	<display-name>org.imixs.workflow.jax-rs</display-name>
 
 	<servlet>