diff --git a/.github/workflows/publish-book.yml b/.github/workflows/publish-book.yml
deleted file mode 100644
index 377325a..0000000
--- a/.github/workflows/publish-book.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Deploy book
-on:
-  push:
-    paths: ["**"]
-    branches:
-      - main
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write # To push a branch
-      pull-requests: write # To create a PR from that branch
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Install mdbook
-        run: |
-          mkdir mdbook
-          curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.35/mdbook-v0.4.35-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
-          echo `pwd`/mdbook >> $GITHUB_PATH
-      - name: Install mdbook-admonish
-        run: |
-          cargo install mdbook-admonish --vers "1.14.0" --locked
-          mdbook-admonish install ./
-      - name: Deploy GitHub Pages
-        run: |
-          mdbook build
-          git worktree add gh-pages
-          git config user.name "Deploy book from CI"
-          git config user.email ""
-          cd gh-pages
-          # Delete the ref to avoid keeping history.
-          git update-ref -d refs/heads/gh-pages
-          rm -rf *
-          mv ../book/* .
-          git add .
-          git commit -m "Deploy book $GITHUB_SHA to gh-pages"
-          git push --force --set-upstream origin gh-pages
diff --git a/.github/workflows/publish_mdbook.yml b/.github/workflows/publish_mdbook.yml
new file mode 100644
index 0000000..96f6483
--- /dev/null
+++ b/.github/workflows/publish_mdbook.yml
@@ -0,0 +1,62 @@
+name: Deploy Leptos Book 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:
+
+  # Job: Build and Deploy to Pages
+  build-and-deploy:
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    env:
+      MDBOOK_VERSION: 0.4.36
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install mdBook
+        run: |
+          curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf -y | sh
+          rustup update
+          cargo install --version ${MDBOOK_VERSION} mdbook
+
+      - name: Install mdbook-admonish
+        run: |
+          cargo install mdbook-admonish --vers "1.14.0" --locked
+          mdbook-admonish install ./
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v4
+
+      - name: Build with mdBook
+        run: mdbook build
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: ./book
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v3