diff --git a/.github/workflows/run-e2e.yaml b/.github/workflows/run-e2e.yaml
index aa71a295e8a7..3fef8663cc29 100644
--- a/.github/workflows/run-e2e.yaml
+++ b/.github/workflows/run-e2e.yaml
@@ -27,26 +27,29 @@ jobs:
         with:
           node-version: lts/*
 
-      - name: Install dependencies
-        run: npm install -g yarn && yarn
-
-      - name: Install Playwright Browsers
-        run: yarn playwright install --with-deps
-
-      - name: Mask secrets and inputs
+      - name: Mask secrets and input
         run: |
-          echo "::add-mask::${{ secrets.E2E_TENANT_BASE_URL }}"
-          echo "::add-mask::${{ secrets.E2E_USER_EMAIL }}"
-          echo "::add-mask::${{ secrets.E2E_USER_PASSWORD }}"
+          echo "::add-mask::${{ secrets.BASE_URL }}"
+          echo "::add-mask::${{ secrets.LOGIN_USERNAME }}"
+          echo "::add-mask::${{ secrets.LOGIN_PASSWORD }}"
           echo "::add-mask::${{ github.event.inputs.userRole }}"
 
-      - name: Run Playwright Tests
+      - name: Install dependencies
+        working-directory: frontend
         run: |
-          echo "✅ Starting Playwright tests..."
+          npm install -g yarn
+          yarn
 
-          BASE_URL="${{ secrets.E2E_TENANT_BASE_URL }}" \
-          LOGIN_USERNAME="${{ secrets.E2E_USER_EMAIL }}" \
-          LOGIN_PASSWORD="${{ secrets.E2E_USER_PASSWORD }}" \
+      - name: Install Playwright Browsers
+        working-directory: frontend
+        run: yarn playwright install --with-deps
+
+      - name: Run Playwright Tests
+        working-directory: frontend
+        run: |
+          BASE_URL="${{ secrets.BASE_URL }}" \
+          LOGIN_USERNAME="${{ secrets.LOGIN_USERNAME }}" \
+          LOGIN_PASSWORD="${{ secrets.LOGIN_PASSWORD }}" \
           USER_ROLE="${{ github.event.inputs.userRole }}" \
           yarn playwright test
 
@@ -55,5 +58,5 @@ jobs:
         if: always()
         with:
           name: playwright-report
-          path: playwright-report/
+          path: frontend/playwright-report/
           retention-days: 30