diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 60ac86a9b353..34a0de4e1acb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -497,6 +497,7 @@ jobs:
   ui:
     name: UI e2e tests
     runs-on: ubuntu-latest
+    needs: code-tests
     if: "!startsWith(github.ref, 'refs/heads/stable-')"
 
     steps:
@@ -578,15 +579,18 @@ jobs:
           curl -sSfL https://dl.min.io/client/mc/release/linux-amd64/mc --output "$(go env GOPATH)/bin/mc"
           chmod +x "$(go env GOPATH)/bin/mc"
 
-      - name: Download go dependencies
-        run: |
-          set -eux
-          go mod download
+      - name: Download system test dependencies
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          name: system-test-deps
+          merge-multiple: true
+          path: /home/runner/go/bin
 
-      - name: Run LXD build
+      - name: Set exec perms on LXD binaries
         run: |
           set -eux
-          make lxd
+          ls -lR /home/runner/go/bin/
+          chmod uog+x /home/runner/go/bin/*
 
       - name: Install doc dependencies
         run: |
@@ -694,11 +698,11 @@ jobs:
           cd lxd-ui
           npx playwright install --with-deps chromium
 
-      - name: Create OIDC users
+      - name: Setup for LXD-UI tests
         shell: bash
         run: |
           set -eux
-          sudo LXD_DIR=/var/lib/lxd PATH=/home/runner/go/bin:$PATH ./lxd-ui/tests/scripts/create_oidc_identities
+          sudo LXD_DIR=/var/lib/lxd PATH=/home/runner/go/bin:$PATH ./lxd-ui/tests/scripts/setup_test
 
       - name: Run Playwright tests
         run: |