diff --git a/.github/workflows/generate-client.yml b/.github/workflows/generate-client.yml
index 04e500ad64..26303fb2d6 100644
--- a/.github/workflows/generate-client.yml
+++ b/.github/workflows/generate-client.yml
@@ -26,16 +26,12 @@ jobs:
         python-version: "3.10"
     - name: Install uv
       uses: astral-sh/setup-uv@v7
-      with:
-        version: "0.4.15"
-        enable-cache: true
     - name: Install dependencies
       run: bun ci
     - run: uv sync
       working-directory: backend
-    - run: uv run bash scripts/generate-client.sh
+    - run: bash scripts/generate-client.sh
       env:
-        VIRTUAL_ENV: backend/.venv
         SECRET_KEY: just-for-generating-client
         POSTGRES_PASSWORD: just-for-generating-client
         FIRST_SUPERUSER_PASSWORD: just-for-generating-client
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 2a309ce3f5..3f9e0a2112 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -59,16 +59,11 @@ jobs:
         limit-access-to-actor: true
     - name: Install uv
       uses: astral-sh/setup-uv@v7
-      with:
-        version: "0.4.15"
-        enable-cache: true
     - run: uv sync
       working-directory: backend
     - run: bun ci
       working-directory: frontend
-    - run: uv run bash scripts/generate-client.sh
-      env:
-        VIRTUAL_ENV: backend/.venv
+    - run: bash scripts/generate-client.sh
     - run: docker compose build
     - run: docker compose down -v --remove-orphans
     - name: Run Playwright tests
diff --git a/frontend/README.md b/frontend/README.md
index 74724e5fe5..7b50d58b3f 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -48,7 +48,7 @@ But it would be only to clean them up, leaving them won't really have any effect
 * From the top level project directory, run the script:
 
 ```bash
-./scripts/generate-client.sh
+bash ./scripts/generate-client.sh
 ```
 
 * Commit the changes.
diff --git a/scripts/generate-client.sh b/scripts/generate-client.sh
index 62741099ce..dc7640bcb4 100644
--- a/scripts/generate-client.sh
+++ b/scripts/generate-client.sh
@@ -4,8 +4,8 @@ set -e
 set -x
 
 cd backend
-python -c "import app.main; import json; print(json.dumps(app.main.app.openapi()))" > ../openapi.json
+uv run python -c "import app.main; import json; print(json.dumps(app.main.app.openapi()))" > ../openapi.json
 cd ..
 mv openapi.json frontend/
-npm run -w frontend generate-client
-npm run lint
+bun run --filter frontend generate-client
+bun run lint