diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml
index 63ef061a8..7890d8571 100644
--- a/lib/taskana-cdi/pom.xml
+++ b/lib/taskana-cdi/pom.xml
@@ -18,7 +18,7 @@
     <dependencies>
       <dependency>
         <groupId>org.wildfly.bom</groupId>
-        <artifactId>wildfly-javaee8</artifactId>
+        <artifactId>wildfly-jakartaee8</artifactId>
         <version>${version.wildfly}</version>
         <scope>import</scope>
         <type>pom</type>
diff --git a/lib/taskana-cdi/src/test/resources/arquillian.xml b/lib/taskana-cdi/src/test/resources/arquillian.xml
index e5fd388c3..58058c614 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 3.0"/>
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-15.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-25.0.1.Final</property>
       <property
         name="serverConfig">../../../../src/test/resources/int-test-standalone.xml
       </property>
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 40c308e41..ffdf2454c 100644
--- a/lib/taskana-cdi/src/test/resources/int-test-standalone.xml
+++ b/lib/taskana-cdi/src/test/resources/int-test-standalone.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:7.0">
+<server xmlns="urn:jboss:domain:18.0">
   <extensions>
     <extension module="org.jboss.as.clustering.infinispan"/>
     <extension module="org.jboss.as.connector"/>
@@ -12,88 +12,54 @@
     <extension module="org.jboss.as.jmx"/>
     <extension module="org.jboss.as.jpa"/>
     <extension module="org.jboss.as.jsf"/>
+    <extension module="org.jboss.as.jsr77"/>
     <extension module="org.jboss.as.logging"/>
     <extension module="org.jboss.as.mail"/>
     <extension module="org.jboss.as.naming"/>
     <extension module="org.jboss.as.pojo"/>
     <extension module="org.jboss.as.remoting"/>
     <extension module="org.jboss.as.sar"/>
-    <extension module="org.jboss.as.security"/>
     <extension module="org.jboss.as.transactions"/>
     <extension module="org.jboss.as.webservices"/>
     <extension module="org.jboss.as.weld"/>
     <extension module="org.wildfly.extension.batch.jberet"/>
-    <extension
-      module="org.wildfly.extension.bean-validation"/>
-    <extension
-      module="org.wildfly.extension.core-management"/>
+    <extension module="org.wildfly.extension.bean-validation"/>
+    <extension module="org.wildfly.extension.clustering.web"/>
+    <extension module="org.wildfly.extension.core-management"/>
+    <extension module="org.wildfly.extension.discovery"/>
+    <extension module="org.wildfly.extension.ee-security"/>
     <extension module="org.wildfly.extension.elytron"/>
+    <extension module="org.wildfly.extension.elytron-oidc-client"/>
+    <extension module="org.wildfly.extension.health"/>
     <extension module="org.wildfly.extension.io"/>
-    <extension
-      module="org.wildfly.extension.request-controller"/>
-    <extension
-      module="org.wildfly.extension.security.manager"/>
+    <extension module="org.wildfly.extension.messaging-activemq"/>
+    <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"/>
+    <extension module="org.wildfly.iiop-openjdk"/>
   </extensions>
   <management>
-    <security-realms>
-      <security-realm name="ManagementRealm">
-        <authentication>
-          <properties path="mgmt-users.properties"
-                      relative-to="jboss.server.config.dir"/>
-          <local default-user="$local"
-                 skip-group-loading="true"/>
-        </authentication>
-        <authorization map-groups-to-roles="false">
-          <properties path="mgmt-groups.properties"
-                      relative-to="jboss.server.config.dir"/>
-        </authorization>
-      </security-realm>
-      <security-realm name="ApplicationRealm">
-        <server-identities>
-          <ssl>
-            <keystore path="application.keystore"
-                      relative-to="jboss.server.config.dir"
-                      keystore-password="password" alias="server"
-                      key-password="password"
-                      generate-self-signed-certificate-host="localhost"/>
-          </ssl>
-        </server-identities>
-        <authentication>
-          <properties
-            path="application-users.properties"
-            relative-to="jboss.server.config.dir"/>
-          <local default-user="$local" allowed-users="*"
-                 skip-group-loading="true"/>
-        </authentication>
-        <authorization>
-          <properties
-            path="application-roles.properties"
-            relative-to="jboss.server.config.dir"/>
-        </authorization>
-      </security-realm>
-    </security-realms>
     <audit-log>
       <formatters>
         <json-formatter name="json-formatter"/>
       </formatters>
       <handlers>
-        <file-handler name="file"
-                      formatter="json-formatter" path="audit-log.log"
+        <file-handler name="file" formatter="json-formatter" path="audit-log.log"
                       relative-to="jboss.server.data.dir"/>
       </handlers>
-      <logger log-boot="true" log-read-only="false"
-              enabled="false">
+      <logger log-boot="true" log-read-only="false" enabled="false">
         <handlers>
           <handler name="file"/>
         </handlers>
       </logger>
     </audit-log>
     <management-interfaces>
-      <http-interface
-        http-authentication-factory="management-http-authentication">
-        <http-upgrade enabled="true"
-                      sasl-authentication-factory="management-sasl-authentication"/>
+      <http-interface http-authentication-factory="management-http-authentication">
+        <http-upgrade enabled="true" sasl-authentication-factory="management-sasl-authentication"/>
         <socket-binding http="management-http"/>
       </http-interface>
     </management-interfaces>
@@ -108,86 +74,33 @@
     </access-control>
   </management>
   <profile>
-    <subsystem xmlns="urn:jboss:domain:logging:5.0">
+    <subsystem xmlns="urn:jboss:domain:logging:8.0">
       <console-handler name="CONSOLE">
-        <level name="ALL"/>
+        <level name="INFO"/>
         <formatter>
-          <named-formatter
-            name="COLOR-PATTERN"/>
+          <named-formatter name="COLOR-PATTERN"/>
         </formatter>
       </console-handler>
-      <periodic-rotating-file-handler
-        name="FILE" autoflush="true">
+      <periodic-rotating-file-handler name="FILE" autoflush="true">
         <formatter>
           <named-formatter name="PATTERN"/>
         </formatter>
-        <file relative-to="jboss.server.log.dir"
-              path="server.log"/>
+        <file relative-to="jboss.server.log.dir" path="server.log"/>
         <suffix value=".yyyy-MM-dd"/>
         <append value="true"/>
       </periodic-rotating-file-handler>
       <logger category="com.arjuna">
         <level name="WARN"/>
       </logger>
+      <logger category="io.jaegertracing.Configuration">
+        <level name="WARN"/>
+      </logger>
       <logger category="org.jboss.as.config">
-        <level name="INFO"/>
+        <level name="DEBUG"/>
       </logger>
       <logger category="sun.rmi">
         <level name="WARN"/>
       </logger>
-      <logger category="pro.taskana"
-              use-parent-handlers="true">
-        <level name="DEBUG"/>
-      </logger>
-      <logger category="org.springframework"
-              use-parent-handlers="true">
-        <level name="INFO"/>
-      </logger>
-      <logger category="org.springframework.web"
-              use-parent-handlers="true">
-        <level name="INFO"/>
-      </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>
@@ -196,17 +109,14 @@
         </handlers>
       </root-logger>
       <formatter name="PATTERN">
-        <pattern-formatter
-          pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+        <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
       </formatter>
       <formatter name="COLOR-PATTERN">
-        <pattern-formatter
-          pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+        <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
       </formatter>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:batch-jberet:2.0">
-      <default-job-repository
-        name="in-memory"/>
+      <default-job-repository name="in-memory"/>
       <default-thread-pool name="batch"/>
       <job-repository name="in-memory">
         <in-memory/>
@@ -216,439 +126,362 @@
         <keepalive-time time="30" unit="seconds"/>
       </thread-pool>
     </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:5.0">
+    <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:datasources:6.0">
       <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;
-          </connection-url>
+        <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>
         </datasource>
-        <datasource jta="true"
-                    jndi-name="java:jboss/datasources/TestDS"
+        <datasource jndi-name="java:jboss/datasources/TestDS"
                     pool-name="TASKANA H2 Datasource"
                     enabled="true"
-                    use-ccm="false"
-                    use-java-context="true">
-          <connection-url>jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;IGNORECASE=TRUE;LOCK_MODE=0
+                    use-java-context="true"
+                    statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
+          <connection-url>
+            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>
-          <validation>
-            <background-validation>false
-            </background-validation>
-          </validation>
         </datasource>
         <drivers>
           <driver name="h2" module="com.h2database.h2">
-            <xa-datasource-class>org.h2.jdbcx.JdbcDataSource
-            </xa-datasource-class>
+            <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
           </driver>
         </drivers>
       </datasources>
     </subsystem>
-    <subsystem
-      xmlns="urn:jboss:domain:deployment-scanner:2.0">
-      <deployment-scanner path="deployments"
-                          relative-to="jboss.server.base.dir" scan-interval="5000"
+    <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+      <deployment-scanner path="deployments" relative-to="jboss.server.base.dir"
+                          scan-interval="5000"
                           runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:ee:4.0">
