diff --git a/lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java b/lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java
index 8093e7a45e..02aff509cd 100644
--- a/lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java
+++ b/lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java
@@ -89,7 +89,7 @@ private Connection getConnection() throws Exception {
         "jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
             + "IGNORECASE=TRUE;LOCK_MODE=0",
         "sa",
-        "");
+        "sa");
   }
 
   private int countTasksByName(String taskName) throws Exception {
diff --git a/lib/taskana-cdi-example/src/test/resources/arquillian.xml b/lib/taskana-cdi-example/src/test/resources/arquillian.xml
index 3fcbf32bff..16f2ba1082 100644
--- a/lib/taskana-cdi-example/src/test/resources/arquillian.xml
+++ b/lib/taskana-cdi-example/src/test/resources/arquillian.xml
@@ -5,7 +5,7 @@
   <defaultProtocol type="Servlet 6.0"/>
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-27.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-31.0.1.Final</property>
       <property name="serverConfig">int-test-standalone.xml</property>
       <!--      <property name="javaVmArguments">-->
       <!--        -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y-->
diff --git a/lib/taskana-cdi-example/src/test/resources/int-test-standalone.xml b/lib/taskana-cdi-example/src/test/resources/int-test-standalone.xml
index e08f36936e..207a89a886 100644
--- a/lib/taskana-cdi-example/src/test/resources/int-test-standalone.xml
+++ b/lib/taskana-cdi-example/src/test/resources/int-test-standalone.xml
@@ -36,7 +36,6 @@
     <extension module="org.wildfly.extension.metrics"/>
     <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
     <extension module="org.wildfly.extension.microprofile.jwt-smallrye"/>
-    <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
     <extension module="org.wildfly.extension.request-controller"/>
     <extension module="org.wildfly.extension.security.manager"/>
     <extension module="org.wildfly.extension.undertow"/>
@@ -92,6 +91,9 @@
       <logger category="com.arjuna">
         <level name="WARN"/>
       </logger>
+      <logger category="com.networknt.schema">
+        <level name="WARN"/>
+      </logger>
       <logger category="io.jaegertracing.Configuration">
         <level name="WARN"/>
       </logger>
@@ -104,6 +106,47 @@
       <logger category="sun.rmi">
         <level name="WARN"/>
       </logger>
+      <logger category="org.slf4j"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.springframework.security"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.jboss.security"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.jboss.as.security"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.picketbox"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger
+        category="org.jboss.as.domain.management.security"
+        use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.wildfly.security"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.wildfly.elytron"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.apache.catalina"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.wildfly.extension.undertow"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
       <root-logger>
         <level name="INFO"/>
         <handlers>
@@ -121,6 +164,7 @@
     <subsystem xmlns="urn:jboss:domain:batch-jberet:3.0">
       <default-job-repository name="in-memory"/>
       <default-thread-pool name="batch"/>
+      <security-domain name="ApplicationDomain"/>
       <job-repository name="in-memory">
         <in-memory/>
       </job-repository>
@@ -131,17 +175,14 @@
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
     <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:datasources:7.0">
+    <subsystem xmlns="urn:jboss:domain:datasources:7.1">
       <datasources>
         <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS"
                     enabled="true" use-java-context="true"
                     statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
           <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
           <driver>h2</driver>
-          <security>
-            <user-name>sa</user-name>
-            <password></password>
-          </security>
+          <security user-name="sa" password="sa"/>
         </datasource>
         <datasource jndi-name="java:jboss/datasources/Taskana"
                     pool-name="TASKANA H2 Datasource"
@@ -152,10 +193,7 @@
             jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;IGNORECASE=TRUE;LOCK_MODE=0
           </connection-url>
           <driver>h2</driver>
-          <security>
-            <user-name>sa</user-name>
-            <password></password>
-          </security>
+          <security user-name="sa" password="sa"/>
         </datasource>
         <drivers>
           <driver name="h2" module="com.h2database.h2">
@@ -179,7 +217,7 @@
       <infinispan-timer-management name="transient" cache-container="ejb" cache="transient"
                                    max-active-timers="10000"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:distributable-web:3.0" default-session-management="default"
+    <subsystem xmlns="urn:jboss:domain:distributable-web:4.0" default-session-management="default"
                default-single-sign-on-management="default">
       <infinispan-session-management name="default" cache-container="web" granularity="SESSION">
         <local-affinity/>
@@ -191,8 +229,7 @@
       <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
       <concurrent>
         <context-services>
-          <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default"
-                           use-transaction-setup-provider="true"/>
+          <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" />
         </context-services>
         <managed-thread-factories>
           <managed-thread-factory name="default"
@@ -275,7 +312,7 @@
       <statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
       <log-system-exceptions value="true"/>
     </subsystem>
-    <subsystem xmlns="urn:wildfly:elytron:16.0" final-providers="combined-providers"
+    <subsystem xmlns="urn:wildfly:elytron:18.0" final-providers="combined-providers"
                disallowed-providers="OracleUcrypto">
       <providers>
         <aggregate-providers name="combined-providers">
@@ -290,16 +327,16 @@
                         format="JSON"/>
       </audit-logging>
       <security-domains>
-        <security-domain name="ManagementDomain" default-realm="ManagementRealm"
-                         permission-mapper="default-permission-mapper">
-          <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
-          <realm name="local" role-mapper="super-user-mapper"/>
-        </security-domain>
         <security-domain name="ApplicationDomain" default-realm="ApplicationRealm"
                          permission-mapper="default-permission-mapper">
           <realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
           <realm name="local"/>
         </security-domain>
+        <security-domain name="ManagementDomain" default-realm="ManagementRealm"
+                         permission-mapper="default-permission-mapper">
+          <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
+          <realm name="local" role-mapper="super-user-mapper"/>
+        </security-domain>
       </security-domains>
       <security-realms>
         <identity-realm name="local" identity="$local"/>
@@ -338,53 +375,53 @@
           <permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
         </permission-set>
         <permission-set name="default-permissions">
-          <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission"
-                      module="org.wildfly.extension.batch.jberet" target-name="*"/>
           <permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission"
                       module="org.wildfly.transaction.client"/>
           <permission class-name="org.jboss.ejb.client.RemoteEJBPermission"
                       module="org.jboss.ejb-client"/>
+          <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission"
+                      module="org.wildfly.extension.batch.jberet" target-name="*"/>
         </permission-set>
       </permission-sets>
       <http>
-        <http-authentication-factory name="management-http-authentication"
-                                     security-domain="ManagementDomain"
+        <http-authentication-factory name="application-http-authentication"
+                                     security-domain="ApplicationDomain"
                                      http-server-mechanism-factory="global">
           <mechanism-configuration>
-            <mechanism mechanism-name="DIGEST">
-              <mechanism-realm realm-name="ManagementRealm"/>
+            <mechanism mechanism-name="BASIC">
+              <mechanism-realm realm-name="ApplicationRealm"/>
             </mechanism>
           </mechanism-configuration>
         </http-authentication-factory>
-        <http-authentication-factory name="application-http-authentication"
-                                     security-domain="ApplicationDomain"
+        <http-authentication-factory name="management-http-authentication"
+                                     security-domain="ManagementDomain"
                                      http-server-mechanism-factory="global">
           <mechanism-configuration>
-            <mechanism mechanism-name="BASIC">
-              <mechanism-realm realm-name="ApplicationRealm"/>
+            <mechanism mechanism-name="DIGEST">
+              <mechanism-realm realm-name="ManagementRealm"/>
             </mechanism>
           </mechanism-configuration>
         </http-authentication-factory>
-        <provider-http-server-mechanism-factory name="global"/>
+         <provider-http-server-mechanism-factory name="global"/>
       </http>
       <sasl>
-        <sasl-authentication-factory name="management-sasl-authentication"
+        <sasl-authentication-factory name="application-sasl-authentication"
                                      sasl-server-factory="configured"
-                                     security-domain="ManagementDomain">
+                                     security-domain="ApplicationDomain">
           <mechanism-configuration>
             <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm realm-name="ManagementRealm"/>
+              <mechanism-realm realm-name="ApplicationRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
-        <sasl-authentication-factory name="application-sasl-authentication"
+        <sasl-authentication-factory name="management-sasl-authentication"
                                      sasl-server-factory="configured"
-                                     security-domain="ApplicationDomain">
+                                     security-domain="ManagementDomain">
           <mechanism-configuration>
             <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm realm-name="ApplicationRealm"/>
+              <mechanism-realm realm-name="ManagementRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
@@ -421,8 +458,11 @@
           <server-ssl-context name="applicationSSC" key-manager="applicationKM"/>
         </server-ssl-contexts>
       </tls>
+      <policy name="jacc">
+        <jacc-policy/>
+      </policy>
     </subsystem>
-    <subsystem xmlns="urn:wildfly:elytron-oidc-client:1.0"/>
+    <subsystem xmlns="urn:wildfly:elytron-oidc-client:2.0"/>
     <subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
     <subsystem xmlns="urn:jboss:domain:iiop-openjdk:3.0">
       <orb socket-binding="iiop"/>
@@ -430,6 +470,22 @@
       <security server-requires-ssl="false" client-requires-ssl="false"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:infinispan:14.0">
+      <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
+        <local-cache name="entity">
+          <heap-memory size="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
+        <local-cache name="local-query">
+          <heap-memory size="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
+        <local-cache name="timestamps">
+          <expiration interval="0"/>
+        </local-cache>
+        <local-cache name="pending-puts">
+          <expiration max-idle="60000"/>
+        </local-cache>
+      </cache-container>
       <cache-container name="ejb" default-cache="passivation" marshaller="PROTOSTREAM"
                        aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan">
         <local-cache name="passivation">
@@ -459,33 +515,11 @@
           <expiration interval="0"/>
         </local-cache>
       </cache-container>
-      <cache-container name="server" default-cache="default" marshaller="PROTOSTREAM"
-                       modules="org.wildfly.clustering.singleton.server">
-        <local-cache name="default">
-          <expiration interval="0"/>
-        </local-cache>
-      </cache-container>
-      <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
-        <local-cache name="entity">
-          <heap-memory size="10000"/>
-          <expiration max-idle="100000"/>
-        </local-cache>
-        <local-cache name="local-query">
-          <heap-memory size="10000"/>
-          <expiration max-idle="100000"/>
-        </local-cache>
-        <local-cache name="timestamps">
-          <expiration interval="0"/>
-        </local-cache>
-        <local-cache name="pending-puts">
-          <expiration max-idle="60000"/>
-        </local-cache>
-      </cache-container>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:io:3.0">
       <worker name="default"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:jaxrs:2.0"/>
+    <subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
     <subsystem xmlns="urn:jboss:domain:jca:6.0">
       <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
       <bean-validation enabled="true"/>
@@ -520,7 +554,7 @@
         <smtp-server outbound-socket-binding-ref="mail-smtp"/>
       </mail-session>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:messaging-activemq:14.0">
+    <subsystem xmlns="urn:jboss:domain:messaging-activemq:16.0">
       <server name="default">
         <security elytron-domain="ApplicationDomain"/>
         <statistics
@@ -564,21 +598,17 @@
                prefix="${wildfly.metrics.prefix:wildfly}"/>
     <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:2.0"/>
     <subsystem xmlns="urn:wildfly:microprofile-jwt-smallrye:1.0"/>
-    <subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:3.0" default-tracer="jaeger">
-      <jaeger-tracer name="jaeger">
-        <sampler-configuration sampler-type="const" sampler-param="1.0"/>
-      </jaeger-tracer>
-    </subsystem>
     <subsystem xmlns="urn:jboss:domain:naming:2.0">
       <remote-naming/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:remoting:5.0">
+    <subsystem xmlns="urn:jboss:domain:remoting:6.0">
+      <endpoint worker="default"/>
       <http-connector name="http-remoting-connector" connector-ref="default"
                       sasl-authentication-factory="application-sasl-authentication"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:resource-adapters:6.1"/>
+    <subsystem xmlns="urn:jboss:domain:resource-adapters:7.1"/>
     <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
     <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
       <deployment-permissions>
@@ -599,10 +629,10 @@
         statistics-enabled="${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
       <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:undertow:13.0" default-server="default-server"
-               default-virtual-host="default-host" default-servlet-container="default"
-               default-security-domain="other"
-               statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
+    <subsystem xmlns="urn:jboss:domain:undertow:14.0" default-virtual-host="default-host"
+               default-servlet-container="default" default-server="default-server"
+               statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}"
+               default-security-domain="other">
       <byte-buffer-pool name="default"/>
       <buffer-cache name="default"/>
       <server name="default-server">
diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java b/lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java
index 1dd5f85f36..fdc1b6b3cf 100644
--- a/lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java
+++ b/lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java
@@ -111,7 +111,7 @@ private Connection getConnection() throws Exception {
         "jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
             + "IGNORECASE=TRUE;LOCK_MODE=0",
         "sa",
-        "");
+        "sa");
   }
 
   private int countTasksByName(String taskName) throws Exception {
diff --git a/lib/taskana-cdi/src/test/resources/arquillian.xml b/lib/taskana-cdi/src/test/resources/arquillian.xml
index 3fcbf32bff..16f2ba1082 100644
--- a/lib/taskana-cdi/src/test/resources/arquillian.xml
+++ b/lib/taskana-cdi/src/test/resources/arquillian.xml
@@ -5,7 +5,7 @@
   <defaultProtocol type="Servlet 6.0"/>
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-27.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-31.0.1.Final</property>
       <property name="serverConfig">int-test-standalone.xml</property>
       <!--      <property name="javaVmArguments">-->
       <!--        -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y-->
diff --git a/lib/taskana-cdi/src/test/resources/int-test-standalone.xml b/lib/taskana-cdi/src/test/resources/int-test-standalone.xml
index 356454a3ca..246256d0c8 100644
--- a/lib/taskana-cdi/src/test/resources/int-test-standalone.xml
+++ b/lib/taskana-cdi/src/test/resources/int-test-standalone.xml
@@ -36,7 +36,6 @@
     <extension module="org.wildfly.extension.metrics"/>
     <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
     <extension module="org.wildfly.extension.microprofile.jwt-smallrye"/>
-    <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
     <extension module="org.wildfly.extension.request-controller"/>
     <extension module="org.wildfly.extension.security.manager"/>
     <extension module="org.wildfly.extension.undertow"/>
@@ -92,6 +91,9 @@
       <logger category="com.arjuna">
         <level name="WARN"/>
       </logger>
+      <logger category="com.networknt.schema">
+        <level name="WARN"/>
+      </logger>
       <logger category="io.jaegertracing.Configuration">
         <level name="WARN"/>
       </logger>
@@ -104,6 +106,47 @@
       <logger category="sun.rmi">
         <level name="WARN"/>
       </logger>
+      <logger category="org.slf4j"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.springframework.security"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.jboss.security"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.jboss.as.security"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.picketbox"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger
+        category="org.jboss.as.domain.management.security"
+        use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.wildfly.security"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.wildfly.elytron"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.apache.catalina"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
+      <logger category="org.wildfly.extension.undertow"
+              use-parent-handlers="true">
+        <level name="INFO"/>
+      </logger>
       <root-logger>
         <level name="INFO"/>
         <handlers>
@@ -121,6 +164,7 @@
     <subsystem xmlns="urn:jboss:domain:batch-jberet:3.0">
       <default-job-repository name="in-memory"/>
       <default-thread-pool name="batch"/>
+      <security-domain name="ApplicationDomain"/>
       <job-repository name="in-memory">
         <in-memory/>
       </job-repository>
@@ -131,17 +175,14 @@
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
     <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:datasources:7.0">
+    <subsystem xmlns="urn:jboss:domain:datasources:7.1">
       <datasources>
         <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS"
                     enabled="true" use-java-context="true"
                     statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
           <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
           <driver>h2</driver>
-          <security>
-            <user-name>sa</user-name>
-            <password></password>
-          </security>
+          <security user-name="sa" password="sa"/>
         </datasource>
         <datasource jndi-name="java:jboss/datasources/TestDS"
                     pool-name="TASKANA H2 Datasource"
@@ -152,10 +193,7 @@
             jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;IGNORECASE=TRUE;LOCK_MODE=0
           </connection-url>
           <driver>h2</driver>
-          <security>
-            <user-name>sa</user-name>
-            <password></password>
-          </security>
+          <security user-name="sa" password="sa"/>
         </datasource>
         <drivers>
           <driver name="h2" module="com.h2database.h2">
@@ -179,7 +217,7 @@
       <infinispan-timer-management name="transient" cache-container="ejb" cache="transient"
                                    max-active-timers="10000"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:distributable-web:3.0" default-session-management="default"
+    <subsystem xmlns="urn:jboss:domain:distributable-web:4.0" default-session-management="default"
                default-single-sign-on-management="default">
       <infinispan-session-management name="default" cache-container="web" granularity="SESSION">
         <local-affinity/>
@@ -191,8 +229,7 @@
       <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
       <concurrent>
         <context-services>
-          <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default"
-                           use-transaction-setup-provider="true"/>
+          <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" />
         </context-services>
         <managed-thread-factories>
           <managed-thread-factory name="default"
@@ -275,7 +312,7 @@
       <statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
       <log-system-exceptions value="true"/>
     </subsystem>
-    <subsystem xmlns="urn:wildfly:elytron:16.0" final-providers="combined-providers"
+    <subsystem xmlns="urn:wildfly:elytron:18.0" final-providers="combined-providers"
                disallowed-providers="OracleUcrypto">
       <providers>
         <aggregate-providers name="combined-providers">
@@ -290,16 +327,16 @@
                         format="JSON"/>
       </audit-logging>
       <security-domains>
-        <security-domain name="ManagementDomain" default-realm="ManagementRealm"
-                         permission-mapper="default-permission-mapper">
-          <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
-          <realm name="local" role-mapper="super-user-mapper"/>
-        </security-domain>
         <security-domain name="ApplicationDomain" default-realm="ApplicationRealm"
                          permission-mapper="default-permission-mapper">
           <realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
           <realm name="local"/>
         </security-domain>
+        <security-domain name="ManagementDomain" default-realm="ManagementRealm"
+                         permission-mapper="default-permission-mapper">
+          <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
+          <realm name="local" role-mapper="super-user-mapper"/>
+        </security-domain>
       </security-domains>
       <security-realms>
         <identity-realm name="local" identity="$local"/>
@@ -338,53 +375,53 @@
           <permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
         </permission-set>
         <permission-set name="default-permissions">
-          <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission"
-                      module="org.wildfly.extension.batch.jberet" target-name="*"/>
           <permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission"
                       module="org.wildfly.transaction.client"/>
           <permission class-name="org.jboss.ejb.client.RemoteEJBPermission"
                       module="org.jboss.ejb-client"/>
+          <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission"
+                      module="org.wildfly.extension.batch.jberet" target-name="*"/>
         </permission-set>
       </permission-sets>
       <http>
-        <http-authentication-factory name="management-http-authentication"
-                                     security-domain="ManagementDomain"
+        <http-authentication-factory name="application-http-authentication"
+                                     security-domain="ApplicationDomain"
                                      http-server-mechanism-factory="global">
           <mechanism-configuration>
-            <mechanism mechanism-name="DIGEST">
-              <mechanism-realm realm-name="ManagementRealm"/>
+            <mechanism mechanism-name="BASIC">
+              <mechanism-realm realm-name="ApplicationRealm"/>
             </mechanism>
           </mechanism-configuration>
         </http-authentication-factory>
-        <http-authentication-factory name="application-http-authentication"
-                                     security-domain="ApplicationDomain"
+        <http-authentication-factory name="management-http-authentication"
+                                     security-domain="ManagementDomain"
                                      http-server-mechanism-factory="global">
           <mechanism-configuration>
-            <mechanism mechanism-name="BASIC">
-              <mechanism-realm realm-name="ApplicationRealm"/>
+            <mechanism mechanism-name="DIGEST">
+              <mechanism-realm realm-name="ManagementRealm"/>
             </mechanism>
           </mechanism-configuration>
         </http-authentication-factory>
-        <provider-http-server-mechanism-factory name="global"/>
+         <provider-http-server-mechanism-factory name="global"/>
       </http>
       <sasl>
-        <sasl-authentication-factory name="management-sasl-authentication"
+        <sasl-authentication-factory name="application-sasl-authentication"
                                      sasl-server-factory="configured"
-                                     security-domain="ManagementDomain">
+                                     security-domain="ApplicationDomain">
           <mechanism-configuration>
             <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm realm-name="ManagementRealm"/>
+              <mechanism-realm realm-name="ApplicationRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
-        <sasl-authentication-factory name="application-sasl-authentication"
+        <sasl-authentication-factory name="management-sasl-authentication"
                                      sasl-server-factory="configured"
-                                     security-domain="ApplicationDomain">
+                                     security-domain="ManagementDomain">
           <mechanism-configuration>
             <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm realm-name="ApplicationRealm"/>
+              <mechanism-realm realm-name="ManagementRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
@@ -421,8 +458,11 @@
           <server-ssl-context name="applicationSSC" key-manager="applicationKM"/>
         </server-ssl-contexts>
       </tls>
+      <policy name="jacc">
+        <jacc-policy/>
+      </policy>
     </subsystem>
-    <subsystem xmlns="urn:wildfly:elytron-oidc-client:1.0"/>
+    <subsystem xmlns="urn:wildfly:elytron-oidc-client:2.0"/>
     <subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
     <subsystem xmlns="urn:jboss:domain:iiop-openjdk:3.0">
       <orb socket-binding="iiop"/>
@@ -430,6 +470,22 @@
       <security server-requires-ssl="false" client-requires-ssl="false"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:infinispan:14.0">
+      <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
+        <local-cache name="entity">
+          <heap-memory size="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
+        <local-cache name="local-query">
+          <heap-memory size="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
+        <local-cache name="timestamps">
+          <expiration interval="0"/>
+        </local-cache>
+        <local-cache name="pending-puts">
+          <expiration max-idle="60000"/>
+        </local-cache>
+      </cache-container>
       <cache-container name="ejb" default-cache="passivation" marshaller="PROTOSTREAM"
                        aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan">
         <local-cache name="passivation">
@@ -459,33 +515,11 @@
           <expiration interval="0"/>
         </local-cache>
       </cache-container>
-      <cache-container name="server" default-cache="default" marshaller="PROTOSTREAM"
-                       modules="org.wildfly.clustering.singleton.server">
-        <local-cache name="default">
-          <expiration interval="0"/>
-        </local-cache>
-      </cache-container>
-      <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
-        <local-cache name="entity">
-          <heap-memory size="10000"/>
-          <expiration max-idle="100000"/>
-        </local-cache>
-        <local-cache name="local-query">
-          <heap-memory size="10000"/>
-          <expiration max-idle="100000"/>
-        </local-cache>
-        <local-cache name="timestamps">
-          <expiration interval="0"/>
-        </local-cache>
-        <local-cache name="pending-puts">
-          <expiration max-idle="60000"/>
-        </local-cache>
-      </cache-container>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:io:3.0">
       <worker name="default"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:jaxrs:2.0"/>
+    <subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
     <subsystem xmlns="urn:jboss:domain:jca:6.0">
       <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
       <bean-validation enabled="true"/>
@@ -520,7 +554,7 @@
         <smtp-server outbound-socket-binding-ref="mail-smtp"/>
       </mail-session>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:messaging-activemq:14.0">
+    <subsystem xmlns="urn:jboss:domain:messaging-activemq:16.0">
       <server name="default">
         <security elytron-domain="ApplicationDomain"/>
         <statistics
@@ -564,21 +598,17 @@
                prefix="${wildfly.metrics.prefix:wildfly}"/>
     <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:2.0"/>
     <subsystem xmlns="urn:wildfly:microprofile-jwt-smallrye:1.0"/>
-    <subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:3.0" default-tracer="jaeger">
-      <jaeger-tracer name="jaeger">
-        <sampler-configuration sampler-type="const" sampler-param="1.0"/>
-      </jaeger-tracer>
-    </subsystem>
     <subsystem xmlns="urn:jboss:domain:naming:2.0">
       <remote-naming/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:remoting:5.0">
+    <subsystem xmlns="urn:jboss:domain:remoting:6.0">
+      <endpoint worker="default"/>
       <http-connector name="http-remoting-connector" connector-ref="default"
                       sasl-authentication-factory="application-sasl-authentication"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:resource-adapters:6.1"/>
+    <subsystem xmlns="urn:jboss:domain:resource-adapters:7.1"/>
     <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
     <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
       <deployment-permissions>
@@ -599,10 +629,10 @@
         statistics-enabled="${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
       <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:undertow:13.0" default-server="default-server"
-               default-virtual-host="default-host" default-servlet-container="default"
-               default-security-domain="other"
-               statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
+    <subsystem xmlns="urn:jboss:domain:undertow:14.0" default-virtual-host="default-host"
+               default-servlet-container="default" default-server="default-server"
+               statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}"
+               default-security-domain="other">
       <byte-buffer-pool name="default"/>
       <buffer-cache name="default"/>
       <server name="default-server">
