diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml
index b517c5186..ed20f91bb 100644
--- a/.github/workflows/test_backend.yml
+++ b/.github/workflows/test_backend.yml
@@ -44,14 +44,14 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Backend | docker-compose mariadb
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
 
       - name: Sleep for 30 seconds
         run: sleep 30s
         shell: bash
 
       - name: Backend | docker-compose database
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
 
       - name:  Backend | Unit tests
         run: cd database && yarn && yarn build && cd ../backend && yarn && yarn test
diff --git a/.github/workflows/test_database.yml b/.github/workflows/test_database.yml
index 0444a0538..6f0c1d760 100644
--- a/.github/workflows/test_database.yml
+++ b/.github/workflows/test_database.yml
@@ -43,13 +43,13 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Database | docker-compose
-        run: docker-compose -f docker-compose.yml up --detach mariadb
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb
       
       - name: Database | up
-        run: docker-compose -f docker-compose.yml run -T database yarn up
+        run: docker compose -f docker-compose.yml up --no-deps database
       
       - name: Database | reset
-        run: docker-compose -f docker-compose.yml run -T database yarn reset
+        run: docker compose -f docker-compose.yml -f docker-compose.reset.yml up --no-deps database
         
   lint:
     if: needs.files-changed.outputs.database == 'true'
diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml
index e81ed33af..acd19bb57 100644
--- a/.github/workflows/test_dht_node.yml
+++ b/.github/workflows/test_dht_node.yml
@@ -72,14 +72,14 @@ jobs:
         run: docker load < /tmp/dht-node.tar
       
       - name: docker-compose mariadb
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
       
       - name: Sleep for 30 seconds
         run: sleep 30s
         shell: bash
 
       - name: docker-compose database
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
 
       - name: Sleep for 30 seconds
         run: sleep 30s
diff --git a/.github/workflows/test_dlt_connector.yml b/.github/workflows/test_dlt_connector.yml
index 1096f415d..099f0dd1a 100644
--- a/.github/workflows/test_dlt_connector.yml
+++ b/.github/workflows/test_dlt_connector.yml
@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@v3
             
       - name: DLT-Connector | docker-compose mariadb
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
 
       - name: Sleep for 30 seconds
         run: sleep 30s
diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml
index 617097a53..590758248 100644
--- a/.github/workflows/test_e2e.yml
+++ b/.github/workflows/test_e2e.yml
@@ -11,17 +11,17 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Boot up test system | docker-compose mariadb
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb
 
       - name: Boot up test system | docker-compose database
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
 
       - name: Boot up test system | docker-compose backend
         run: |
           cd backend
           cp .env.test_e2e .env
           cd ..
-          docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend 
+          docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend 
 
       - name: Sleep for 10 seconds
         run: sleep 10s
@@ -35,10 +35,10 @@ jobs:
           yarn && yarn seed
 
       - name: Boot up test system | docker-compose frontends
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx
 
       - name: Boot up test system | docker-compose mailserver
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mailserver
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mailserver
 
       - name: End-to-end tests | prepare
         run: |
diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml
index 92ccd95d2..3fb08ea64 100644
--- a/.github/workflows/test_federation.yml
+++ b/.github/workflows/test_federation.yml
@@ -71,14 +71,14 @@ jobs:
         run: docker load < /tmp/federation.tar
       
       - name: docker-compose mariadb
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
       
       - name: Sleep for 30 seconds
         run: sleep 30s
         shell: bash
 
       - name: docker-compose database
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
+        run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
 
       - name: Sleep for 30 seconds
         run: sleep 30s
diff --git a/docker-compose.apple-m1.override.yml b/docker-compose.apple-m1.override.yml
index 585a4555e..888bb551e 100644
--- a/docker-compose.apple-m1.override.yml
+++ b/docker-compose.apple-m1.override.yml
@@ -3,8 +3,6 @@
 # To use it it is required to explicitly define if you want to build with it:
 # > docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.apple-m1.override.yml up
 
-version: "3.4"
-
 services:
   ########################################################
   # FRONTEND #############################################
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 08e02f1d7..4807a6bbf 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,5 +1,3 @@
-version: "3.4"
-
 services:
 
   ########################################################
diff --git a/docker-compose.reset.yml b/docker-compose.reset.yml
new file mode 100644
index 000000000..13708bdef
--- /dev/null
+++ b/docker-compose.reset.yml
@@ -0,0 +1,70 @@
+# This file defines the production settings. It is overwritten by docker-compose.override.yml,
+# which defines the development settings. The override.yml is loaded by default. Therefore it
+# is required to explicitly define if you want an production build:
+# > docker-compose -f docker-compose.yml up 
+
+services:
+
+
+
+  ########################################################
+  # DATABASE #############################################
+  ########################################################
+  database:
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/database:local-production_reset
+    build:
+      context: ./database
+      target: production_reset
+    depends_on:
+      - mariadb
+    networks:
+      - internal-net
+      - external-net # this is required to fetch the packages
+    environment:
+      # Envs used in Dockerfile
+      # - DOCKER_WORKDIR="/app"
+      - BUILD_DATE
+      - BUILD_VERSION
+      - BUILD_COMMIT
+      - NODE_ENV="production"
+      - DB_HOST=mariadb
+      # Application only envs
+    #env_file:
+    #  - ./frontend/.env
+
+  ########################################################
+  # DLT-DATABASE #############################################
+  ########################################################
+  dlt-database:
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/dlt-database:local-production_reset
+    build:
+      context: ./dlt-database
+      target: production_reset
+    depends_on:
+      - mariadb
+    networks:
+      - internal-net
+      - external-net # this is required to fetch the packages
+    environment:
+      # Envs used in Dockerfile
+      # - DOCKER_WORKDIR="/app"
+      - BUILD_DATE
+      - BUILD_VERSION
+      - BUILD_COMMIT
+      - NODE_ENV="production"
+      - DB_HOST=mariadb
+      # Application only envs
+    #env_file:
+    #  - ./frontend/.env
+    
+  
+networks:
+  external-net:
+  internal-net:
+    internal: true
+
+volumes:
+  db_vol: 
+  
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index ff6ed61b8..f4188d430 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,5 +1,3 @@
-version: "3.4"
-
 services:
   ########################################################
   # FRONTEND #############################################
diff --git a/docker-compose.yml b/docker-compose.yml
index 4243956c4..76243a98a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,6 @@
 # is required to explicitly define if you want an production build:
 # > docker-compose -f docker-compose.yml up 
 
-version: "3.4"
-
 services:
 
   ########################################################
@@ -67,7 +65,7 @@ services:
       context: ./mariadb
       target: mariadb_server
     environment:
-      - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1
+      - MARIADB_ALLOW_EMPTY_PASSWORD=1
       - MARIADB_USER=root
     networks: 
       - internal-net
diff --git a/e2e-tests/.nvmrc b/e2e-tests/.nvmrc
new file mode 100644
index 000000000..9dfdb2923
--- /dev/null
+++ b/e2e-tests/.nvmrc
@@ -0,0 +1 @@
+v19.5.0
\ No newline at end of file