-      <spec-descriptor-property-replacement>false
-      </spec-descriptor-property-replacement>
+    <subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:distributable-web:2.0" default-session-management="default"
+               default-single-sign-on-management="default">
+      <infinispan-session-management name="default" cache-container="web" granularity="SESSION">
+        <local-affinity/>
+      </infinispan-session-management>
+      <infinispan-single-sign-on-management name="default" cache-container="web" cache="sso"/>
+      <local-routing/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:ee:6.0">
+      <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
       <concurrent>
         <context-services>
-          <context-service name="default"
-                           jndi-name="java:jboss/ee/concurrency/context/default"
+          <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default"
                            use-transaction-setup-provider="true"/>
         </context-services>
         <managed-thread-factories>
-          <managed-thread-factory
-            name="default"
-            jndi-name="java:jboss/ee/concurrency/factory/default"
-            context-service="default"/>
+          <managed-thread-factory name="default"
+                                  jndi-name="java:jboss/ee/concurrency/factory/default"
+                                  context-service="default"/>
         </managed-thread-factories>
         <managed-executor-services>
-          <managed-executor-service
-            name="default"
-            jndi-name="java:jboss/ee/concurrency/executor/default"
-            context-service="default"
-            hung-task-threshold="60000"
-            keepalive-time="5000"/>
+          <managed-executor-service name="default"
+                                    jndi-name="java:jboss/ee/concurrency/executor/default"
+                                    context-service="default" hung-task-termination-period="0"
+                                    hung-task-threshold="60000" keepalive-time="5000"/>
         </managed-executor-services>
         <managed-scheduled-executor-services>
-          <managed-scheduled-executor-service
-            name="default"
-            jndi-name="java:jboss/ee/concurrency/scheduler/default"
-            context-service="default"
-            hung-task-threshold="60000"
-            keepalive-time="3000"/>
+          <managed-scheduled-executor-service name="default"
+                                              jndi-name="java:jboss/ee/concurrency/scheduler/default"
+                                              context-service="default"
+                                              hung-task-termination-period="0"
+                                              hung-task-threshold="60000" keepalive-time="3000"/>
         </managed-scheduled-executor-services>
       </concurrent>
-      <default-bindings
-        context-service="java:jboss/ee/concurrency/context/default"
-        datasource="java:jboss/datasources/ExampleDS"
-        managed-executor-service="java:jboss/ee/concurrency/executor/default"
-        managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default"
-        managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+      <default-bindings context-service="java:jboss/ee/concurrency/context/default"
+                        datasource="java:jboss/datasources/ExampleDS"
+                        jms-connection-factory="java:jboss/DefaultJMSConnectionFactory"
+                        managed-executor-service="java:jboss/ee/concurrency/executor/default"
+                        managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default"
+                        managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:ejb3:5.0">
+    <subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:ejb3:9.0">
       <session-bean>
         <stateless>
-          <bean-instance-pool-ref
-            pool-name="slsb-strict-max-pool"/>
+          <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
         </stateless>
-        <stateful default-access-timeout="5000"
-                  cache-ref="simple"
+        <stateful default-access-timeout="5000" cache-ref="simple"
                   passivation-disabled-cache-ref="simple"/>
         <singleton default-access-timeout="5000"/>
       </session-bean>
+      <mdb>
+        <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
+        <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+      </mdb>
       <pools>
         <bean-instance-pools>
-          <strict-max-pool
-            name="slsb-strict-max-pool"
-            derive-size="from-worker-pools"
-            instance-acquisition-timeout="5"
-            instance-acquisition-timeout-unit="MINUTES"/>
-          <strict-max-pool
-            name="mdb-strict-max-pool"
-            derive-size="from-cpu-count"
-            instance-acquisition-timeout="5"
-            instance-acquisition-timeout-unit="MINUTES"/>
+          <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count"
+                           instance-acquisition-timeout="5"
+                           instance-acquisition-timeout-unit="MINUTES"/>
+          <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools"
+                           instance-acquisition-timeout="5"
+                           instance-acquisition-timeout-unit="MINUTES"/>
         </bean-instance-pools>
       </pools>
       <caches>
         <cache name="simple"/>
-        <cache name="distributable"
-               passivation-store-ref="infinispan"
+        <cache name="distributable" passivation-store-ref="infinispan"
                aliases="passivating clustered"/>
       </caches>
       <passivation-stores>
-        <passivation-store name="infinispan"
-                           cache-container="ejb" max-size="10000"/>
+        <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
       </passivation-stores>
       <async thread-pool-name="default"/>
-      <timer-service thread-pool-name="default"
-                     default-data-store="default-file-store">
+      <timer-service thread-pool-name="default" default-data-store="default-file-store">
         <data-stores>
-          <file-data-store
-            name="default-file-store"
-            path="timer-service-data"
-            relative-to="jboss.server.data.dir"/>
+          <file-data-store name="default-file-store" path="timer-service-data"
+                           relative-to="jboss.server.data.dir"/>
         </data-stores>
       </timer-service>
-      <remote connector-ref="http-remoting-connector"
-              thread-pool-name="default">
+      <remote cluster="ejb" connectors="http-remoting-connector" thread-pool-name="default">
         <channel-creation-options>
-          <option name="READ_TIMEOUT"
-                  value="${prop.remoting-connector.read.timeout:20}"
-                  type="xnio"/>
-          <option name="MAX_OUTBOUND_MESSAGES"
-                  value="1234" type="remoting"/>
+          <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
         </channel-creation-options>
       </remote>
       <thread-pools>
         <thread-pool name="default">
           <max-threads count="10"/>
-          <keepalive-time time="100"
-                          unit="milliseconds"/>
+          <keepalive-time time="60" unit="seconds"/>
         </thread-pool>
       </thread-pools>
-      <default-security-domain
-        value="other"/>
-      <default-missing-method-permissions-deny-access
-        value="true"/>
+      <iiop enable-by-default="false" use-qualified-name="false"/>
+      <default-security-domain value="other"/>
+      <application-security-domains>
+        <application-security-domain name="other" security-domain="ApplicationDomain"/>
+      </application-security-domains>
+      <default-missing-method-permissions-deny-access value="true"/>
+      <statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
       <log-system-exceptions value="true"/>
     </subsystem>
-    <subsystem xmlns="urn:wildfly:elytron:3.0"
-               final-providers="combined-providers"
+    <subsystem xmlns="urn:wildfly:elytron:14.0" final-providers="combined-providers"
                disallowed-providers="OracleUcrypto">
       <providers>
-        <aggregate-providers
-          name="combined-providers">
+        <aggregate-providers name="combined-providers">
           <providers name="elytron"/>
           <providers name="openssl"/>
         </aggregate-providers>
-        <provider-loader name="elytron"
-                         module="org.wildfly.security.elytron"/>
-        <provider-loader name="openssl"
-                         module="org.wildfly.openssl"/>
+        <provider-loader name="elytron" module="org.wildfly.security.elytron"/>
+        <provider-loader name="openssl" module="org.wildfly.openssl"/>
       </providers>
       <audit-logging>
-        <file-audit-log name="local-audit"
-                        path="audit.log" relative-to="jboss.server.log.dir"
+        <file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir"
                         format="JSON"/>
       </audit-logging>
       <security-domains>
-        <security-domain
-          name="ApplicationDomain"
-          default-realm="ApplicationRealm"
-          permission-mapper="default-permission-mapper">
-          <realm name="ApplicationRealm"
-                 role-decoder="groups-to-roles"/>
+        <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">
-          <realm name="taskanaLR"
-                 role-decoder="from-roles-attribute"/>
-        </security-domain>
       </security-domains>
       <security-realms>
-        <identity-realm name="local"
-                        identity="$local"/>
-        <properties-realm
-          name="ApplicationRealm">
-          <users-properties
-            path="application-users.properties"
-            relative-to="jboss.server.config.dir"
-            digest-realm-name="ApplicationRealm"/>
-          <groups-properties
-            path="application-roles.properties"
-            relative-to="jboss.server.config.dir"/>
+        <identity-realm name="local" identity="$local"/>
+        <properties-realm name="ApplicationRealm">
+          <users-properties path="application-users.properties"
+                            relative-to="jboss.server.config.dir"
+                            digest-realm-name="ApplicationRealm"/>
+          <groups-properties path="application-roles.properties"
+                             relative-to="jboss.server.config.dir"/>
         </properties-realm>
-        <properties-realm
-          name="ManagementRealm">
-          <users-properties
-            path="mgmt-users.properties"
-            relative-to="jboss.server.config.dir"
-            digest-realm-name="ManagementRealm"/>
-          <groups-properties
-            path="mgmt-groups.properties"
-            relative-to="jboss.server.config.dir"/>
+        <properties-realm name="ManagementRealm">
+          <users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"
+                            digest-realm-name="ManagementRealm"/>
+          <groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
         </properties-realm>
-        <ldap-realm name="taskanaLR"
-                    dir-context="taskanaDC">
-          <identity-mapping
-            rdn-identifier="uid"
-            use-recursive-search="false"
-            search-base-dn="cn=users,ou=Test,O=TASKANA">
-            <attribute-mapping>
-              <attribute to="Roles"
-                         filter="(&amp;(objectClass=groupofuniquenames)(uniquemember={1}))"
-                         filter-base-dn="ou=Test,O=TASKANA"/>
-            </attribute-mapping>
-            <user-password-mapper
-              from="userPassword"/>
-          </identity-mapping>
-        </ldap-realm>
       </security-realms>
       <mappers>
