diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a6c36448..3a247381 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,11 +1,17 @@
 name: Playwright Tests
+
 on:
-  deployment_status:
+  workflow_run:
+    workflows: ["Upload Deployment URL"]
+    types:
+      - completed
+
 jobs:
   test:
+    needs: capture-deployment-url
+    if: github.event_name != 'deployment_status'
     timeout-minutes: 60
     runs-on: ubuntu-latest
-    if: github.event.deployment_status.state == 'success'
     steps:
     - uses: actions/checkout@v4
       with:
@@ -13,6 +19,11 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: 18
+    - name: Download Deployment URL
+      uses: actions/download-artifact@v2
+      with:
+        name: deployment-url
+    - run: echo "$(<deployment-url)"
     - name: Install dependencies
       run: npm ci
     - name: Install Playwright
@@ -20,4 +31,4 @@ jobs:
     - name: Run Playwright tests
       run: npx playwright test
       env:
-        PLAYWRIGHT_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
\ No newline at end of file
+        WEBAPP_URL: $(cat deployment-url | grep DEPLOYMENT_URL | cut -d '=' -f2)
diff --git a/.github/workflows/upload_deployment_url.yaml b/.github/workflows/upload_deployment_url.yaml
new file mode 100644
index 00000000..dcf18963
--- /dev/null
+++ b/.github/workflows/upload_deployment_url.yaml
@@ -0,0 +1,34 @@
+name: Upload Deployment URL
+
+on:
+  push:
+    branches:
+      # Uncomment below before merging
+      # - master
+      # - staging
+      # - develop
+      # All branches just for testing (remove before merging)
+      - '**'
+  pull_request:
+    branches:
+      # Uncomment below before merging
+      # - master
+      # - staging
+      # - develop
+      # All branches just for testing (remove before merging)
+      - '**'
+  deployment_status:
+
+jobs:
+  capture-deployment-url:
+    if: github.event_name == 'deployment_status' && github.event.deployment_status.state == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Capture Deployment URL
+        run: |
+          echo "DEPLOYMENT_URL=${{ github.event.deployment_status.target_url }}" >> $GITHUB_ENV
+      - name: Save Deployment URL
+        uses: actions/upload-artifact@v4
+        with:
+          name: deployment-url
+          path: $GITHUB_ENV
\ No newline at end of file