diff --git a/Workbench/.env b/Workbench/.env
index 6cca1f1..e927f1c 100644
--- a/Workbench/.env
+++ b/Workbench/.env
@@ -1,12 +1,4 @@
 ENV=demo
-REPO_DATABASE_TYPE=mariadb
-REPO_JDBC_URL=default
-REPO_HOST=midpoint_data
-REPO_PORT=default
-REPO_DATABASE=registry
-REPO_USER=registry_user
-REPO_MISSING_SCHEMA_ACTION=create
-REPO_UPGRADEABLE_SCHEMA_ACTION=stop
 MP_MEM_MAX=2048m
 MP_MEM_INIT=1024m
 TIMEZONE=UTC
diff --git a/Workbench/configs-and-secrets/midpoint/application/database_password.txt b/Workbench/configs-and-secrets/midpoint/application/database_password.txt
deleted file mode 100644
index 11bff19..0000000
--- a/Workbench/configs-and-secrets/midpoint/application/database_password.txt
+++ /dev/null
@@ -1 +0,0 @@
-WJzesbe3poNZ91qIbmR7
diff --git a/Workbench/configs-and-secrets/midpoint/application/keystore_password.txt b/Workbench/configs-and-secrets/midpoint/application/keystore_password.txt
deleted file mode 100644
index 1d40192..0000000
--- a/Workbench/configs-and-secrets/midpoint/application/keystore_password.txt
+++ /dev/null
@@ -1 +0,0 @@
-changeit
diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml
index e7d538a..5288be4 100644
--- a/Workbench/docker-compose.yml
+++ b/Workbench/docker-compose.yml
@@ -224,52 +224,85 @@ services:
     environment:
      - CREATE_NEW_DATABASE=if_needed
 
+
+
+  data_init:
+    image: i2incommon/midpoint:4.4
+    command: >
+        bash -c "
+        chmod 777 /opt/mp-pw/ ;
+        touch /opt/mp-pw/db_init_in_progress ;
+        echo -e '#!/bin/sh\ntouch /opt/mp-pw/db_init' >/opt/db-init/000-start.sh ;
+        echo -e '#!/bin/sh\necho DB structure init process has finished...\nrm -f /opt/mp-pw/db_init_in_progress /opt/mp-pw/db_init' > /opt/db-init/999-finish.sh ;
+        /opt/midpoint/bin/midpoint.sh init-native
+        "
+    environment:
+     - MP_INIT_DB_CONCAT=/opt/db-init/init.sql
+     - MP_DB_PW=/opt/mp-pw/dbpassword
+     - MP_PW_DEF=/opt/mp-pw/keystorepw
+    volumes:
+     - db_init:/opt/db-init
+     - mp_pw:/opt/mp-pw
+
   midpoint_data:
-    image: postgres:12
+    image: postgres:13-alpine
+    command: >
+        bash -c "
+        rm -f /var/lib/postgresql/data/postmaster.pid ;
+        while [ ! -s /opt/mp-pw/dbpassword -o -e /opt/mp-pw/init_in_progress ] ; do
+         echo 'Waiting to the end of the init process...';
+         sleep 1;
+        done ;
+        {
+         sleep 2 ;
+         if [ ! -e /opt/mp-pw/db_init -a -e /opt/mp-pw/db_init_in_progress ] ;
+          then echo 'DB init did not start...' ;
+          rm -f /opt/mp-pw/db_ini*;
+          echo 'The lock files has been removed...';
+         fi ;
+        } &
+        docker-entrypoint.sh postgres
+        "
+    user: "70:70"
+    depends_on:
+     - data_init
     environment:
-     - POSTGRES_PASSWORD_FILE=/run/secrets/mp_database_password.txt
+     - POSTGRES_PASSWORD_FILE=/opt/mp-pw/dbpassword
      - POSTGRES_USER=midpoint
      - POSTGRES_INITDB_ARGS=--lc-collate=en_US.utf8 --lc-ctype=en_US.utf8
     ports:
      - 5432:5432
     networks:
-      net:
-        aliases:
-         - midpoint-data
-    secrets:
-     - mp_database_password.txt
-    healthcheck:
-      test: /usr/bin/pg_isready
-      interval: 30s
-      timeout: 30s
-      retries: 3
+     - net
     volumes:
      - midpoint_data:/var/lib/postgresql/data
+     - db_init:/docker-entrypoint-initdb.d/
+     - mp_pw:/opt/mp-pw
 
   midpoint_server:
-    build: 
+    build:
       context: ./midpoint_server/
       args:
         - CSPHOSTNAME
-    command: /usr/local/bin/startup.sh
     depends_on:
+     - data_init
      - midpoint_data
     ports:
      - 10443:443
-    command: /usr/local/bin/startup.sh
     environment:
      - ENV
      - USERTOKEN
      - REPO_DATABASE_TYPE=postgresql
-     - REPO_HOST=midpoint_data
-     - REPO_JDBC_URL
-     - REPO_PORT=5432
-     - REPO_DATABASE=midpoint
-     - REPO_USER=midpoint
-     - REPO_MISSING_SCHEMA_ACTION
-     - REPO_UPGRADEABLE_SCHEMA_ACTION
-     - REPO_SCHEMA_VERSION_IF_MISSING
-     - REPO_SCHEMA_VARIANT
+     - MP_SET_midpoint_repository_jdbcUsername=midpoint
+     - MP_SET_midpoint_repository_jdbcPassword_FILE=/opt/mp-pw/dbpassword
+     - MP_SET_midpoint_repository_jdbcUrl=jdbc:postgresql://midpoint_data:5432/midpoint
+     - MP_SET_midpoint_keystore_keyStorePassword_FILE=/opt/mp-pw/keystorepw
+     - MP_SET_server_tomcat_ajp_enabled=true
+     - MP_SET_server_tomcat_ajp_port=9090
+     - MP_SET_server_tomcat_ajp_secret=s3cr3t
+     - MP_SET_logging_path=/tmp/logtomcat
+     - MP_UNSET_midpoint_repository_hibernateHbm2ddl=1
+     - MP_NO_ENV_COMPAT=1
      - MP_MEM_MAX
      - MP_MEM_INIT
      - MP_JAVA_OPTS