-        <simple-permission-mapper
-          name="default-permission-mapper"
-          mapping-mode="first">
+        <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
           <permission-mapping>
             <principal name="anonymous"/>
-            <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-set name="default-permissions"/>
           </permission-mapping>
-          <permission-mapping
-            match-all="true">
-            <permission
-              class-name="org.wildfly.security.auth.permission.LoginPermission"/>
-            <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-mapping match-all="true">
+            <permission-set name="login-permission"/>
+            <permission-set name="default-permissions"/>
           </permission-mapping>
         </simple-permission-mapper>
-        <constant-realm-mapper
-          name="local" realm-name="local"/>
-        <simple-role-decoder
-          name="groups-to-roles" attribute="groups"/>
-        <simple-role-decoder
-          name="from-roles-attribute" attribute="Roles"/>
-        <constant-role-mapper
-          name="super-user-mapper">
+        <constant-realm-mapper name="local" realm-name="local"/>
+        <simple-role-decoder name="groups-to-roles" attribute="groups"/>
+        <constant-role-mapper name="super-user-mapper">
           <role name="SuperUser"/>
         </constant-role-mapper>
-        <constant-role-mapper
-          name="user-mapper">
-          <role name="user"/>
-        </constant-role-mapper>
       </mappers>
+      <permission-sets>
+        <permission-set name="login-permission">
+          <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-set>
+      </permission-sets>
       <http>
-        <http-authentication-factory
-          name="management-http-authentication"
-          security-domain="ManagementDomain"
-          http-server-mechanism-factory="global">
+        <http-authentication-factory name="management-http-authentication"
+                                     security-domain="ManagementDomain"
+                                     http-server-mechanism-factory="global">
           <mechanism-configuration>
             <mechanism mechanism-name="DIGEST">
-              <mechanism-realm
-                realm-name="ManagementRealm"/>
+              <mechanism-realm realm-name="ManagementRealm"/>
             </mechanism>
           </mechanism-configuration>
         </http-authentication-factory>
-        <http-authentication-factory
-          name="taskana-ldap-http-auth"
-          security-domain="taskanaLdapSD"
-          http-server-mechanism-factory="global">
+        <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="taskanaApplicationDomain"/>
+              <mechanism-realm realm-name="ApplicationRealm"/>
             </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-server-factory="configured"
-          security-domain="ManagementDomain">
+        <sasl-authentication-factory name="management-sasl-authentication"
+                                     sasl-server-factory="configured"
+                                     security-domain="ManagementDomain">
           <mechanism-configuration>
-            <mechanism
-              mechanism-name="JBOSS-LOCAL-USER"
-              realm-mapper="local"/>
+            <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm
-                realm-name="ManagementRealm"/>
+              <mechanism-realm realm-name="ManagementRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
-        <sasl-authentication-factory
-          name="application-sasl-authentication"
-          sasl-server-factory="configured"
-          security-domain="ApplicationDomain">
+        <sasl-authentication-factory name="application-sasl-authentication"
+                                     sasl-server-factory="configured"
+                                     security-domain="ApplicationDomain">
           <mechanism-configuration>
-            <mechanism
-              mechanism-name="JBOSS-LOCAL-USER"
-              realm-mapper="local"/>
+            <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm
-                realm-name="ApplicationRealm"/>
+              <mechanism-realm realm-name="ApplicationRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
-        <configurable-sasl-server-factory
-          name="configured" sasl-server-factory="elytron">
+        <configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
           <properties>
-            <property
-              name="wildfly.sasl.local-user.default-user"
-              value="$local"/>
+            <property name="wildfly.sasl.local-user.default-user" value="$local"/>
+            <property name="wildfly.sasl.local-user.challenge-path"
+                      value="${jboss.server.temp.dir}/auth"/>
           </properties>
         </configurable-sasl-server-factory>
-        <mechanism-provider-filtering-sasl-server-factory
-          name="elytron" sasl-server-factory="global">
+        <mechanism-provider-filtering-sasl-server-factory name="elytron"
+                                                          sasl-server-factory="global">
           <filters>
             <filter provider-name="WildFlyElytron"/>
           </filters>
         </mechanism-provider-filtering-sasl-server-factory>
-        <provider-sasl-server-factory
-          name="global"/>
+        <provider-sasl-server-factory name="global"/>
       </sasl>
-      <dir-contexts>
-        <dir-context name="taskanaDC"
-                     url="ldap://127.0.0.1:10389" principal="uid=admin">
-          <credential-reference
-            clear-text="secret"/>
-        </dir-context>
-      </dir-contexts>
+      <tls>
+        <key-stores>
+          <key-store name="applicationKS">
+            <credential-reference clear-text="password"/>
+            <implementation type="JKS"/>
+            <file path="application.keystore" relative-to="jboss.server.config.dir"/>
+          </key-store>
+        </key-stores>
+        <key-managers>
+          <key-manager name="applicationKM" key-store="applicationKS"
+                       generate-self-signed-certificate-host="localhost">
+            <credential-reference clear-text="password"/>
+          </key-manager>
+        </key-managers>
+        <server-ssl-contexts>
+          <server-ssl-context name="applicationSSC" key-manager="applicationKM"/>
+        </server-ssl-contexts>
+      </tls>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:infinispan:6.0">
-      <cache-container name="server"
-                       default-cache="default"
-                       module="org.wildfly.clustering.server">
+    <subsystem xmlns="urn:wildfly:elytron-oidc-client:1.0"/>
+    <subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
+    <subsystem xmlns="urn:jboss:domain:iiop-openjdk:2.1">
+      <orb socket-binding="iiop"/>
+      <initializers security="elytron" transactions="spec"/>
+      <security server-requires-ssl="false" client-requires-ssl="false"/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:infinispan:13.0">
+      <cache-container name="ejb" default-cache="passivation" marshaller="PROTOSTREAM"
+                       aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan">
+        <local-cache name="passivation">
+          <expiration interval="0"/>
+          <file-store passivation="true" purge="false"/>
+        </local-cache>
+      </cache-container>
+      <cache-container name="web" default-cache="passivation" marshaller="PROTOSTREAM"
+                       modules="org.wildfly.clustering.web.infinispan">
+        <local-cache name="passivation">
+          <expiration interval="0"/>
+          <file-store passivation="true" purge="false"/>
+        </local-cache>
+        <local-cache name="sso">
+          <expiration interval="0"/>
+        </local-cache>
+      </cache-container>
+      <cache-container name="server" default-cache="default" marshaller="PROTOSTREAM"
+                       modules="org.wildfly.clustering.server">
         <local-cache name="default">
-          <transaction mode="BATCH"/>
+          <expiration interval="0"/>
         </local-cache>
       </cache-container>
-      <cache-container name="web"
-                       default-cache="passivation"
-                       module="org.wildfly.clustering.web.infinispan">
-        <local-cache name="passivation">
-          <locking isolation="REPEATABLE_READ"/>
-          <transaction mode="BATCH"/>
-          <file-store passivation="true"
-                      purge="false"/>
-        </local-cache>
-      </cache-container>
-      <cache-container name="ejb" aliases="sfsb"
-                       default-cache="passivation"
-                       module="org.wildfly.clustering.ejb.infinispan">
-        <local-cache name="passivation">
-          <locking isolation="REPEATABLE_READ"/>
-          <transaction mode="BATCH"/>
-          <file-store passivation="true"
-                      purge="false"/>
-        </local-cache>
-      </cache-container>
-      <cache-container name="hibernate"
-                       module="org.hibernate.infinispan">
+      <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
         <local-cache name="entity">
-          <transaction mode="NON_XA"/>
-          <object-memory size="10000"/>
+          <heap-memory size="10000"/>
           <expiration max-idle="100000"/>
         </local-cache>
         <local-cache name="local-query">
-          <object-memory size="10000"/>
+          <heap-memory size="10000"/>
           <expiration max-idle="100000"/>
         </local-cache>
-        <local-cache name="timestamps"/>
+        <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"/>
       <buffer-pool name="default"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:jaxrs:2.0"/>
     <subsystem xmlns="urn:jboss:domain:jca:5.0">
-      <archive-validation enabled="true"
-                          fail-on-error="true" fail-on-warn="false"/>
+      <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
       <bean-validation enabled="true"/>
       <default-workmanager>
         <short-running-threads>
           <core-threads count="50"/>
           <queue-length count="50"/>
           <max-threads count="50"/>
-          <keepalive-time time="10"
-                          unit="seconds"/>
+          <keepalive-time time="10" unit="seconds"/>
         </short-running-threads>
         <long-running-threads>
           <core-threads count="50"/>
           <queue-length count="50"/>
           <max-threads count="50"/>
-          <keepalive-time time="10"
-                          unit="seconds"/>
+          <keepalive-time time="10" unit="seconds"/>
         </long-running-threads>
       </default-workmanager>
       <cached-connection-manager/>
