diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 33580d5f8..5adf4f2fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,16 +80,3 @@ jobs:
 
       - name: Test in legacy mode
         run: CONCURRENT_MODE=0 yarn test:ci
-
-  test-website:
-    runs-on: ubuntu-latest
-    name: Test Website
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js and website deps
-        uses: ./.github/actions/setup-website-deps
-
-      - name: Build website
-        run: yarn --cwd website build
diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/website.yml
similarity index 69%
rename from .github/workflows/deploy-website.yml
rename to .github/workflows/website.yml
index 0a39db159..2fcbe3875 100644
--- a/.github/workflows/deploy-website.yml
+++ b/.github/workflows/website.yml
@@ -4,10 +4,31 @@ on:
   push:
     branches: [main]
     paths: ['website/**']
+  pull_request:
+    branches: ['**']
+    paths: ['website/**']
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'main')}}
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Test Website
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js and website deps
+        uses: ./.github/actions/setup-website-deps
+
+      - name: Build website
+        run: yarn --cwd website build
+
   deploy:
     name: Deploy to GitHub Pages
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -25,7 +46,6 @@ jobs:
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          # Build output to publish to the `gh-pages` branch:
           publish_dir: ./website/build
           # The following lines assign commit authorship to the official
           # GH-Actions bot for deploys to `gh-pages` branch:
@@ -33,4 +53,4 @@ jobs:
           # The GH actions bot is used by default if you didn't specify the two fields.
           # You can swap them out with your own user credentials.
           user_name: github-actions[bot]
-          user_email: 41898282+github-actions[bot]@users.noreply.github.com
+          user_email: 41898282+github-actions[bot]@users.noreply.github.com
\ No newline at end of file