diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 455836c32..8553e19fd 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -6,9 +6,9 @@ name: e2e
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 jobs:
   build-frontend:
@@ -22,7 +22,7 @@ jobs:
         uses: actions/cache@v2.1.6
         with:
           path: build
-          key: build
+          key: build-${{ hashFiles('src/**') }}
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -61,8 +61,10 @@ jobs:
       image: cypress/browsers:node14.16.0-chrome90-ff88
       options: --user 1001 --shm-size=2g
     strategy:
+      fail-fast: false
       matrix:
         browser: [ 'chrome', 'firefox' ]
+        containers: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
     steps:
       - name: Check out repo
         uses: actions/checkout@v2
@@ -77,6 +79,14 @@ jobs:
         with:
           browser: ${{ matrix.browser }}
           start: 'yarn serve:build'
+          parallel: true
+          record: true
+          group: "UI - ${{ matrix.browser }}"
+          wait-on: 'http://127.0.0.1:3001/'
+          wait-on-timeout: 120
+        env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: actions/upload-artifact@master
         if: always()
diff --git a/cypress.json b/cypress.json
index 958b04a86..735f87e94 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,5 +1,6 @@
 {
   "baseUrl": "http://127.0.0.1:3001/",
   "defaultCommandTimeout": 15000,
-  "video": false
+  "video": false,
+  "projectId": "ht3vbo"
 }