diff --git a/.github/workflows/test-smoke-v2.yml b/.github/workflows/test-smoke-v2.yml
index aadeed6d..b49fc4c1 100644
--- a/.github/workflows/test-smoke-v2.yml
+++ b/.github/workflows/test-smoke-v2.yml
@@ -12,6 +12,9 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     name: Smoke v2 Tests
+    container:
+      image: mcr.microsoft.com/playwright:v1.57.0-noble
+      options: --ipc=host --init
 
     steps:
       - name: Checkout Commit
@@ -19,11 +22,26 @@ jobs:
         with:
           fetch-depth: 10
 
+      - name: Configure git safe.directory
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
       - name: Checkout Main
         run: |
           git fetch origin
           git branch -f main origin/main
 
+      - name: Ensure xz is available
+        run: |
+          if ! command -v xz >/dev/null 2>&1; then
+            if command -v sudo >/dev/null 2>&1; then
+              sudo apt-get update
+              sudo apt-get install -y xz-utils
+            else
+              apt-get update
+              apt-get install -y xz-utils
+            fi
+          fi
+
       - name: Setup
         uses: ./.github/actions/setup
 
@@ -35,4 +53,4 @@ jobs:
         env:
           DOT_LOG_LEVEL: debug
           LOCAL_SMOKE: 'true'
-        run: moon smoke-v2:run
+        run: moon smoke-v2:run-ci
diff --git a/test/smoke-v2/moon.yml b/test/smoke-v2/moon.yml
index 9828c0e0..f0832b92 100644
--- a/test/smoke-v2/moon.yml
+++ b/test/smoke-v2/moon.yml
@@ -28,8 +28,17 @@ tasks:
       outputStyle: 'stream'
       runDepsInParallel: false
 
+  run-ci:
+    command: playwright test -x
+    deps:
+      - ~:setup
+    options:
+      cache: false
+      outputStyle: 'stream'
+      runDepsInParallel: false
+
   setup:
-    command: ./scripts/ci-preview-setup-smoke-v2.sh
+    command: bash ./scripts/ci-preview-setup-smoke-v2.sh
     options:
       cache: false
       outputStyle: 'stream'
@@ -37,7 +46,7 @@ tasks:
     platform: system
 
   start:
-    command: ./scripts/ci-preview-start-smoke-v2.sh
+    command: bash ./scripts/ci-preview-start-smoke-v2.sh
     options:
       cache: false
       outputStyle: 'stream'