diff --git a/.github/workflows/client-check-types.yml b/.github/workflows/client-check-types.yml
index a149827c2..8f96a9fc7 100644
--- a/.github/workflows/client-check-types.yml
+++ b/.github/workflows/client-check-types.yml
@@ -10,7 +10,7 @@ defaults:
     working-directory: app/client
 
 jobs:
-  check-types:
+  typecheck:
     runs-on: ubuntu-latest
     steps:
       - name: 📥 Checkout
diff --git a/.github/workflows/client-nextjs-bundle-analysis.yml b/.github/workflows/client-nextjs-bundle-analysis.yml
index 5fed9d40a..e4236d200 100644
--- a/.github/workflows/client-nextjs-bundle-analysis.yml
+++ b/.github/workflows/client-nextjs-bundle-analysis.yml
@@ -12,7 +12,6 @@ defaults:
       
 jobs:
   build:
-    name: Production build
     if: ${{ github.event_name == 'push' }}
     uses: ./.github/workflows/client-production-build.yml
     secrets: inherit
diff --git a/.github/workflows/client-pr.yml b/.github/workflows/client-pr.yml
index fceb6b287..f418998f5 100644
--- a/.github/workflows/client-pr.yml
+++ b/.github/workflows/client-pr.yml
@@ -1,10 +1,10 @@
-name: "Client CI"
+name: "Client - PR"
 
 on:
-  push:
+  pull_request_target:
     branches: [dev, main, feature/add-map-page]
-    # paths:
-    #   - "app/client/**"
+    paths:
+      - "app/client/**"
   merge_group:
   workflow_dispatch:
 
@@ -18,27 +18,27 @@ concurrency:
 
 
 jobs:
-  # files-changed:
-  #   name: detect-changes
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 3
-  #   permissions:
-  #     pull-requests: read
-  #     contents: read
-  #   outputs:
-  #     client-goat: ${{ steps.changes.outputs.client-goat }}
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: dorny/paths-filter@v2
-  #       id: changes
-  #       with:
-  #         filters: |
-  #           client-goat:
-  #               - 'app/client/apps/goat/**'
-  #               - 'app/client/packages/**'
-  #               - 'app/client/package.json'
-  #               - 'app/client/pnpm-lock.yaml'
-  #               - 'app/client/.prettier*'
+  files-changed:
+    name: detect-changes
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    permissions:
+      pull-requests: read
+      contents: read
+    outputs:
+      client-goat: ${{ steps.changes.outputs.client-goat }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dorny/paths-filter@v2
+        id: changes
+        with:
+          filters: |
+            client-goat:
+                - 'app/client/apps/goat/**'
+                - 'app/client/packages/**'
+                - 'app/client/package.json'
+                - 'app/client/pnpm-lock.yaml'
+                - 'app/client/.prettier*'
 
   typecheck:
     name: typecheck
diff --git a/.github/workflows/client-production-build.yml b/.github/workflows/client-production-build.yml
index 076a73003..f42892b3c 100644
--- a/.github/workflows/client-production-build.yml
+++ b/.github/workflows/client-production-build.yml
@@ -9,7 +9,6 @@ defaults:
 
 jobs:
   build:
-    name: Build
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
diff --git a/app/client/apps/goat/next-i18next.config.js b/app/client/apps/goat/next-i18next.config.js
index a03e210cb..4cf17bc04 100644
--- a/app/client/apps/goat/next-i18next.config.js
+++ b/app/client/apps/goat/next-i18next.config.js
@@ -1,5 +1,3 @@
-const path = require("path");
-
 /** @type {import("next-i18next").UserConfig} */
 const config = {
     i18n: {
diff --git a/app/client/turbo.json b/app/client/turbo.json
index ab4178374..5ae442956 100644
--- a/app/client/turbo.json
+++ b/app/client/turbo.json
@@ -35,6 +35,7 @@
     }
   },
   "globalEnv": [
+    "ANALYZE",
     "NEXT_PUBLIC_APP_URL",
     "NEXT_PUBLIC_API_URL",
     "NEXT_PUBLIC_MAP_TOKEN",