diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pages.yml
similarity index 67%
rename from .github/workflows/pr-preview.yml
rename to .github/workflows/pages.yml
index 11d72b0..bec5de1 100644
--- a/.github/workflows/pr-preview.yml
+++ b/.github/workflows/pages.yml
@@ -1,23 +1,36 @@
-name: Deploy PR Preview
+name: Deploy to GitHub Pages
 
 on:
+  # Deploy main branch to production
+  push:
+    branches: ["main"]
+
+  # Deploy PR previews
   pull_request:
     branches: ["main"]
     types: [opened, synchronize, reopened, closed]
 
+  # Allow manual deployment
+  workflow_dispatch:
+
 permissions:
   contents: write
   pull-requests: write
 
+concurrency:
+  group: pages-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
-  deploy-preview:
+  deploy:
+    # Skip on PR close events (handled by cleanup job)
     if: github.event.action != 'closed'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Deploy PR Preview
+      - name: Deploy to GitHub Pages
         uses: rossjrw/pr-preview-action@v1
         with:
           source-dir: ./docs
@@ -25,7 +38,8 @@ jobs:
           umbrella-dir: pr-previews
           action: auto
 
-  cleanup-preview:
+  cleanup:
+    # Only run when PR is closed
     if: github.event.action == 'closed'
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
deleted file mode 100644
index 8a4aa6a..0000000
--- a/.github/workflows/static.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Simple workflow for deploying static content to GitHub Pages
-name: Deploy static content to Pages
-
-on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: ["main"]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  # Single deploy job since we're just deploying
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Pages
-        uses: actions/configure-pages@v3
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          # Upload entire repository
-          path: './docs'
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2