diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d467ff987..c3238507a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -139,7 +139,7 @@ jobs:
   build_test_nginx:
     name: Docker Build Test - Nginx
     runs-on: ubuntu-latest
-    #needs: [nothing]
+    needs: [build_test_backend, build_test_admin, build_test_frontend]
     steps:
       ##########################################################################
       # CHECKOUT CODE ##########################################################
@@ -560,7 +560,7 @@ jobs:
   end-to-end-tests:
     name: End-to-End Tests
     runs-on: ubuntu-latest
-    # needs: [build_test_mariadb, build_test_database_up, build_test_backend, build_test_admin, build_test_frontend, build_test_nginx]
+    needs: [build_test_mariadb, build_test_database_up, build_test_backend, build_test_admin, build_test_frontend, build_test_nginx]
     steps:
       ##########################################################################
       # CHECKOUT CODE ##########################################################
@@ -570,65 +570,63 @@ jobs:
       ##########################################################################
       # DOWNLOAD DOCKER IMAGES #################################################
       ##########################################################################
-      # - name: Download Docker Image (Mariadb)
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: docker-mariadb-test
-      #     path: /tmp
-      # - name: Load Docker Image (Mariadb)
-      #   run: docker load < /tmp/mariadb.tar
-      # - name: Download Docker Image (Database Up)
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: docker-database-test_up
-      #     path: /tmp
-      # - name: Load Docker Image (Database Up)
-      #   run: docker load < /tmp/database_up.tar
-      # - name: Download Docker Image (Backend)
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: docker-backend-test
-      #     path: /tmp
-      # - name: Load Docker Image (Backend)
-      #   run: docker load < /tmp/backend.tar
-      # - name: Download Docker Image (Frontend)
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: docker-frontend-test
-      #     path: /tmp
-      # - name: Load Docker Image (Frontend)
-      #   run: docker load < /tmp/frontend.tar
-      # - name: Download Docker Image (Admin Interface)
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: docker-admin-test
-      #     path: /tmp
-      # - name: Load Docker Image (Admin Interface)
-      #   run: docker load < /tmp/admin.tar
-      # - name: Download Docker Image (Nginx)
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: docker-nginx-test
-      #     path: /tmp
-      # - name: Load Docker Image (Nginx)
-      #   run: docker load < /tmp/nginx.tar
+      - name: Download Docker Image (Mariadb)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-mariadb-test
+          path: /tmp
+      - name: Load Docker Image (Mariadb)
+        run: docker load < /tmp/mariadb.tar
+      - name: Download Docker Image (Database Up)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-database-test_up
+          path: /tmp
+      - name: Load Docker Image (Database Up)
+        run: docker load < /tmp/database_up.tar
+      - name: Download Docker Image (Backend)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-backend-test
+          path: /tmp
+      - name: Load Docker Image (Backend)
+        run: docker load < /tmp/backend.tar
+      - name: Download Docker Image (Frontend)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-frontend-test
+          path: /tmp
+      - name: Load Docker Image (Frontend)
+        run: docker load < /tmp/frontend.tar
+      - name: Download Docker Image (Admin Interface)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-admin-test
+          path: /tmp
+      - name: Load Docker Image (Admin Interface)
+        run: docker load < /tmp/admin.tar
+      - name: Download Docker Image (Nginx)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-nginx-test
+          path: /tmp
+      - name: Load Docker Image (Nginx)
+        run: docker load < /tmp/nginx.tar
+
       ##########################################################################
       # BOOT UP THE TEST SYSTEM ################################################
       ##########################################################################
       - name: Boot up test system | docker-compose mariadb
-        run: docker-compose up --detach mariadb
-
-      - name: Sleep for 30 seconds
-        run: sleep 30s
+        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 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: docker-compose up --detach --no-deps backend
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend
 
-      - name: Sleep for 90 seconds
-        run: sleep 90s
+      - name: Sleep for 10 seconds
+        run: sleep 10s
 
       - name: Boot up test system | seed backend
         run: |
@@ -640,10 +638,10 @@ jobs:
           cd ..
 
       - name: Boot up test system | docker-compose frontends
-        run: docker-compose 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: Sleep for 2.5 minutes
-        run: sleep 150s
+      - name: Sleep for 15 seconds
+        run: sleep 15s
 
       ##########################################################################
       # END-TO-END TESTS #######################################################
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 79ee46906..790bd468d 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,6 +1,25 @@
 version: "3.4"
 
 services:
+  ########################################################
+  # FRONTEND #############################################
+  ########################################################
+  frontend:
+    image: gradido/frontend:test
+    build:
+      target: test
+    environment:
+      - NODE_ENV="test"
+  
+  ########################################################
+  # ADMIN INTERFACE ######################################
+  ########################################################
+  admin:
+    image: gradido/admin:test
+    build:
+      target: test
+    environment:
+      - NODE_ENV="test"
 
   ########################################################
   # BACKEND ##############################################
@@ -21,15 +40,19 @@ services:
   # DATABASE #############################################
   ########################################################
   database:
+    image: gradido/database:test_up
     build:
       context: ./database
       target: test_up
+    environment:
+      - NODE_ENV="test"
   #  restart: always # this is very dangerous, but worth a test for the delayed mariadb startup at first run
 
   #########################################################
   ## MARIADB ##############################################
   #########################################################
   mariadb:
+    image: gradido/mariadb:test
     networks: 
       - internal-net
       - external-net
@@ -51,6 +74,12 @@ services:
      - external-net
     volumes:
      - /sessions
+  
+  #########################################################
+  ## NGINX ################################################
+  #########################################################
+  nginx:
+    image: gradido/nginx:test
 
 networks:
   external-net:
diff --git a/e2e-tests/cypress/tests/cypress.config.ts b/e2e-tests/cypress/tests/cypress.config.ts
index ad6a8d7de..9621b7a00 100644
--- a/e2e-tests/cypress/tests/cypress.config.ts
+++ b/e2e-tests/cypress/tests/cypress.config.ts
@@ -36,6 +36,7 @@ export default defineConfig({
     supportFile: "cypress/support/index.ts",
     viewportHeight: 720,
     viewportWidth: 1280,
+    video: false,
     retries: {
       runMode: 2,
       openMode: 0,