@@ -280,8 +313,6 @@ services:
         aliases:
          - midpoint-server
     secrets:
-     - mp_database_password.txt
-     - mp_keystore_password.txt
      - mp_host-key.pem
      - mp_shibboleth_sp_keys.jks
     volumes:
@@ -295,6 +326,7 @@ services:
      - type: bind
        source: ./midpoint_server/container_files/csv/source-hr.csv
        target: /opt/midpoint/csv/source-hr.csv
+     - mp_pw:/opt/mp-pw
 
   idp:
     build: 
@@ -523,10 +555,6 @@ secrets:
 # midPoint
   mp_host-key.pem:
     file: ./configs-and-secrets/midpoint/httpd/host-key.pem
-  mp_database_password.txt:
-    file: ./configs-and-secrets/midpoint/application/database_password.txt
-  mp_keystore_password.txt:
-    file: ./configs-and-secrets/midpoint/application/keystore_password.txt    
   mp_shibboleth_sp_keys.jks:
     file: ./configs-and-secrets/midpoint/shibboleth/shibboleth_sp_keys.jks
 # COmanage
@@ -541,8 +569,9 @@ volumes:
   source_mysql:
   target_data:
   ldap:
+  db_init:
+  mp_pw:
   midpoint_data:
-  midpoint_mysql:
   midpoint_home:
   mq:
   wordpress_data:
diff --git a/Workbench/midpoint_server/Dockerfile b/Workbench/midpoint_server/Dockerfile
index 876daca..dadd9da 100644
--- a/Workbench/midpoint_server/Dockerfile
+++ b/Workbench/midpoint_server/Dockerfile
@@ -1,7 +1,4 @@
-FROM tier/midpoint:4.3.2-SNAPSHOT
-#FROM tier/midpoint:latest
-
-MAINTAINER info@evolveum.com
+FROM i2incommon/midpoint:4.4
 
 ARG CSPHOSTNAME=localhost
 ENV CSPHOSTNAME=$CSPHOSTNAME
@@ -26,7 +23,4 @@ RUN chmod 755 /usr/local/bin/setservername.sh
 RUN /usr/local/bin/setservername.sh
 RUN yum install -y graphviz
 
-#COPY container_files/supervisor/supervisord.conf /etc/supervisor/
 
-#set shib auth in apache
-#RUN mv /etc/httpd/conf.d/midpoint.conf /etc/httpd/conf.d/midpoint.conf.default && mv /etc/httpd/conf.d/midpoint.conf.auth.shibboleth /etc/httpd/conf.d/midpoint.conf
diff --git a/Workbench/midpoint_server/container_files/mp-home/config.xml b/Workbench/midpoint_server/container_files/mp-home/config.xml
index 5a4e0ea..c45e612 100644
--- a/Workbench/midpoint_server/container_files/mp-home/config.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/config.xml
@@ -20,19 +20,15 @@
             <importFolder>${midpoint.home}/import</importFolder>
         </webApplication>
         <repository>
-            <repositoryServiceFactoryClass>com.evolveum.midpoint.repo.sql.SqlRepositoryFactory</repositoryServiceFactoryClass>
-            <baseDir>${midpoint.home}</baseDir>
-            <asServer>true</asServer>
-            <enableIndexOnlyItems>true</enableIndexOnlyItems>
-            <enableNoFetchExtensionValuesInsertion>true</enableNoFetchExtensionValuesInsertion>
-            <enableNoFetchExtensionValuesDeletion>true</enableNoFetchExtensionValuesDeletion>
+            <type>native</type>
+            <jdbcUrl>jdbc:postgresql://localhost:5432/midpoint</jdbcUrl>
         </repository>
         <audit>
             <auditService>
                 <auditServiceFactoryClass>com.evolveum.midpoint.audit.impl.LoggerAuditServiceFactory</auditServiceFactoryClass>
             </auditService>
             <auditService>
-                <auditServiceFactoryClass>com.evolveum.midpoint.repo.sql.SqlAuditServiceFactory</auditServiceFactoryClass>
+                <auditServiceFactoryClass>com.evolveum.midpoint.repo.sqale.audit.SqaleAuditServiceFactory</auditServiceFactoryClass>
             </auditService>
         </audit>
         <icf>
diff --git a/Workbench/midpoint_server/container_files/system/setservername.sh b/Workbench/midpoint_server/container_files/system/setservername.sh
index c699ea9..0913b66 100644
--- a/Workbench/midpoint_server/container_files/system/setservername.sh
+++ b/Workbench/midpoint_server/container_files/system/setservername.sh
@@ -4,5 +4,6 @@ files="/opt/midpoint/var/post-initial-objects/securityPolicy/000-security-policy
 
 for file in $files
   do
+    echo "Editing file $file with value $CSPHOSTNAME"
     sed -i "s|__CSPHOSTNAME__|$CSPHOSTNAME|g" $file
-  done
\ No newline at end of file
+  done