diff --git a/pom.xml b/pom.xml
index ebee49362e..cc20bd5e00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
     <version.spring.mybatis>3.0.2</version.spring.mybatis>
 
     <!-- wildfly dependencies -->
-    <version.wildfly>27.0.1.Final</version.wildfly>
+    <version.wildfly>31.0.1.Final</version.wildfly>
 
     <!-- camunda dependencies -->
     <version.camunda.dmn>7.21.0</version.camunda.dmn>
diff --git a/rest/pom.xml b/rest/pom.xml
index 3bc594b48d..20fca4bd24 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,9 +21,7 @@
     <module>../web</module>
     <module>taskana-rest-spring-example-common</module>
     <module>taskana-rest-spring-example-boot</module>
-<!-- enable it, when decission is made how to proceed
     <module>taskana-rest-spring-example-wildfly</module>
-    -->
     <module>taskana-rest-spring-test-lib</module>
   </modules>
 
diff --git a/rest/taskana-rest-spring-example-wildfly/pom.xml b/rest/taskana-rest-spring-example-wildfly/pom.xml
index ca4ff1c1e5..bea54e0d89 100644
--- a/rest/taskana-rest-spring-example-wildfly/pom.xml
+++ b/rest/taskana-rest-spring-example-wildfly/pom.xml
@@ -239,25 +239,6 @@
               </resources>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-documentation-to-static-folder</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>
