diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 901c01da390bb9c55bc4d5268a76262579e55463..39aa2653150c0ee41cc3f7ff909616a95744a9b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,6 @@ cache:
   key: ${CI_PROJECT_PATH}
   paths:
     - _yarn_cache
-    - _cypress_cache
 
 before_script:
   - yarn config set cache-folder "$CI_PROJECT_DIR/_yarn_cache"
@@ -13,9 +12,7 @@ before_script:
 stages:
   - test
   - deploy
-  - e2e-stage1
-  - e2e-stage2
-  - e2e-stage3
+  - e2e
 
 test:
   stage: test
@@ -85,46 +82,13 @@ deploy_development:
     DEPLOY_KEY: "$DEPLOY_SSH_KEY"
   <<: *deploy_defaults
 
-# For docker images see:
-# https://github.com/cypress-io/cypress-docker-images/tree/master/browsers#cypressbrowsers
-
-.e2e_test_defaults: &e2e_test_defaults
+e2e_tests:
   only:
     refs:
       - master
-  # We don't need artifacts from previous runs
-  dependencies: []
-  script:
-    - git clone https://gitlab.tugraz.at/dbp/middleware/e2e-tests.git --depth 1
-    - cd e2e-tests
-    - yarn install
-    #    - ./node_modules/.bin/cypress run --browser "$BROWSER" --spec "cypress/integration/toolkit-showcase/*.spec.js"
-    - xvfb-run ./node_modules/.bin/cypress run --browser "$BROWSER" --headed --spec "cypress/integration/toolkit-showcase/*.spec.js"
-  artifacts:
-    paths:
-      - e2e-tests/cypress/videos/*
-      - e2e-tests/cypress/screenshots/*
-    expire_in: 4 week
-    when: always
-
-ff75:
-  image: cypress/browsers:node13.8.0-chrome81-ff75
-  stage: e2e-stage1
-  variables:
-    MOZ_FORCE_DISABLE_E10S: 'true'
-    BROWSER: 'firefox'
-  <<: *e2e_test_defaults
-
-chrome84:
-  image: cypress/browsers:node14.7.0-chrome84
-  stage: e2e-stage2
-  variables:
-    BROWSER: 'chrome'
-  <<: *e2e_test_defaults
-
-edge88:
-  image: cypress/browsers:node14.10.1-edge88
-  stage: e2e-stage3
   variables:
-    BROWSER: 'edge'
-  <<: *e2e_test_defaults
+    E2E_PROJECT: toolkit-showcase
+  stage: e2e
+  trigger:
+    project: dbp/e2e-tests
+    strategy: depend