@@ -660,102 +493,107 @@
       <remoting-connector/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jpa:1.1">
-      <jpa default-datasource=""
-           default-extended-persistence-inheritance="DEEP"/>
+      <jpa default-extended-persistence-inheritance="DEEP"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
-    <subsystem xmlns="urn:jboss:domain:mail:3.0">
-      <mail-session name="default"
-                    jndi-name="java:jboss/mail/Default">
-        <smtp-server
-          outbound-socket-binding-ref="mail-smtp"/>
+    <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:mail:4.0">
+      <mail-session name="default" jndi-name="java:jboss/mail/Default">
+        <smtp-server outbound-socket-binding-ref="mail-smtp"/>
       </mail-session>
     </subsystem>
+    <subsystem xmlns="urn:jboss:domain:messaging-activemq:13.0">
+      <server name="default">
+        <security elytron-domain="ApplicationDomain"/>
+        <statistics
+          enabled="${wildfly.messaging-activemq.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
+        <security-setting name="#">
+          <role name="guest" send="true" consume="true" create-non-durable-queue="true"
+                delete-non-durable-queue="true"/>
+        </security-setting>
+        <address-setting name="#" dead-letter-address="jms.queue.DLQ"
+                         expiry-address="jms.queue.ExpiryQueue" max-size-bytes="10485760"
+                         page-size-bytes="2097152" message-counter-history-day-limit="10"/>
+        <http-connector name="http-connector" socket-binding="http" endpoint="http-acceptor"/>
+        <http-connector name="http-connector-throughput" socket-binding="http"
+                        endpoint="http-acceptor-throughput">
+          <param name="batch-delay" value="50"/>
+        </http-connector>
+        <in-vm-connector name="in-vm" server-id="0">
+          <param name="buffer-pooling" value="false"/>
+        </in-vm-connector>
+        <http-acceptor name="http-acceptor" http-listener="default"/>
+        <http-acceptor name="http-acceptor-throughput" http-listener="default">
+          <param name="batch-delay" value="50"/>
+          <param name="direct-deliver" value="false"/>
+        </http-acceptor>
+        <in-vm-acceptor name="in-vm" server-id="0">
+          <param name="buffer-pooling" value="false"/>
+        </in-vm-acceptor>
+        <jms-queue name="ExpiryQueue" entries="java:/jms/queue/ExpiryQueue"/>
+        <jms-queue name="DLQ" entries="java:/jms/queue/DLQ"/>
+        <connection-factory name="InVmConnectionFactory" entries="java:/ConnectionFactory"
+                            connectors="in-vm"/>
+        <connection-factory name="RemoteConnectionFactory"
+                            entries="java:jboss/exported/jms/RemoteConnectionFactory"
+                            connectors="http-connector"/>
+        <pooled-connection-factory name="activemq-ra"
+                                   entries="java:/JmsXA java:jboss/DefaultJMSConnectionFactory"
+                                   connectors="in-vm" transaction="xa"/>
+      </server>
+    </subsystem>
+    <subsystem xmlns="urn:wildfly:metrics:1.0" security-enabled="false" exposed-subsystems="*"
+               prefix="${wildfly.metrics.prefix:wildfly}"/>
+    <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.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:4.0">
-      <http-connector
-        name="http-remoting-connector" connector-ref="default"
-        security-realm="ApplicationRealm"/>
+      <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:5.0"/>
+    <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:resource-adapters:6.0"/>
     <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:security:2.0">
-      <security-domains>
-        <security-domain name="other"
-                         cache-type="default">
-          <authentication>
-            <login-module code="Remoting"
-                          flag="optional">
-              <module-option
-                name="password-stacking"
-                value="useFirstPass"/>
-            </login-module>
-            <login-module code="RealmDirect"
-                          flag="required">
-              <module-option
-                name="password-stacking"
-                value="useFirstPass"/>
-            </login-module>
-          </authentication>
-        </security-domain>
-        <security-domain name="jboss-web-policy"
-                         cache-type="default">
-          <authorization>
-            <policy-module code="Delegating"
-                           flag="required"/>
-          </authorization>
-        </security-domain>
-        <security-domain name="jboss-ejb-policy" cache-type="default">
-          <authorization>
-            <policy-module code="Delegating" flag="required"/>
-          </authorization>
-        </security-domain>
-      </security-domains>
-    </subsystem>
-    <subsystem
-      xmlns="urn:jboss:domain:security-manager:1.0">
+    <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
       <deployment-permissions>
         <maximum-set>
-          <permission
-            class="java.security.AllPermission"/>
+          <permission class="java.security.AllPermission"/>
         </maximum-set>
       </deployment-permissions>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:transactions:4.0">
-      <core-environment>
+    <subsystem xmlns="urn:jboss:domain:transactions:6.0">
+      <core-environment node-identifier="${jboss.tx.node.id:1}">
         <process-id>
           <uuid/>
         </process-id>
       </core-environment>
-      <recovery-environment
-        socket-binding="txn-recovery-environment"
-        status-socket-binding="txn-status-manager"/>
-      <object-store path="tx-object-store"
-                    relative-to="jboss.server.data.dir"/>
+      <recovery-environment socket-binding="txn-recovery-environment"
+                            status-socket-binding="txn-status-manager"/>
+      <coordinator-environment
+        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:6.0">
+    <subsystem xmlns="urn:jboss:domain:undertow:12.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}}">
       <buffer-cache name="default"/>
       <server name="default-server">
-        <http-listener name="default"
-                       socket-binding="http" redirect-socket="https"
+        <http-listener name="default" socket-binding="http" redirect-socket="https"
                        enable-http2="true"/>
-        <https-listener name="https"
-                        socket-binding="https"
-                        security-realm="ApplicationRealm"
+        <https-listener name="https" socket-binding="https" ssl-context="applicationSSC"
                         enable-http2="true"/>
         <host name="default-host" alias="localhost">
-          <location name="/"
-                    handler="welcome-content"/>
-          <filter-ref name="server-header"/>
-          <filter-ref name="x-powered-by-header"/>
-          <http-invoker
-            security-realm="ApplicationRealm"/>
+          <location name="/" handler="welcome-content"/>
+          <http-invoker http-authentication-factory="application-http-authentication"/>
         </host>
       </server>
       <servlet-container name="default">
@@ -763,31 +601,19 @@
         <websockets/>
       </servlet-container>
       <handlers>
-        <file name="welcome-content"
-              path="${jboss.home.dir}/welcome-content"/>
+        <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
       </handlers>
-      <filters>
-        <response-header name="server-header"
-                         header-name="Server" header-value="WildFly/11"/>
-        <response-header
-          name="x-powered-by-header"
-          header-name="X-Powered-By" header-value="Undertow/1"/>
-      </filters>
       <application-security-domains>
-        <application-security-domain
-          name="taskanaApplicationDomain"
-          http-authentication-factory="taskana-ldap-http-auth"/>
+        <application-security-domain name="other" security-domain="ApplicationDomain"/>
       </application-security-domains>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:webservices:2.0">
+    <subsystem xmlns="urn:jboss:domain:webservices:2.0"
+               statistics-enabled="${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}}">
       <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
-      <endpoint-config
-        name="Standard-Endpoint-Config"/>
-      <endpoint-config
-        name="Recording-Endpoint-Config">
-        <pre-handler-chain
-          name="recording-handlers"
-          protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+      <endpoint-config name="Standard-Endpoint-Config"/>
+      <endpoint-config name="Recording-Endpoint-Config">
+        <pre-handler-chain name="recording-handlers"
+                           protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
           <handler name="RecordingHandler"
                    class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
         </pre-handler-chain>
@@ -798,37 +624,31 @@
   </profile>
   <interfaces>
     <interface name="management">
-      <inet-address
-        value="${jboss.bind.address.management:127.0.0.1}"/>
+      <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
     </interface>
     <interface name="public">
-      <inet-address
-        value="${jboss.bind.address:127.0.0.1}"/>
+      <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+    </interface>
+    <interface name="unsecure">
+      <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
     </interface>
   </interfaces>
-  <socket-binding-group name="standard-sockets"
-                        default-interface="public"
+  <socket-binding-group name="standard-sockets" default-interface="public"
                         port-offset="${jboss.socket.binding.port-offset:0}">
-    <socket-binding name="management-http"
-                    interface="management"
+    <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+    <socket-binding name="http" port="${jboss.http.port:8080}"/>
+    <socket-binding name="https" port="${jboss.https.port:8443}"/>
+    <socket-binding name="iiop" interface="unsecure" port="3528"/>
+    <socket-binding name="iiop-ssl" interface="unsecure" port="3529"/>
+    <socket-binding name="management-http" interface="management"
                     port="${jboss.management.http.port:9990}"/>
-    <socket-binding name="management-https"
-                    interface="management"
+    <socket-binding name="management-https" interface="management"
                     port="${jboss.management.https.port:9993}"/>
