diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 4d673dba0..30d95016c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -154,11 +154,12 @@ jobs:
         name: Run Etherpad
         working-directory: etherpad/src
         run: |
-          pnpm install cypress
-          .\node_modules\.bin\cypress.cmd install --force
+          pnpm install playwright
+          pnpm exec playwright install --with-deps
           pnpm run prod &
           curl --connect-timeout 10 --max-time 20 --retry 5 --retry-delay 10 --retry-max-time 60 --retry-connrefused http://127.0.0.1:9001/p/test
-          pnpm exec cypress run --config-file ./tests/frontend/cypress/cypress.config.js
+          pnpm exec playwright install chromium  --with-deps
+          pnpm run test-ui --project=chromium
       # On release, upload windows zip to GitHub release tab
       -
         name: Rename to etherpad-lite-win.zip
diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh
index 67f4eeae1..99a9fcf2f 100755
--- a/bin/buildForWindows.sh
+++ b/bin/buildForWindows.sh
@@ -50,21 +50,13 @@ rm -rf src/node_modules || true
 #$(try cd ./bin/installDeps.sh)
 
 # Install admin frontend
-cd admin
 try pnpm install
-try pnpm run build
-cd ..
-
-
-
+try pnpm run build:etherpad
 
 # Nuke the admin folder as it is not needed anymore :D
 rm -rf admin
-
-export NODE_ENV=production
-try pnpm install --production
-
-
+rm -rf oidc
+rm -rf src/node_modules
 
 log "copy the windows settings template..."
 try cp settings.json.template settings.json
diff --git a/package.json b/package.json
index 0953cb2d7..897830b17 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,8 @@
     "plugins": "pnpm --filter bin run plugins",
     "install-plugins": "pnpm --filter bin run plugins i",
     "remove-plugins": "pnpm --filter bin run remove-plugins",
-    "list-plugins": "pnpm --filter bin run list-plugins"
+    "list-plugins": "pnpm --filter bin run list-plugins",
+    "build:etherpad": "pnpm --filter admin run build-copy && pnpm --filter ui run build-copy"
   },
   "dependencies": {
     "ep_etherpad-lite": "workspace:./src"
diff --git a/ui/package.json b/ui/package.json
index e3d6de4ce..1fc923bc9 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "build-copy": "tsc && vite build --outDir ../src/static/oidc --emptyOutDir"
   },
   "devDependencies": {
     "ep_etherpad-lite": "workspace:../src",