-                ${project.build.outputDirectory}/static/docs/rest
-              </outputDirectory>
-              <resources>
-                <resource>
-                  <directory>
-                    ../taskana-rest-spring/target/generated-docs
-                  </directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java b/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java
index 8c40897702..24b7265e96 100644
--- a/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java
+++ b/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java
@@ -78,7 +78,7 @@ protected ResponseEntity<TaskRepresentationModel> performCreateTaskRestCall() {
   protected String parseServerLog() throws Exception {
 
     // TO-DO: make log4j log into rollingFile from log4j.xml
-    File file = new File("target/wildfly-27.0.1.Final/standalone/log/server.log");
+    File file = new File("target/wildfly-31.0.1.Final/standalone/log/server.log");
 
     BufferedReader br = new BufferedReader(new FileReader(file));
 
diff --git a/rest/taskana-rest-spring-example-wildfly/src/test/resources/arquillian.xml b/rest/taskana-rest-spring-example-wildfly/src/test/resources/arquillian.xml
index 10043bef1d..40dd09b32c 100644
--- a/rest/taskana-rest-spring-example-wildfly/src/test/resources/arquillian.xml
+++ b/rest/taskana-rest-spring-example-wildfly/src/test/resources/arquillian.xml
@@ -5,7 +5,7 @@
   <defaultProtocol type="Servlet 6.0"/>
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-27.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-31.0.1.Final</property>
       <property name="serverConfig">int-test-standalone.xml</property>
 <!--            <property name="javaVmArguments">-->
 <!--              &#45;&#45;add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED-->
diff --git a/rest/taskana-rest-spring-example-wildfly/src/test/resources/int-test-standalone.xml b/rest/taskana-rest-spring-example-wildfly/src/test/resources/int-test-standalone.xml
index d0084b89f0..190a521a39 100644
--- a/rest/taskana-rest-spring-example-wildfly/src/test/resources/int-test-standalone.xml
+++ b/rest/taskana-rest-spring-example-wildfly/src/test/resources/int-test-standalone.xml
@@ -36,7 +36,6 @@
     <extension module="org.wildfly.extension.metrics"/>
     <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
     <extension module="org.wildfly.extension.microprofile.jwt-smallrye"/>
-    <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
     <extension module="org.wildfly.extension.request-controller"/>
     <extension module="org.wildfly.extension.security.manager"/>
     <extension module="org.wildfly.extension.undertow"/>
@@ -92,6 +91,9 @@
       <logger category="com.arjuna">
         <level name="WARN"/>
       </logger>
+      <logger category="com.networknt.schema">
+        <level name="WARN"/>
+      </logger>
       <logger category="io.jaegertracing.Configuration">
         <level name="WARN"/>
       </logger>
@@ -171,6 +173,7 @@
     <subsystem xmlns="urn:jboss:domain:batch-jberet:3.0">
       <default-job-repository name="in-memory"/>
       <default-thread-pool name="batch"/>
+      <security-domain name="ApplicationDomain"/>
       <job-repository name="in-memory">
         <in-memory/>
       </job-repository>
@@ -181,20 +184,17 @@
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
     <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:datasources:7.0">
+    <subsystem xmlns="urn:jboss:domain:datasources:7.1">
       <datasources>
         <datasource
           jndi-name="java:jboss/datasources/ExampleDS"
           pool-name="ExampleDS" enabled="true"
           use-java-context="true">
           <connection-url>
-            jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;
+            jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}
           </connection-url>
           <driver>h2</driver>
-          <security>
-            <user-name>sa</user-name>
-            <password>sa</password>
-          </security>
+          <security user-name="sa" password="sa"/>
         </datasource>
         <datasource jta="true"
                     jndi-name="java:jboss/datasources/TaskanaDS"
@@ -206,10 +206,7 @@
           </connection-url>
           <driver-class>org.postgresql.Driver</driver-class>
           <driver>postgresql</driver>
-          <security>
-            <user-name>postgres</user-name>
-            <password>postgres</password>
-          </security>
+          <security user-name="postgres" password="postgres"/>
           <validation>
             <background-validation>false
             </background-validation>
@@ -241,7 +238,7 @@
       <infinispan-timer-management name="transient" cache-container="ejb" cache="transient"
                                    max-active-timers="10000"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:distributable-web:3.0" default-session-management="default"
+    <subsystem xmlns="urn:jboss:domain:distributable-web:4.0" default-session-management="default"
                default-single-sign-on-management="default">
       <infinispan-session-management name="default" cache-container="web" granularity="SESSION">
         <local-affinity/>
@@ -253,8 +250,7 @@
       <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
       <concurrent>
         <context-services>
-          <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default"
-                           use-transaction-setup-provider="true"/>
+          <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" />
         </context-services>
         <managed-thread-factories>
           <managed-thread-factory name="default"
@@ -337,7 +333,7 @@
       <statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
       <log-system-exceptions value="true"/>
     </subsystem>
-    <subsystem xmlns="urn:wildfly:elytron:16.0" final-providers="combined-providers"
+    <subsystem xmlns="urn:wildfly:elytron:18.0" final-providers="combined-providers"
                disallowed-providers="OracleUcrypto">
       <providers>
         <aggregate-providers name="combined-providers">
@@ -352,16 +348,16 @@
                         format="JSON"/>
       </audit-logging>
       <security-domains>
-        <security-domain name="ManagementDomain" default-realm="ManagementRealm"
-                         permission-mapper="default-permission-mapper">
-          <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
-          <realm name="local" role-mapper="super-user-mapper"/>
-        </security-domain>
         <security-domain name="ApplicationDomain" default-realm="ApplicationRealm"
                          permission-mapper="default-permission-mapper">
           <realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
           <realm name="local"/>
         </security-domain>
+        <security-domain name="ManagementDomain" default-realm="ManagementRealm"
+                         permission-mapper="default-permission-mapper">
+          <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
+          <realm name="local" role-mapper="super-user-mapper"/>
+        </security-domain>
         <security-domain name="taskanaLdapSD"
                          default-realm="taskanaLR"
                          permission-mapper="default-permission-mapper">
@@ -422,15 +418,24 @@
           <permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
         </permission-set>
         <permission-set name="default-permissions">
-          <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission"
-                      module="org.wildfly.extension.batch.jberet" target-name="*"/>
           <permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission"
                       module="org.wildfly.transaction.client"/>
           <permission class-name="org.jboss.ejb.client.RemoteEJBPermission"
                       module="org.jboss.ejb-client"/>
+          <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission"
+                      module="org.wildfly.extension.batch.jberet" target-name="*"/>
         </permission-set>
       </permission-sets>
       <http>
+        <http-authentication-factory name="application-http-authentication"
+                                     security-domain="ApplicationDomain"
+                                     http-server-mechanism-factory="global">
+          <mechanism-configuration>
+            <mechanism mechanism-name="BASIC">
+              <mechanism-realm realm-name="ApplicationRealm"/>
+            </mechanism>
+          </mechanism-configuration>
+        </http-authentication-factory>
         <http-authentication-factory name="management-http-authentication"
                                      security-domain="ManagementDomain"
                                      http-server-mechanism-factory="global">
@@ -440,6 +445,7 @@
             </mechanism>
           </mechanism-configuration>
         </http-authentication-factory>
+        <provider-http-server-mechanism-factory name="global"/>
         <http-authentication-factory
           name="taskana-ldap-http-auth"
           security-domain="taskanaLdapSD"
@@ -451,26 +457,25 @@
             </mechanism>
           </mechanism-configuration>
         </http-authentication-factory>
-        <provider-http-server-mechanism-factory name="global"/>
       </http>
       <sasl>
-        <sasl-authentication-factory name="management-sasl-authentication"
+        <sasl-authentication-factory name="application-sasl-authentication"
                                      sasl-server-factory="configured"
-                                     security-domain="ManagementDomain">
+                                     security-domain="ApplicationDomain">
           <mechanism-configuration>
             <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm realm-name="ManagementRealm"/>
+              <mechanism-realm realm-name="ApplicationRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
-        <sasl-authentication-factory name="application-sasl-authentication"
+        <sasl-authentication-factory name="management-sasl-authentication"
                                      sasl-server-factory="configured"
-                                     security-domain="ApplicationDomain">
+                                     security-domain="ManagementDomain">
           <mechanism-configuration>
             <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm realm-name="ApplicationRealm"/>
+              <mechanism-realm realm-name="ManagementRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
@@ -514,8 +519,11 @@
           <server-ssl-context name="applicationSSC" key-manager="applicationKM"/>
         </server-ssl-contexts>
       </tls>
+      <policy name="jacc">
+        <jacc-policy/>
+      </policy>
     </subsystem>
-    <subsystem xmlns="urn:wildfly:elytron-oidc-client:1.0"/>
+    <subsystem xmlns="urn:wildfly:elytron-oidc-client:2.0"/>
     <subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
     <subsystem xmlns="urn:jboss:domain:iiop-openjdk:3.0">
       <orb socket-binding="iiop"/>
@@ -523,6 +531,22 @@
       <security server-requires-ssl="false" client-requires-ssl="false"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:infinispan:14.0">
+      <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
+        <local-cache name="entity">
+          <heap-memory size="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
+        <local-cache name="local-query">
+          <heap-memory size="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
+        <local-cache name="timestamps">
+          <expiration interval="0"/>
+        </local-cache>
+        <local-cache name="pending-puts">
+          <expiration max-idle="60000"/>
+        </local-cache>
+      </cache-container>
       <cache-container name="ejb" default-cache="passivation" marshaller="PROTOSTREAM"
                        aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan">
         <local-cache name="passivation">
@@ -552,33 +576,11 @@
           <expiration interval="0"/>
         </local-cache>
       </cache-container>
-      <cache-container name="server" default-cache="default" marshaller="PROTOSTREAM"
-                       modules="org.wildfly.clustering.singleton.server">
-        <local-cache name="default">
-          <expiration interval="0"/>
-        </local-cache>
-      </cache-container>
-      <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
-        <local-cache name="entity">
-          <heap-memory size="10000"/>
-          <expiration max-idle="100000"/>
-        </local-cache>
-        <local-cache name="local-query">
-          <heap-memory size="10000"/>
-          <expiration max-idle="100000"/>
-        </local-cache>
-        <local-cache name="timestamps">
-          <expiration interval="0"/>
-        </local-cache>
-        <local-cache name="pending-puts">
-          <expiration max-idle="60000"/>
-        </local-cache>
-      </cache-container>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:io:3.0">
       <worker name="default"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:jaxrs:2.0"/>
+    <subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
     <subsystem xmlns="urn:jboss:domain:jca:6.0">
       <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
       <bean-validation enabled="true"/>
@@ -613,7 +615,7 @@
         <smtp-server outbound-socket-binding-ref="mail-smtp"/>
       </mail-session>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:messaging-activemq:14.0">
+    <subsystem xmlns="urn:jboss:domain:messaging-activemq:16.0">
       <server name="default">
         <security elytron-domain="ApplicationDomain"/>
         <statistics
@@ -657,21 +659,17 @@
                prefix="${wildfly.metrics.prefix:wildfly}"/>
     <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:2.0"/>
     <subsystem xmlns="urn:wildfly:microprofile-jwt-smallrye:1.0"/>
-    <subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:3.0" default-tracer="jaeger">
-      <jaeger-tracer name="jaeger">
-        <sampler-configuration sampler-type="const" sampler-param="1.0"/>
-      </jaeger-tracer>
-    </subsystem>
     <subsystem xmlns="urn:jboss:domain:naming:2.0">
       <remote-naming/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:remoting:5.0">
+    <subsystem xmlns="urn:jboss:domain:remoting:6.0">
+      <endpoint worker="default"/>
       <http-connector name="http-remoting-connector" connector-ref="default"
                       sasl-authentication-factory="application-sasl-authentication"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:resource-adapters:6.1"/>
+    <subsystem xmlns="urn:jboss:domain:resource-adapters:7.1"/>
     <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
     <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
       <deployment-permissions>
@@ -692,10 +690,10 @@
         statistics-enabled="${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
       <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:undertow:13.0" default-server="default-server"
-               default-virtual-host="default-host" default-servlet-container="default"
-               default-security-domain="other"
-               statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
+    <subsystem xmlns="urn:jboss:domain:undertow:14.0" default-virtual-host="default-host"
+               default-servlet-container="default" default-server="default-server"
+               statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}"
+               default-security-domain="other">
       <byte-buffer-pool name="default"/>
       <buffer-cache name="default"/>
       <server name="default-server">
@@ -705,6 +703,7 @@
                         enable-http2="true"/>
         <host name="default-host" alias="localhost">
           <location name="/" handler="welcome-content"/>
+          <http-invoker http-authentication-factory="application-http-authentication"/>
         </host>
       </server>
       <servlet-container name="default">
@@ -714,13 +713,6 @@
       <handlers>
         <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
       </handlers>
-      <filters>
-        <response-header name="server-header"
-                         header-name="Server" header-value="WildFly/27"/>
-        <response-header
-          name="x-powered-by-header"
-          header-name="X-Powered-By" header-value="Undertow/12"/>
-      </filters>
       <application-security-domains>
         <application-security-domain
           name="taskanaApplicationDomain"