-    <socket-binding name="ajp"
-                    port="${jboss.ajp.port:8009}"/>
-    <socket-binding name="http"
-                    port="${jboss.http.port:8080}"/>
-    <socket-binding name="https"
-                    port="${jboss.https.port:8443}"/>
-    <socket-binding name="txn-recovery-environment"
-                    port="4712"/>
-    <socket-binding name="txn-status-manager"
-                    port="4713"/>
-    <outbound-socket-binding
-      name="mail-smtp">
-      <remote-destination host="localhost"
-                          port="25"/>
+    <socket-binding name="txn-recovery-environment" port="4712"/>
+    <socket-binding name="txn-status-manager" port="4713"/>
+    <outbound-socket-binding name="mail-smtp">
+      <remote-destination host="${jboss.mail.server.host:localhost}"
+                          port="${jboss.mail.server.port:25}"/>
     </outbound-socket-binding>
   </socket-binding-group>
 </server>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f186a8df2..ffa09be61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
     <version.spring.mybatis>2.1.1</version.spring.mybatis>
 
     <!-- wildfly dependencies -->
-    <version.wildfly>15.0.1.Final</version.wildfly>
+    <version.wildfly>25.0.1.Final</version.wildfly>
 
     <!-- camunda dependencies -->
     <version.camunda.dmn>7.19.0</version.camunda.dmn>
diff --git a/rest/taskana-rest-spring-example-wildfly/pom.xml b/rest/taskana-rest-spring-example-wildfly/pom.xml
index 81d2b999c..c0903746a 100644
--- a/rest/taskana-rest-spring-example-wildfly/pom.xml
+++ b/rest/taskana-rest-spring-example-wildfly/pom.xml
@@ -19,7 +19,7 @@
     <dependencies>
       <dependency>
         <groupId>org.wildfly.bom</groupId>
