diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
index f9ec40e6d..cea7b16e2 100644
--- a/.github/workflows/test_and_deploy.yml
+++ b/.github/workflows/test_and_deploy.yml
@@ -44,18 +44,23 @@ jobs:
         env:
           CI: true
 
-      - name: E2E Prepare
-        run: |
-          npm run e2e:prepare --if-present
-        env:
-          CI: true
-
       - name: E2E
-        run: |
-          npm run e2e --if-present
+        uses: addnab/docker-run-action@v3
+        with:
+          image: mcr.microsoft.com/playwright:v1.46.0-jammy
+          options: --ipc=host -v ${{ github.workspace }}:/workspace -w /workspace
+          run: |
+            npm run e2e --if-present
         env:
           CI: true
 
+      - name: Upload E2E Results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: e2e-results
+          path: playwright/results
+
       - name: Build Docs
         run: |
           npm run build-docs --if-present