diff --git a/Dockerfile b/Dockerfile
index cfe7cf7..2452550 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,11 @@
-FROM jboss/wildfly:20.0.1.Final
+FROM jboss/wildfly:22.0.1.Final
 
 LABEL description="Imixs-Muluk"
 LABEL maintainer="ralph.soika@imixs.com"
 
 
+# Setup configuration
+COPY ./docker/configuration/wildfly/* /opt/jboss/wildfly/standalone/configuration/
+
 # Deploy artefact
 ADD ./target/*.war /opt/jboss/wildfly/standalone/deployments/
diff --git a/Dockerfile-Dev b/Dockerfile-Dev
index 564b730..221d676 100644
--- a/Dockerfile-Dev
+++ b/Dockerfile-Dev
@@ -1,8 +1,10 @@
-FROM jboss/wildfly:20.0.1.Final
+FROM jboss/wildfly:22.0.1.Final
 
 LABEL description="Imixs-Muluk"
 LABEL maintainer="ralph.soika@imixs.com"
 
+# Setup configuration
+COPY ./docker/configuration/wildfly/* /opt/jboss/wildfly/standalone/configuration/
 
 # Deploy artefact
 ADD ./target/*.war /opt/jboss/wildfly/standalone/deployments/
diff --git a/README.md b/README.md
index 95db00f..fc1f4e9 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,15 @@ Muluk is a super simple WebService Monitor. Muluk watches your web services and
 
 # How to Start
 
-Muluk is hosted on Docker-Hub. So you simply need Docker to run Muluk as a Web Service on any kind of server within you private network or in the itnernet. 
+Muluk is hosted on Docker-Hub. So you simply need Docker to run Muluk as a Web Service on any kind of server within you private network or in the Internet. 
 
- 
+	$ docker run \
+	  -e TZ="CET" \
+	  -e LANG="en_US.UTF-8" \
+	  -v $PWD/config.xml:/opt/jboss/config.xml \
+	  -p "8080:8080" \
+	  imixs/muluk:latest
 
-    docker run....
 
 ## The Configuration
 
@@ -21,7 +25,13 @@ All you need is a configuration file defining the targets to monitor.
 
 
     <muluk-dev>
-    
+		<cluster name="local-dev">
+			<node>
+				<target>http://localhost:8080</target>
+				<auth type="BASIC" user="admin" password="adminadmin" />
+			</node>
+		</cluster>
+		
        <mail>
          <smtp>...</smtp>
        </mail>
@@ -31,7 +41,6 @@ All you need is a configuration file defining the targets to monitor.
 				<target>https://www.imixs.org</target>
 				<pattern>Imixs-Workflow supports the BPMN 2.0 standard</pattern>
 			</object>
-		
 			<object type="web">
 				<target>https://foo.com/</target>
 				<pattern>my-data</pattern>
@@ -45,7 +54,20 @@ All you need is a configuration file defining the targets to monitor.
     </muluk-def>
 
 
+### Security
 
+The Web interface is protected with a BASIC authentication security realm. You can use the default user 'admin' with the default password 'adminadmin'.
+
+To change the user/password you simply need to create/edit the files '*muluk-users.properties*' and '*muluk-roles.properties*' and map these files into your docker container.
+
+	$ docker run \
+	  -e TZ="CET" \
+	  -e LANG="en_US.UTF-8" \
+	  -v $PWD/config.xml:/opt/jboss/config.xml \
+	  -v $PWD/muluk-users.properties:/opt/jboss/wildfly/standalone/configuration/muluk-users.properties \
+	  -v $PWD/muluk-roles.properties:/opt/jboss/wildfly/standalone/configuration/muluk-roles.properties \
+	  -p "8080:8080" \
+	  imixs/muluk:latest
 
 ## Kubernetes
 
@@ -74,7 +96,6 @@ to start the container run:
 	$ docker run \
 	  -e TZ="CET" \
 	  -e LANG="en_US.UTF-8" \
-	  -e MULUK_CONFIG_FILE="/opt/jboss/wildfly/config.xml" \
 	  -v $PWD/docker/configuration/config.xml:/opt/jboss/wildfly/config.xml \
 	  -p "8080:8080" \
 	  imixs/muluk:latest
@@ -93,7 +114,6 @@ to start the container in dev mode run:
 	$ docker run \
 	  -e TZ="CET" \
 	  -e LANG="en_US.UTF-8" \
-	  -e MULUK_CONFIG_FILE="/opt/jboss/wildfly/config.xml" \
 	  -v $PWD/docker/deployments:/opt/jboss/wildfly/standalone/deployments/ \
 	  -v $PWD/docker/configuration/config.xml:/opt/jboss/wildfly/config.xml \
 	  -p "8080:8080" \
diff --git a/config.xml b/config.xml
new file mode 100644
index 0000000..db132fc
--- /dev/null
+++ b/config.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	
+	
+	<cluster name="local-dev">
+		<node>
+			<target>http://localhost:8080</target>
+			<auth type="BASIC" user="admin" password="adminadmin" />
+		</node>
+	</cluster>
+	
+	<!-- 
+		The Mail Configuration is used to send out mails. Define your login data for your SMPT mail sever here.
+	 -->
+	 <!-- Enable this section to receive E-Mail notifications
+	<mail host="mail.foo.com" port="465" user="your-user" password="your-password" from="info@foo.com">
+		<recipients>info@foo.com</recipients>
+	</mail>
+	 -->
+	
+	<monitor>
+		<object type="web" interval="35">
+			<target>https://www.imixs.org</target>
+			<pattern>Imixs-Workflow supports the BPMN 2.0 standard</pattern>
+		</object>
+		<object type="web" interval="55">
+			<target>https://manik.imixs.org/</target>
+			<pattern>Manik Hot-Deploy</pattern>
+		</object>
+	</monitor>
+</config>
diff --git a/doc/resources/screen-01.png b/doc/resources/screen-01.png
index 7a5556e..a4e7ad1 100644
Binary files a/doc/resources/screen-01.png and b/doc/resources/screen-01.png differ
diff --git a/docker/configuration/wildfly/muluk-roles.properties b/docker/configuration/wildfly/muluk-roles.properties
new file mode 100644
index 0000000..1d777c2
--- /dev/null
+++ b/docker/configuration/wildfly/muluk-roles.properties
@@ -0,0 +1 @@
+admin=org.imixs.ACCESSLEVEL.READERACCESS
diff --git a/docker/configuration/wildfly/muluk-users.properties b/docker/configuration/wildfly/muluk-users.properties
new file mode 100644
index 0000000..27a3faf
--- /dev/null
+++ b/docker/configuration/wildfly/muluk-users.properties
@@ -0,0 +1,2 @@
+# Username = Password
+admin=adminadmin
diff --git a/docker/configuration/wildfly/sampleapp-roles.properties b/docker/configuration/wildfly/sampleapp-roles.properties
deleted file mode 100644
index 9686787..0000000
--- a/docker/configuration/wildfly/sampleapp-roles.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-admin=org.imixs.ACCESSLEVEL.MANAGERACCESS
-manfred=org.imixs.ACCESSLEVEL.MANAGERACCESS
-anna=org.imixs.ACCESSLEVEL.AUTHORACCESS
-alex=org.imixs.ACCESSLEVEL.MANAGERACCESS
-marty=org.imixs.ACCESSLEVEL.AUTHORACCESS
-melman=org.imixs.ACCESSLEVEL.AUTHORACCESS
-gloria=org.imixs.ACCESSLEVEL.AUTHORACCESS
-skipper=org.imixs.ACCESSLEVEL.AUTHORACCESS
-kowalski=org.imixs.ACCESSLEVEL.AUTHORACCESS
-private=org.imixs.ACCESSLEVEL.AUTHORACCESS
-rico=org.imixs.ACCESSLEVEL.AUTHORACCESS
\ No newline at end of file
diff --git a/docker/configuration/wildfly/sampleapp-users.properties b/docker/configuration/wildfly/sampleapp-users.properties
deleted file mode 100644
index 56edf64..0000000
--- a/docker/configuration/wildfly/sampleapp-users.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-admin=adminadmin
-manfred=password
-anna=password
-marty=password
-alex=password
-melman=password
-gloria=password
-skipper=password
-kowalski=password
-private=password
-rico=password
\ No newline at end of file
diff --git a/docker/configuration/wildfly/standalone-wildfly24-origin.xml b/docker/configuration/wildfly/standalone-origin.xml
similarity index 87%
rename from docker/configuration/wildfly/standalone-wildfly24-origin.xml
rename to docker/configuration/wildfly/standalone-origin.xml
index 4bed9e9..4bcd1e1 100644
--- a/docker/configuration/wildfly/standalone-wildfly24-origin.xml
+++ b/docker/configuration/wildfly/standalone-origin.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:17.0">
+<server xmlns="urn:jboss:domain:13.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.connector"/>
@@ -18,6 +18,7 @@
         <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"/>
@@ -28,11 +29,11 @@
         <extension module="org.wildfly.extension.discovery"/>
         <extension module="org.wildfly.extension.ee-security"/>
         <extension module="org.wildfly.extension.elytron"/>
-        <extension module="org.wildfly.extension.health"/>
         <extension module="org.wildfly.extension.io"/>
-        <extension module="org.wildfly.extension.metrics"/>
         <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
         <extension module="org.wildfly.extension.microprofile.jwt-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.metrics-smallrye"/>
         <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
         <extension module="org.wildfly.extension.request-controller"/>
         <extension module="org.wildfly.extension.security.manager"/>
@@ -171,12 +172,12 @@
         <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/>
+                <primary-owner-affinity/>
             </infinispan-session-management>
             <infinispan-single-sign-on-management name="default" cache-container="web" cache="sso"/>
-            <local-routing/>
+            <infinispan-routing cache-container="web" cache="routing"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:6.0">
+        <subsystem xmlns="urn:jboss:domain:ee:5.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <concurrent>
                 <context-services>
@@ -186,16 +187,16 @@
                     <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-termination-period="0" 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-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-termination-period="0" 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-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"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:ejb3:9.0">
+        <subsystem xmlns="urn:jboss:domain:ejb3:7.0">
             <session-bean>
                 <stateless>
                     <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
@@ -222,7 +223,7 @@
                     <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
                 </data-stores>
             </timer-service>
-            <remote cluster="ejb" connectors="http-remoting-connector" thread-pool-name="default">
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default">
                 <channel-creation-options>
                     <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
                 </channel-creation-options>
@@ -234,14 +235,11 @@
                 </thread-pool>
             </thread-pools>
             <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:14.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
+        <subsystem xmlns="urn:wildfly:elytron:10.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
             <providers>
                 <aggregate-providers name="combined-providers">
                     <providers name="elytron"/>
@@ -340,53 +338,33 @@
                 </mechanism-provider-filtering-sasl-server-factory>
                 <provider-sasl-server-factory name="global"/>
             </sasl>
-            <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:wildfly:health:1.0" security-enabled="false"/>
-        <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">
+        <subsystem xmlns="urn:jboss:domain:infinispan:10.0">
+            <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
                 <local-cache name="passivation">
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
+                <local-cache name="sso"/>
+                <local-cache name="routing"/>
+            </cache-container>
+            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
+                <local-cache name="default"/>
             </cache-container>
-            <cache-container name="web" default-cache="passivation" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.web.infinispan">
+            <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
                 <local-cache name="passivation">
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
-                <local-cache name="sso"/>
             </cache-container>
-            <cache-container name="server" default-cache="default" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.server">
-                <local-cache name="default"/>
-            </cache-container>
-            <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
+            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
                 <local-cache name="entity">
-                    <heap-memory size="10000"/>
+                    <object-memory size="10000"/>
                     <expiration max-idle="100000"/>
                 </local-cache>
                 <local-cache name="local-query">
-                    <heap-memory size="10000"/>
+                    <object-memory size="10000"/>
                     <expiration max-idle="100000"/>
                 </local-cache>
                 <local-cache name="timestamps"/>
-                <local-cache name="pending-puts">
-                    <expiration max-idle="60000"/>
-                </local-cache>
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:io:3.0">
@@ -420,7 +398,7 @@
             <remoting-connector/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jpa:1.1">
-            <jpa default-extended-persistence-inheritance="DEEP"/>
+            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
         <subsystem xmlns="urn:jboss:domain:mail:4.0">
@@ -428,10 +406,11 @@
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>
             </mail-session>
         </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-health-smallrye:2.0" security-enabled="false" empty-liveness-checks-status="${env.MP_HEALTH_EMPTY_LIVENESS_CHECKS_STATUS:UP}" empty-readiness-checks-status="${env.MP_HEALTH_EMPTY_READINESS_CHECKS_STATUS:UP}"/>
         <subsystem xmlns="urn:wildfly:microprofile-jwt-smallrye:1.0"/>
-        <subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:3.0" default-tracer="jaeger">
+        <subsystem xmlns="urn:wildfly:microprofile-metrics-smallrye:2.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:wildfly}"/>
+        <subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:2.0" default-tracer="jaeger">
             <jaeger-tracer name="jaeger">
                 <sampler-configuration sampler-type="const" sampler-param="1.0"/>
             </jaeger-tracer>
@@ -446,6 +425,38 @@
         <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="jaspitest" cache-type="default">
+                    <authentication-jaspi>
+                        <login-module-stack name="dummy">
+                            <login-module code="Dummy" flag="optional"/>
+                        </login-module-stack>
+                        <auth-module code="Dummy"/>
+                    </authentication-jaspi>
+                </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">
             <deployment-permissions>
                 <maximum-set>
@@ -453,7 +464,7 @@
                 </maximum-set>
             </deployment-permissions>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:transactions:6.0">
+        <subsystem xmlns="urn:jboss:domain:transactions:5.0">
             <core-environment node-identifier="${jboss.tx.node.id:1}">
                 <process-id>
                     <uuid/>
@@ -463,7 +474,7 @@
             <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: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}}">
+        <subsystem xmlns="urn:jboss:domain:undertow:11.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" enable-http2="true"/>
@@ -480,9 +491,6 @@
             <handlers>
                 <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
             </handlers>
-            <application-security-domains>
-                <application-security-domain name="other" security-domain="ApplicationDomain"/>
-            </application-security-domains>
         </subsystem>
         <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>
@@ -513,7 +521,7 @@
         <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}"/>
+            <remote-destination host="localhost" port="25"/>
         </outbound-socket-binding>
     </socket-binding-group>
 </server>
\ No newline at end of file
diff --git a/docker/configuration/wildfly/standalone.xml b/docker/configuration/wildfly/standalone.xml
index 99f48ef..21df684 100644
--- a/docker/configuration/wildfly/standalone.xml
+++ b/docker/configuration/wildfly/standalone.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:17.0">
+<server xmlns="urn:jboss:domain:15.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.connector"/>
@@ -18,6 +18,7 @@
         <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"/>
@@ -38,12 +39,7 @@
         <extension module="org.wildfly.extension.security.manager"/>
         <extension module="org.wildfly.extension.undertow"/>
     </extensions>
-    
-    <system-properties>
-        <property name="eclipselink.archive.factory" value="org.jipijapa.eclipselink.JBossArchiveFactoryImpl"/>
-    </system-properties>
-    
-    
+
     <management>
         <security-realms>
             <security-realm name="ManagementRealm">
@@ -164,15 +160,10 @@
                         <password>sa</password>
                     </security>
                 </datasource>
-
-              
-                
                 <drivers>
                     <driver name="h2" module="com.h2database.h2">
                         <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
                     </driver>
-
-                  
                 </drivers>
             </datasources>
         </subsystem>
@@ -187,7 +178,7 @@
             <infinispan-single-sign-on-management name="default" cache-container="web" cache="sso"/>
             <local-routing/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:6.0">
+        <subsystem xmlns="urn:jboss:domain:ee:5.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <concurrent>
                 <context-services>
@@ -197,16 +188,16 @@
                     <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-termination-period="0" 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-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-termination-period="0" 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-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"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:ejb3:9.0">
+        <subsystem xmlns="urn:jboss:domain:ejb3:8.0">
             <session-bean>
                 <stateless>
                     <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
@@ -245,16 +236,11 @@
                 </thread-pool>
             </thread-pools>
             <default-security-domain value="other"/>
-            <application-security-domains>
-                <!-- imixs realm ref -->
-                <application-security-domain name="imixsrealm" security-domain="imixsrealm"/>
-                <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:14.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
+        <subsystem xmlns="urn:wildfly:elytron:12.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
             <providers>
                 <aggregate-providers name="combined-providers">
                     <providers name="elytron"/>
@@ -275,9 +261,6 @@
                     <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
                     <realm name="local" role-mapper="super-user-mapper"/>
                 </security-domain>
-			    <security-domain name="imixsrealm" default-realm="imixsrealm" permission-mapper="default-permission-mapper">
-				      <realm name="imixsrealm"/>
-				</security-domain>
             </security-domains>
             <security-realms>
                 <identity-realm name="local" identity="$local"/>
@@ -289,12 +272,6 @@
                     <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>
-              
-                <properties-realm name="imixsrealm" groups-attribute="Roles">
-			      <users-properties path="sampleapp-users.properties" relative-to="jboss.server.config.dir" 
-			            digest-realm-name="Application Security" plain-text="true"/>
-			      <groups-properties path="sampleapp-roles.properties" relative-to="jboss.server.config.dir"/>
-			    </properties-realm>
             </security-realms>
             <mappers>
                 <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
@@ -380,24 +357,23 @@
                 </server-ssl-contexts>
             </tls>
         </subsystem>
-        
         <subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
-        <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">
+        <subsystem xmlns="urn:jboss:domain:infinispan:11.0">
+            <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
                 <local-cache name="passivation">
                     <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">
+            <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
                 <local-cache name="passivation">
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
                 <local-cache name="sso"/>
             </cache-container>
-            <cache-container name="server" default-cache="default" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.server">
+            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
                 <local-cache name="default"/>
             </cache-container>
-            <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
+            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
                 <local-cache name="entity">
                     <heap-memory size="10000"/>
                     <expiration max-idle="100000"/>
@@ -443,7 +419,7 @@
             <remoting-connector/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jpa:1.1">
-            <jpa default-extended-persistence-inheritance="DEEP"/>
+            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
         <subsystem xmlns="urn:jboss:domain:mail:4.0">
@@ -452,7 +428,7 @@
             </mail-session>
             <mail-session name="java:/mail/org.imixs.workflow.mail" jndi-name="java:/mail/org.imixs.workflow.mail" debug="false">
             	<smtp-server outbound-socket-binding-ref="mail-smtp"/>
-            </mail-session>            
+            </mail-session>
         </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"/>
@@ -472,6 +448,46 @@
         <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="jaspitest" cache-type="default">
+                    <authentication-jaspi>
+                        <login-module-stack name="dummy">
+                            <login-module code="Dummy" flag="optional"/>
+                        </login-module-stack>
+                        <auth-module code="Dummy"/>
+                    </authentication-jaspi>
+                </security-domain>
+                <security-domain name="jboss-ejb-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+  				<security-domain name="imixsrealm">
+			        <authentication>
+		                <login-module code="UsersRoles" flag="required">  
+		                    <module-option name="usersProperties" value="${jboss.server.config.dir}/muluk-users.properties"/>  
+		                    <module-option name="rolesProperties" value="${jboss.server.config.dir}/muluk-roles.properties"/>  
+		                </login-module>  
+			        </authentication>
+			    </security-domain>                  
+            </security-domains>
+        </subsystem>
         <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
             <deployment-permissions>
                 <maximum-set>
@@ -479,7 +495,7 @@
                 </maximum-set>
             </deployment-permissions>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:transactions:6.0">
+        <subsystem xmlns="urn:jboss:domain:transactions:5.0">
             <core-environment node-identifier="${jboss.tx.node.id:1}">
                 <process-id>
                     <uuid/>
@@ -489,7 +505,7 @@
             <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: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}}">
+        <subsystem xmlns="urn:jboss:domain:undertow:11.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" enable-http2="true"/>
@@ -506,10 +522,6 @@
             <handlers>
                 <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
             </handlers>
-            <application-security-domains>
-                <application-security-domain name="imixsrealm" security-domain="imixsrealm"/>
-                <application-security-domain name="other" security-domain="ApplicationDomain"/>
-            </application-security-domains>
         </subsystem>
         <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>
diff --git a/muluk-roles.properties b/muluk-roles.properties
new file mode 100644
index 0000000..cb6fbda
--- /dev/null
+++ b/muluk-roles.properties
@@ -0,0 +1,6 @@
+##################################################
+# Each user listed in the muluk-users.properties file 
+# must be assigned to the role org.imixs.ACCESSLEVEL.READERACCESS
+# If you add additional users also assign the role here.
+##################################################
+admin=org.imixs.ACCESSLEVEL.READERACCESS
diff --git a/muluk-users.properties b/muluk-users.properties
new file mode 100644
index 0000000..8c7f0d5
--- /dev/null
+++ b/muluk-users.properties
@@ -0,0 +1,6 @@
+##################################################
+# You can change the password here.
+# Username=Password
+# Optional you can add addintioal  Users, if so also add the user to the muluk-roles.properties file
+##################################################
+admin=adminadmin
diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
deleted file mode 100644
index 65bfd7f..0000000
--- a/src/main/webapp/WEB-INF/glassfish-web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<glassfish-web-app>
-
-	<context-root>/</context-root>
-
-</glassfish-web-app>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml
index 2270d78..3eb029c 100644
--- a/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -3,5 +3,8 @@
 
 	<default-encoding>UTF-8</default-encoding>
 	<context-root>/</context-root>
-
+	<security-domain>imixsrealm</security-domain>
+	
 </jboss-web>
+
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 91d87fd..265e4f5 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -3,14 +3,30 @@
 	xmlns="http://java.sun.com/xml/ns/javaee"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
 	version="3.0">
-	<display-name>Imixs Admin Client</display-name>
+	<display-name>Imixs Muluk Web Monitor</display-name>
 	<welcome-file-list>
-<!-- 		<welcome-file>index.html</welcome-file> -->
 		<welcome-file>index.xhtml</welcome-file>
 	</welcome-file-list>
-	
-		<context-param>
+	<context-param>
 		<param-name>javax.faces.PROJECT_STAGE</param-name>
 		<param-value>Development</param-value>
 	</context-param>
+
+	<!-- Basic authentication -->
+	<login-config>
+		<auth-method>BASIC</auth-method>
+		<realm-name>imixsrealm</realm-name>
+	</login-config>
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>restricted</web-resource-name>
+			<url-pattern>/*</url-pattern>
+		</web-resource-collection>
+		<auth-constraint>
+			<role-name>org.imixs.ACCESSLEVEL.READERACCESS</role-name>
+		</auth-constraint>
+	</security-constraint>
+	<security-role>
+		<role-name>org.imixs.ACCESSLEVEL.READERACCESS</role-name>
+	</security-role>
 </web-app>