-        <artifactId>wildfly-javaee8</artifactId>
+        <artifactId>wildfly-jakartaee8</artifactId>
         <version>${version.wildfly}</version>
         <scope>import</scope>
         <type>pom</type>
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 e72d3b8b4..89d72a1d6 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
@@ -77,7 +77,7 @@ public class AbstractAccTest {
   protected String parseServerLog() throws Exception {
 
     // TO-DO: make log4j log into rollingFile from log4j.xml
-    File file = new File("target/wildfly-15.0.1.Final/standalone/log/server.log");
+    File file = new File("target/wildfly-25.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 76d1ab1a3..a87272190 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 3.0"/>
   <container qualifier="jboss" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-15.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-25.0.1.Final</property>
       <property
         name="serverConfig">../../../../src/test/resources/int-test-standalone.xml
       </property>
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 fda4f7542..51f4d47c4 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
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:7.0">
+<server xmlns="urn:jboss:domain:18.0">
   <extensions>
     <extension module="org.jboss.as.clustering.infinispan"/>
     <extension module="org.jboss.as.connector"/>
@@ -12,88 +12,54 @@
     <extension module="org.jboss.as.jmx"/>
     <extension module="org.jboss.as.jpa"/>
     <extension module="org.jboss.as.jsf"/>
+    <extension module="org.jboss.as.jsr77"/>
     <extension module="org.jboss.as.logging"/>
     <extension module="org.jboss.as.mail"/>
     <extension module="org.jboss.as.naming"/>
     <extension module="org.jboss.as.pojo"/>
     <extension module="org.jboss.as.remoting"/>
     <extension module="org.jboss.as.sar"/>
-    <extension module="org.jboss.as.security"/>
     <extension module="org.jboss.as.transactions"/>
     <extension module="org.jboss.as.webservices"/>
     <extension module="org.jboss.as.weld"/>
     <extension module="org.wildfly.extension.batch.jberet"/>
-    <extension
-      module="org.wildfly.extension.bean-validation"/>
-    <extension
-      module="org.wildfly.extension.core-management"/>
+    <extension module="org.wildfly.extension.bean-validation"/>
+    <extension module="org.wildfly.extension.clustering.web"/>
+    <extension module="org.wildfly.extension.core-management"/>
+    <extension module="org.wildfly.extension.discovery"/>
+    <extension module="org.wildfly.extension.ee-security"/>
     <extension module="org.wildfly.extension.elytron"/>
+    <extension module="org.wildfly.extension.elytron-oidc-client"/>
+    <extension module="org.wildfly.extension.health"/>
     <extension module="org.wildfly.extension.io"/>
-    <extension
-      module="org.wildfly.extension.request-controller"/>
-    <extension
-      module="org.wildfly.extension.security.manager"/>
+    <extension module="org.wildfly.extension.messaging-activemq"/>
+    <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"/>
+    <extension module="org.wildfly.iiop-openjdk"/>
   </extensions>
   <management>
-    <security-realms>
-      <security-realm name="ManagementRealm">
-        <authentication>
-          <properties path="mgmt-users.properties"
-                      relative-to="jboss.server.config.dir"/>
-          <local default-user="$local"
-                 skip-group-loading="true"/>
-        </authentication>
-        <authorization map-groups-to-roles="false">
-          <properties path="mgmt-groups.properties"
-                      relative-to="jboss.server.config.dir"/>
-        </authorization>
-      </security-realm>
-      <security-realm name="ApplicationRealm">
-        <server-identities>
-          <ssl>
-            <keystore path="application.keystore"
-                      relative-to="jboss.server.config.dir"
-                      keystore-password="password" alias="server"
-                      key-password="password"
-                      generate-self-signed-certificate-host="localhost"/>
-          </ssl>
-        </server-identities>
-        <authentication>
-          <properties
-            path="application-users.properties"
-            relative-to="jboss.server.config.dir"/>
-          <local default-user="$local" allowed-users="*"
-                 skip-group-loading="true"/>
-        </authentication>
-        <authorization>
-          <properties
-            path="application-roles.properties"
-            relative-to="jboss.server.config.dir"/>
-        </authorization>
-      </security-realm>
-    </security-realms>
     <audit-log>
       <formatters>
         <json-formatter name="json-formatter"/>
       </formatters>
       <handlers>
-        <file-handler name="file"
-                      formatter="json-formatter" path="audit-log.log"
+        <file-handler name="file" formatter="json-formatter" path="audit-log.log"
                       relative-to="jboss.server.data.dir"/>
       </handlers>
-      <logger log-boot="true" log-read-only="false"
-              enabled="false">
+      <logger log-boot="true" log-read-only="false" enabled="false">
         <handlers>
           <handler name="file"/>
         </handlers>
       </logger>
     </audit-log>
     <management-interfaces>
-      <http-interface
-        http-authentication-factory="management-http-authentication">
-        <http-upgrade enabled="true"
-                      sasl-authentication-factory="management-sasl-authentication"/>
+      <http-interface http-authentication-factory="management-http-authentication">
+        <http-upgrade enabled="true" sasl-authentication-factory="management-sasl-authentication"/>
         <socket-binding http="management-http"/>
       </http-interface>
     </management-interfaces>
@@ -108,29 +74,29 @@
     </access-control>
   </management>
   <profile>
-    <subsystem xmlns="urn:jboss:domain:logging:5.0">
+    <subsystem xmlns="urn:jboss:domain:logging:8.0">
       <console-handler name="CONSOLE">
-        <level name="ALL"/>
+        <level name="INFO"/>
         <formatter>
-          <named-formatter
-            name="COLOR-PATTERN"/>
+          <named-formatter name="COLOR-PATTERN"/>
         </formatter>
       </console-handler>
-      <periodic-rotating-file-handler
-        name="FILE" autoflush="true">
+      <periodic-rotating-file-handler name="FILE" autoflush="true">
         <formatter>
           <named-formatter name="PATTERN"/>
         </formatter>
-        <file relative-to="jboss.server.log.dir"
-              path="server.log"/>
+        <file relative-to="jboss.server.log.dir" path="server.log"/>
         <suffix value=".yyyy-MM-dd"/>
         <append value="true"/>
       </periodic-rotating-file-handler>
       <logger category="com.arjuna">
         <level name="WARN"/>
       </logger>
+      <logger category="io.jaegertracing.Configuration">
+        <level name="WARN"/>
+      </logger>
       <logger category="org.jboss.as.config">
-        <level name="INFO"/>
+        <level name="DEBUG"/>
       </logger>
       <logger category="sun.rmi">
         <level name="WARN"/>
@@ -196,17 +162,14 @@
         </handlers>
       </root-logger>
       <formatter name="PATTERN">
-        <pattern-formatter
-          pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+        <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
       </formatter>
       <formatter name="COLOR-PATTERN">
-        <pattern-formatter
-          pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+        <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
       </formatter>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:batch-jberet:2.0">
-      <default-job-repository
-        name="in-memory"/>
+      <default-job-repository name="in-memory"/>
       <default-thread-pool name="batch"/>
       <job-repository name="in-memory">
         <in-memory/>
@@ -216,11 +179,9 @@
         <keepalive-time time="30" unit="seconds"/>
       </thread-pool>
     </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:5.0">
+    <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:datasources:6.0">
       <datasources>
         <datasource
           jndi-name="java:jboss/datasources/ExampleDS"
@@ -266,154 +227,136 @@
         </drivers>
       </datasources>
     </subsystem>
-    <subsystem
-      xmlns="urn:jboss:domain:deployment-scanner:2.0">
-      <deployment-scanner path="deployments"
-                          relative-to="jboss.server.base.dir" scan-interval="5000"
+    <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+      <deployment-scanner path="deployments" relative-to="jboss.server.base.dir"
+                          scan-interval="5000"
                           runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:ee:4.0">
-      <spec-descriptor-property-replacement>false
-      </spec-descriptor-property-replacement>
+    <subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:distributable-web:2.0" default-session-management="default"
+               default-single-sign-on-management="default">
+      <infinispan-session-management name="default" cache-container="web" granularity="SESSION">
+        <local-affinity/>
+      </infinispan-session-management>
+      <infinispan-single-sign-on-management name="default" cache-container="web" cache="sso"/>
+      <local-routing/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:ee:6.0">
+      <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
       <concurrent>
         <context-services>
-          <context-service name="default"
-                           jndi-name="java:jboss/ee/concurrency/context/default"
+          <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default"
                            use-transaction-setup-provider="true"/>
         </context-services>
         <managed-thread-factories>
-          <managed-thread-factory
-            name="default"
-            jndi-name="java:jboss/ee/concurrency/factory/default"
-            context-service="default"/>
+          <managed-thread-factory name="default"
+                                  jndi-name="java:jboss/ee/concurrency/factory/default"
+                                  context-service="default"/>
         </managed-thread-factories>
         <managed-executor-services>
-          <managed-executor-service
-            name="default"
-            jndi-name="java:jboss/ee/concurrency/executor/default"
-            context-service="default"
-            hung-task-threshold="60000"
-            keepalive-time="5000"/>
+          <managed-executor-service name="default"
+                                    jndi-name="java:jboss/ee/concurrency/executor/default"
+                                    context-service="default" hung-task-termination-period="0"
+                                    hung-task-threshold="60000" keepalive-time="5000"/>
         </managed-executor-services>
         <managed-scheduled-executor-services>
-          <managed-scheduled-executor-service
-            name="default"
-            jndi-name="java:jboss/ee/concurrency/scheduler/default"
-            context-service="default"
-            hung-task-threshold="60000"
-            keepalive-time="3000"/>
+          <managed-scheduled-executor-service name="default"
+                                              jndi-name="java:jboss/ee/concurrency/scheduler/default"
+                                              context-service="default"
+                                              hung-task-termination-period="0"
+                                              hung-task-threshold="60000" keepalive-time="3000"/>
         </managed-scheduled-executor-services>
       </concurrent>
-      <default-bindings
-        context-service="java:jboss/ee/concurrency/context/default"
-        datasource="java:jboss/datasources/ExampleDS"
-        managed-executor-service="java:jboss/ee/concurrency/executor/default"
-        managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default"
-        managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+      <default-bindings context-service="java:jboss/ee/concurrency/context/default"
+                        datasource="java:jboss/datasources/ExampleDS"
+                        jms-connection-factory="java:jboss/DefaultJMSConnectionFactory"
+                        managed-executor-service="java:jboss/ee/concurrency/executor/default"
+                        managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default"
+                        managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:ejb3:5.0">
+    <subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:ejb3:9.0">
       <session-bean>
         <stateless>
-          <bean-instance-pool-ref
-            pool-name="slsb-strict-max-pool"/>
+          <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
         </stateless>
-        <stateful default-access-timeout="5000"
-                  cache-ref="simple"
+        <stateful default-access-timeout="5000" cache-ref="simple"
                   passivation-disabled-cache-ref="simple"/>
         <singleton default-access-timeout="5000"/>
       </session-bean>
+      <mdb>
+        <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
+        <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+      </mdb>
       <pools>
         <bean-instance-pools>
-          <strict-max-pool
-            name="slsb-strict-max-pool"
-            derive-size="from-worker-pools"
-            instance-acquisition-timeout="5"
-            instance-acquisition-timeout-unit="MINUTES"/>
-          <strict-max-pool
-            name="mdb-strict-max-pool"
-            derive-size="from-cpu-count"
-            instance-acquisition-timeout="5"
-            instance-acquisition-timeout-unit="MINUTES"/>
+          <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count"
+                           instance-acquisition-timeout="5"
+                           instance-acquisition-timeout-unit="MINUTES"/>
+          <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools"
+                           instance-acquisition-timeout="5"
+                           instance-acquisition-timeout-unit="MINUTES"/>
         </bean-instance-pools>
       </pools>
       <caches>
         <cache name="simple"/>
-        <cache name="distributable"
-               passivation-store-ref="infinispan"
+        <cache name="distributable" passivation-store-ref="infinispan"
                aliases="passivating clustered"/>
       </caches>
       <passivation-stores>
-        <passivation-store name="infinispan"
-                           cache-container="ejb" max-size="10000"/>
+        <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
       </passivation-stores>
       <async thread-pool-name="default"/>
-      <timer-service thread-pool-name="default"
-                     default-data-store="default-file-store">
+      <timer-service thread-pool-name="default" default-data-store="default-file-store">
         <data-stores>
-          <file-data-store
-            name="default-file-store"
-            path="timer-service-data"
-            relative-to="jboss.server.data.dir"/>
+          <file-data-store name="default-file-store" path="timer-service-data"
+                           relative-to="jboss.server.data.dir"/>
         </data-stores>
       </timer-service>
-      <remote connector-ref="http-remoting-connector"
-              thread-pool-name="default">
+      <remote cluster="ejb" connectors="http-remoting-connector" thread-pool-name="default">
         <channel-creation-options>
-          <option name="READ_TIMEOUT"
-                  value="${prop.remoting-connector.read.timeout:20}"
-                  type="xnio"/>
-          <option name="MAX_OUTBOUND_MESSAGES"
-                  value="1234" type="remoting"/>
+          <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
         </channel-creation-options>
       </remote>
       <thread-pools>
         <thread-pool name="default">
           <max-threads count="10"/>
-          <keepalive-time time="100"
-                          unit="milliseconds"/>
+          <keepalive-time time="60" unit="seconds"/>
         </thread-pool>
       </thread-pools>
-      <default-security-domain
-        value="other"/>
-      <default-missing-method-permissions-deny-access
-        value="true"/>
+      <iiop enable-by-default="false" use-qualified-name="false"/>
+      <default-security-domain value="other"/>
+      <application-security-domains>
+        <application-security-domain name="other" security-domain="ApplicationDomain"/>
+      </application-security-domains>
+      <default-missing-method-permissions-deny-access value="true"/>
+      <statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
       <log-system-exceptions value="true"/>
     </subsystem>
-    <subsystem xmlns="urn:wildfly:elytron:3.0"
-               final-providers="combined-providers"
+    <subsystem xmlns="urn:wildfly:elytron:14.0" final-providers="combined-providers"
                disallowed-providers="OracleUcrypto">
       <providers>
-        <aggregate-providers
-          name="combined-providers">
+        <aggregate-providers name="combined-providers">
           <providers name="elytron"/>
           <providers name="openssl"/>
         </aggregate-providers>
-        <provider-loader name="elytron"
-                         module="org.wildfly.security.elytron"/>
-        <provider-loader name="openssl"
-                         module="org.wildfly.openssl"/>
+        <provider-loader name="elytron" module="org.wildfly.security.elytron"/>
+        <provider-loader name="openssl" module="org.wildfly.openssl"/>
       </providers>
       <audit-logging>
-        <file-audit-log name="local-audit"
-                        path="audit.log" relative-to="jboss.server.log.dir"
+        <file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir"
                         format="JSON"/>
       </audit-logging>
       <security-domains>
-        <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"
+        <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"/>
+          <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="taskanaLdapSD"
                          default-realm="taskanaLR"
@@ -423,27 +366,18 @@
         </security-domain>
       </security-domains>
       <security-realms>
-        <identity-realm name="local"
-                        identity="$local"/>
-        <properties-realm
-          name="ApplicationRealm">
-          <users-properties
-            path="application-users.properties"
-            relative-to="jboss.server.config.dir"
-            digest-realm-name="ApplicationRealm"/>
-          <groups-properties
-            path="application-roles.properties"
-            relative-to="jboss.server.config.dir"/>
+        <identity-realm name="local" identity="$local"/>
+        <properties-realm name="ApplicationRealm">
+          <users-properties path="application-users.properties"
+                            relative-to="jboss.server.config.dir"
+                            digest-realm-name="ApplicationRealm"/>
+          <groups-properties path="application-roles.properties"
+                             relative-to="jboss.server.config.dir"/>
         </properties-realm>
-        <properties-realm
-          name="ManagementRealm">
-          <users-properties
-            path="mgmt-users.properties"
-            relative-to="jboss.server.config.dir"
-            digest-realm-name="ManagementRealm"/>
-          <groups-properties
-            path="mgmt-groups.properties"
-            relative-to="jboss.server.config.dir"/>
+        <properties-realm name="ManagementRealm">
+          <users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"
+                            digest-realm-name="ManagementRealm"/>
+          <groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
         </properties-realm>
         <ldap-realm name="taskanaLR"
                     dir-context="taskanaDC">
@@ -462,62 +396,43 @@
         </ldap-realm>
       </security-realms>
       <mappers>
-        <simple-permission-mapper
-          name="default-permission-mapper"
-          mapping-mode="first">
+        <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
           <permission-mapping>
             <principal name="anonymous"/>
-            <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-set name="default-permissions"/>
           </permission-mapping>
-          <permission-mapping
-            match-all="true">
-            <permission
-              class-name="org.wildfly.security.auth.permission.LoginPermission"/>
-            <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-mapping match-all="true">
+            <permission-set name="login-permission"/>
+            <permission-set name="default-permissions"/>
           </permission-mapping>
         </simple-permission-mapper>
-        <constant-realm-mapper
-          name="local" realm-name="local"/>
-        <simple-role-decoder
-          name="groups-to-roles" attribute="groups"/>
-        <simple-role-decoder
-          name="from-roles-attribute" attribute="Roles"/>
-        <constant-role-mapper
-          name="super-user-mapper">
+        <constant-realm-mapper name="local" realm-name="local"/>
+        <simple-role-decoder name="groups-to-roles" attribute="groups"/>
+        <simple-role-decoder name="from-roles-attribute" attribute="Roles"/>
+        <constant-role-mapper name="super-user-mapper">
           <role name="SuperUser"/>
         </constant-role-mapper>
-        <constant-role-mapper
-          name="user-mapper">
-          <role name="user"/>
-        </constant-role-mapper>
       </mappers>
+      <permission-sets>
+        <permission-set name="login-permission">
+          <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-set>
+      </permission-sets>
       <http>
-        <http-authentication-factory
-          name="management-http-authentication"
-          security-domain="ManagementDomain"
-          http-server-mechanism-factory="global">
+        <http-authentication-factory name="management-http-authentication"
+                                     security-domain="ManagementDomain"
+                                     http-server-mechanism-factory="global">
           <mechanism-configuration>
             <mechanism mechanism-name="DIGEST">
-              <mechanism-realm
-                realm-name="ManagementRealm"/>
+              <mechanism-realm realm-name="ManagementRealm"/>
             </mechanism>
           </mechanism-configuration>
         </http-authentication-factory>
@@ -532,54 +447,43 @@
             </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-server-factory="configured"
-          security-domain="ManagementDomain">
+        <sasl-authentication-factory name="management-sasl-authentication"
+                                     sasl-server-factory="configured"
+                                     security-domain="ManagementDomain">
           <mechanism-configuration>
-            <mechanism
-              mechanism-name="JBOSS-LOCAL-USER"
-              realm-mapper="local"/>
+            <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm
-                realm-name="ManagementRealm"/>
+              <mechanism-realm realm-name="ManagementRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
-        <sasl-authentication-factory
-          name="application-sasl-authentication"
-          sasl-server-factory="configured"
-          security-domain="ApplicationDomain">
+        <sasl-authentication-factory name="application-sasl-authentication"
+                                     sasl-server-factory="configured"
+                                     security-domain="ApplicationDomain">
           <mechanism-configuration>
-            <mechanism
-              mechanism-name="JBOSS-LOCAL-USER"
-              realm-mapper="local"/>
+            <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
             <mechanism mechanism-name="DIGEST-MD5">
-              <mechanism-realm
-                realm-name="ApplicationRealm"/>
+              <mechanism-realm realm-name="ApplicationRealm"/>
             </mechanism>
           </mechanism-configuration>
         </sasl-authentication-factory>
-        <configurable-sasl-server-factory
-          name="configured" sasl-server-factory="elytron">
+        <configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
           <properties>
-            <property
-              name="wildfly.sasl.local-user.default-user"
-              value="$local"/>
+            <property name="wildfly.sasl.local-user.default-user" value="$local"/>
+            <property name="wildfly.sasl.local-user.challenge-path"
+                      value="${jboss.server.temp.dir}/auth"/>
           </properties>
         </configurable-sasl-server-factory>
-        <mechanism-provider-filtering-sasl-server-factory
-          name="elytron" sasl-server-factory="global">
+        <mechanism-provider-filtering-sasl-server-factory name="elytron"
+                                                          sasl-server-factory="global">
           <filters>
             <filter provider-name="WildFlyElytron"/>
           </filters>
         </mechanism-provider-filtering-sasl-server-factory>
-        <provider-sasl-server-factory
-          name="global"/>
+        <provider-sasl-server-factory name="global"/>
       </sasl>
       <dir-contexts>
         <dir-context name="taskanaDC"
@@ -588,72 +492,93 @@
             clear-text="secret"/>
         </dir-context>
       </dir-contexts>
+      <tls>
+        <key-stores>
+          <key-store name="applicationKS">
+            <credential-reference clear-text="password"/>
+            <implementation type="JKS"/>
+            <file path="application.keystore" relative-to="jboss.server.config.dir"/>
+          </key-store>
+        </key-stores>
+        <key-managers>
+          <key-manager name="applicationKM" key-store="applicationKS"
+                       generate-self-signed-certificate-host="localhost">
+            <credential-reference clear-text="password"/>
+          </key-manager>
+        </key-managers>
+        <server-ssl-contexts>
+          <server-ssl-context name="applicationSSC" key-manager="applicationKM"/>
+        </server-ssl-contexts>
+      </tls>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:infinispan:6.0">
-      <cache-container name="server"
-                       default-cache="default"
-                       module="org.wildfly.clustering.server">
+    <subsystem xmlns="urn:wildfly:elytron-oidc-client:1.0"/>
+    <subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
+    <subsystem xmlns="urn:jboss:domain:iiop-openjdk:2.1">
+      <orb socket-binding="iiop"/>
+      <initializers security="elytron" transactions="spec"/>
+      <security server-requires-ssl="false" client-requires-ssl="false"/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:infinispan:13.0">
+      <cache-container name="ejb" default-cache="passivation" marshaller="PROTOSTREAM"
+                       aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan">
+        <local-cache name="passivation">
+          <expiration interval="0"/>
+          <file-store passivation="true" purge="false"/>
+        </local-cache>
+      </cache-container>
+      <cache-container name="web" default-cache="passivation" marshaller="PROTOSTREAM"
+                       modules="org.wildfly.clustering.web.infinispan">
+        <local-cache name="passivation">
+          <expiration interval="0"/>
+          <file-store passivation="true" purge="false"/>
+        </local-cache>
+        <local-cache name="sso">
+          <expiration interval="0"/>
+        </local-cache>
+      </cache-container>
+      <cache-container name="server" default-cache="default" marshaller="PROTOSTREAM"
+                       modules="org.wildfly.clustering.server">
         <local-cache name="default">
-          <transaction mode="BATCH"/>
+          <expiration interval="0"/>
         </local-cache>
       </cache-container>
-      <cache-container name="web"
-                       default-cache="passivation"
-                       module="org.wildfly.clustering.web.infinispan">
-        <local-cache name="passivation">
-          <locking isolation="REPEATABLE_READ"/>
-          <transaction mode="BATCH"/>
-          <file-store passivation="true"
-                      purge="false"/>
-        </local-cache>
-      </cache-container>
-      <cache-container name="ejb" aliases="sfsb"
-                       default-cache="passivation"
-                       module="org.wildfly.clustering.ejb.infinispan">
-        <local-cache name="passivation">
-          <locking isolation="REPEATABLE_READ"/>
-          <transaction mode="BATCH"/>
-          <file-store passivation="true"
-                      purge="false"/>
-        </local-cache>
-      </cache-container>
-      <cache-container name="hibernate"
-                       module="org.hibernate.infinispan">
+      <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
         <local-cache name="entity">
-          <transaction mode="NON_XA"/>
-          <object-memory size="10000"/>
+          <heap-memory size="10000"/>
           <expiration max-idle="100000"/>
         </local-cache>
         <local-cache name="local-query">
-          <object-memory size="10000"/>
+          <heap-memory size="10000"/>
           <expiration max-idle="100000"/>
         </local-cache>
-        <local-cache name="timestamps"/>
+        <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"/>
       <buffer-pool name="default"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:jaxrs:2.0"/>
     <subsystem xmlns="urn:jboss:domain:jca:5.0">
-      <archive-validation enabled="true"
-                          fail-on-error="true" fail-on-warn="false"/>
+      <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
       <bean-validation enabled="true"/>
       <default-workmanager>
         <short-running-threads>
           <core-threads count="50"/>
           <queue-length count="50"/>
           <max-threads count="50"/>
-          <keepalive-time time="10"
-                          unit="seconds"/>
+          <keepalive-time time="10" unit="seconds"/>
         </short-running-threads>
         <long-running-threads>
           <core-threads count="50"/>
           <queue-length count="50"/>
           <max-threads count="50"/>
-          <keepalive-time time="10"
-                          unit="seconds"/>
+          <keepalive-time time="10" unit="seconds"/>
         </long-running-threads>
       </default-workmanager>
       <cached-connection-manager/>
@@ -665,97 +590,107 @@
       <remoting-connector/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jpa:1.1">
-      <jpa default-datasource=""
-           default-extended-persistence-inheritance="DEEP"/>
+      <jpa default-extended-persistence-inheritance="DEEP"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
-    <subsystem xmlns="urn:jboss:domain:mail:3.0">
-      <mail-session name="default"
-                    jndi-name="java:jboss/mail/Default">
-        <smtp-server
-          outbound-socket-binding-ref="mail-smtp"/>
+    <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:mail:4.0">
+      <mail-session name="default" jndi-name="java:jboss/mail/Default">
+        <smtp-server outbound-socket-binding-ref="mail-smtp"/>
       </mail-session>
     </subsystem>
+    <subsystem xmlns="urn:jboss:domain:messaging-activemq:13.0">
+      <server name="default">
+        <security elytron-domain="ApplicationDomain"/>
+        <statistics
+          enabled="${wildfly.messaging-activemq.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
+        <security-setting name="#">
+          <role name="guest" send="true" consume="true" create-non-durable-queue="true"
+                delete-non-durable-queue="true"/>
+        </security-setting>
+        <address-setting name="#" dead-letter-address="jms.queue.DLQ"
+                         expiry-address="jms.queue.ExpiryQueue" max-size-bytes="10485760"
+                         page-size-bytes="2097152" message-counter-history-day-limit="10"/>
+        <http-connector name="http-connector" socket-binding="http" endpoint="http-acceptor"/>
+        <http-connector name="http-connector-throughput" socket-binding="http"
+                        endpoint="http-acceptor-throughput">
+          <param name="batch-delay" value="50"/>
+        </http-connector>
+        <in-vm-connector name="in-vm" server-id="0">
+          <param name="buffer-pooling" value="false"/>
+        </in-vm-connector>
+        <http-acceptor name="http-acceptor" http-listener="default"/>
+        <http-acceptor name="http-acceptor-throughput" http-listener="default">
+          <param name="batch-delay" value="50"/>
+          <param name="direct-deliver" value="false"/>
+        </http-acceptor>
+        <in-vm-acceptor name="in-vm" server-id="0">
+          <param name="buffer-pooling" value="false"/>
+        </in-vm-acceptor>
+        <jms-queue name="ExpiryQueue" entries="java:/jms/queue/ExpiryQueue"/>
+        <jms-queue name="DLQ" entries="java:/jms/queue/DLQ"/>
+        <connection-factory name="InVmConnectionFactory" entries="java:/ConnectionFactory"
+                            connectors="in-vm"/>
+        <connection-factory name="RemoteConnectionFactory"
+                            entries="java:jboss/exported/jms/RemoteConnectionFactory"
+                            connectors="http-connector"/>
+        <pooled-connection-factory name="activemq-ra"
+                                   entries="java:/JmsXA java:jboss/DefaultJMSConnectionFactory"
+                                   connectors="in-vm" transaction="xa"/>
+      </server>
+    </subsystem>
+    <subsystem xmlns="urn:wildfly:metrics:1.0" security-enabled="false" exposed-subsystems="*"
+               prefix="${wildfly.metrics.prefix:wildfly}"/>
+    <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.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:4.0">
-      <http-connector
-        name="http-remoting-connector" connector-ref="default"
-        security-realm="ApplicationRealm"/>
+      <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:5.0"/>
+    <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:resource-adapters:6.0"/>
     <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
-    <subsystem xmlns="urn:jboss:domain:security:2.0">
-      <security-domains>
-        <security-domain name="other"
-                         cache-type="default">
-          <authentication>
-            <login-module code="Remoting"
-                          flag="optional">
-              <module-option
-                name="password-stacking"
-                value="useFirstPass"/>
-            </login-module>
-            <login-module code="RealmDirect"
-                          flag="required">
-              <module-option
-                name="password-stacking"
-                value="useFirstPass"/>
-            </login-module>
-          </authentication>
-        </security-domain>
-        <security-domain name="jboss-web-policy"
-                         cache-type="default">
-          <authorization>
-            <policy-module code="Delegating"
-                           flag="required"/>
-          </authorization>
-        </security-domain>
-      </security-domains>
-    </subsystem>
-    <subsystem
-      xmlns="urn:jboss:domain:security-manager:1.0">
+    <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
       <deployment-permissions>
         <maximum-set>
-          <permission
-            class="java.security.AllPermission"/>
+          <permission class="java.security.AllPermission"/>
         </maximum-set>
       </deployment-permissions>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:transactions:4.0">
-      <core-environment>
+    <subsystem xmlns="urn:jboss:domain:transactions:6.0">
+      <core-environment node-identifier="${jboss.tx.node.id:1}">
         <process-id>
           <uuid/>
         </process-id>
       </core-environment>
-      <recovery-environment
-        socket-binding="txn-recovery-environment"
-        status-socket-binding="txn-status-manager"/>
-      <object-store path="tx-object-store"
-                    relative-to="jboss.server.data.dir"/>
+      <recovery-environment socket-binding="txn-recovery-environment"
+                            status-socket-binding="txn-status-manager"/>
+      <coordinator-environment
+        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:6.0">
+    <subsystem xmlns="urn:jboss:domain:undertow:12.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}}">
       <buffer-cache name="default"/>
       <server name="default-server">
-        <http-listener name="default"
-                       socket-binding="http" redirect-socket="https"
+        <http-listener name="default" socket-binding="http" redirect-socket="https"
                        enable-http2="true"/>
-        <https-listener name="https"
-                        socket-binding="https"
-                        security-realm="ApplicationRealm"
+        <https-listener name="https" socket-binding="https" ssl-context="applicationSSC"
                         enable-http2="true"/>
         <host name="default-host" alias="localhost">
-          <location name="/"
-                    handler="welcome-content"/>
-          <filter-ref name="server-header"/>
-          <filter-ref name="x-powered-by-header"/>
-          <http-invoker
-            security-realm="ApplicationRealm"/>
+          <location name="/" handler="welcome-content"/>
+          <http-invoker security-realm="ApplicationRealm"/>
         </host>
       </server>
       <servlet-container name="default">
@@ -763,31 +698,21 @@
         <websockets/>
       </servlet-container>
       <handlers>
-        <file name="welcome-content"
-              path="${jboss.home.dir}/welcome-content"/>
+        <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
       </handlers>
-      <filters>
-        <response-header name="server-header"
-                         header-name="Server" header-value="WildFly/11"/>
-        <response-header
-          name="x-powered-by-header"
-          header-name="X-Powered-By" header-value="Undertow/1"/>
-      </filters>
       <application-security-domains>
         <application-security-domain
           name="taskanaApplicationDomain"
           http-authentication-factory="taskana-ldap-http-auth"/>
       </application-security-domains>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:webservices:2.0">
+    <subsystem xmlns="urn:jboss:domain:webservices:2.0"
+               statistics-enabled="${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}}">
       <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
-      <endpoint-config
-        name="Standard-Endpoint-Config"/>
-      <endpoint-config
-        name="Recording-Endpoint-Config">
-        <pre-handler-chain
-          name="recording-handlers"
-          protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+      <endpoint-config name="Standard-Endpoint-Config"/>
+      <endpoint-config name="Recording-Endpoint-Config">
+        <pre-handler-chain name="recording-handlers"
+                           protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
           <handler name="RecordingHandler"
                    class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
         </pre-handler-chain>
@@ -798,37 +723,31 @@
   </profile>
   <interfaces>
     <interface name="management">
-      <inet-address
-        value="${jboss.bind.address.management:127.0.0.1}"/>
+      <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
     </interface>
     <interface name="public">
-      <inet-address
-        value="${jboss.bind.address:127.0.0.1}"/>
+      <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+    </interface>
+    <interface name="unsecure">
+      <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
     </interface>
   </interfaces>
-  <socket-binding-group name="standard-sockets"
-                        default-interface="public"
+  <socket-binding-group name="standard-sockets" default-interface="public"
                         port-offset="${jboss.socket.binding.port-offset:0}">
-    <socket-binding name="management-http"
-                    interface="management"
+    <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+    <socket-binding name="http" port="${jboss.http.port:8080}"/>
+    <socket-binding name="https" port="${jboss.https.port:8443}"/>
+    <socket-binding name="iiop" interface="unsecure" port="3528"/>
+    <socket-binding name="iiop-ssl" interface="unsecure" port="3529"/>
+    <socket-binding name="management-http" interface="management"
                     port="${jboss.management.http.port:9990}"/>
-    <socket-binding name="management-https"
-                    interface="management"
+    <socket-binding name="management-https" interface="management"
                     port="${jboss.management.https.port:9993}"/>
-    <socket-binding name="ajp"
-                    port="${jboss.ajp.port:8009}"/>
-    <socket-binding name="http"
-                    port="${jboss.http.port:8080}"/>
-    <socket-binding name="https"
-                    port="${jboss.https.port:8443}"/>
-    <socket-binding name="txn-recovery-environment"
-                    port="4712"/>
-    <socket-binding name="txn-status-manager"
-                    port="4713"/>
-    <outbound-socket-binding
-      name="mail-smtp">
-      <remote-destination host="localhost"
-                          port="25"/>
+    <socket-binding name="txn-recovery-environment" port="4712"/>
+    <socket-binding name="txn-status-manager" port="4713"/>
+    <outbound-socket-binding name="mail-smtp">
+      <remote-destination host="${jboss.mail.server.host:localhost}"
+                          port="${jboss.mail.server.port:25}"/>
     </outbound-socket-binding>
   </socket-binding-group>
 </server>
\ No newline at end of file