diff --git a/.github/workflows/deploy-blossom.yml b/.github/workflows/deploy-blossom.yml
new file mode 100644
index 0000000..4c59f0b
--- /dev/null
+++ b/.github/workflows/deploy-blossom.yml
@@ -0,0 +1,41 @@
+name: Deploy to Blossom
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["main"]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  # Single deploy job
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: npm
+
+      - name: Install dependencies and build
+        run: |
+          npm install
+          npm run build
+
+      - name: Create deployment environment file
+        run: |
+          cat > .env.nostr-deploy.local << EOF
+          BASE_DOMAIN=${{ secrets.BASE_DOMAIN }}
+          BLOSSOM_SERVERS=${{ secrets.BLOSSOM_SERVERS }}
+          NOSTR_PRIVATE_KEY=${{ secrets.NOSTR_PRIVATE_KEY }}
+          NOSTR_PUBLIC_KEY=${{ secrets.NOSTR_PUBLIC_KEY }}
+          NOSTR_RELAYS=${{ secrets.NOSTR_RELAYS }}
+          EOF
+
+      - name: Upload to Blossom
+        run: |
+          npm run deploy
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4c59f0b..19ef0a0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,15 +1,31 @@
-name: Deploy to Blossom
+name: Deploy to GitHub 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
   deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -25,17 +41,16 @@ jobs:
         run: |
           npm install
           npm run build
+          cp dist/index.html dist/404.html
 
-      - name: Create deployment environment file
-        run: |
-          cat > .env.nostr-deploy.local << EOF
-          BASE_DOMAIN=${{ secrets.BASE_DOMAIN }}
-          BLOSSOM_SERVERS=${{ secrets.BLOSSOM_SERVERS }}
-          NOSTR_PRIVATE_KEY=${{ secrets.NOSTR_PRIVATE_KEY }}
-          NOSTR_PUBLIC_KEY=${{ secrets.NOSTR_PUBLIC_KEY }}
-          NOSTR_RELAYS=${{ secrets.NOSTR_RELAYS }}
-          EOF
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
 
-      - name: Upload to Blossom
-        run: |
-          npm run deploy
\ No newline at end of file
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: dist
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/src/AppRouter.tsx b/src/AppRouter.tsx
index 872c174..fe643f7 100644
--- a/src/AppRouter.tsx
+++ b/src/AppRouter.tsx
@@ -17,7 +17,7 @@ import HomePage from "./pages/HomePage";
 
 export function AppRouter() {
   return (
-    <BrowserRouter>
+    <BrowserRouter basename={import.meta.env.BASE_URL}>
       <ScrollToTop />
       <Layout>
         <Routes>
diff --git a/vite.config.ts b/vite.config.ts
index be44444..ddedd88 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,7 +5,8 @@ import { VitePWA } from 'vite-plugin-pwa';
 import { defineConfig } from "vitest/config";
 
 // https://vitejs.dev/config/
-export default defineConfig(() => ({
+export default defineConfig(({ mode }) => ({
+  base: mode === 'production' && process.env.GITHUB_ACTIONS ? '/zelo-news/' : '/',
   server: {
     host: "::",
     port: 8080,