diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 2da8f8f..0000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Build
-
-on:
-  pull_request:
-    branches:
-      - master
-      - exampleSite
-  workflow_dispatch:
-    # manual run
-    inputs:
-      hugoVersion:
-        description: "Hugo Version"
-        required: false
-        default: "0.83.0"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git checkout
-        uses: actions/checkout@v2
-        with:
-          ref: exampleSite
-
-      - name: Get Theme
-        run: git submodule update --init --recursive
-
-      - name: Update theme to Latest commit
-        run: git submodule update --remote --merge
-
-      - name: Setup hugo
-        uses: peaceiris/actions-hugo@v2
-        with:
-          hugo-version: "${{ github.event.inputs.hugoVersion }}"
-
-      - name: Build
-        run: hugo --buildDrafts --gc --verbose --minify
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 75033f8..305a6de 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -1,4 +1,4 @@
-name: Build GH-Pages
+name: Deploy Hugo PaperMod Demo to Pages
 
 on:
   push:
@@ -17,31 +17,64 @@ on:
         required: false
         default: "0.83.0"
 
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+# Default to bash
+defaults:
+  run:
+    shell: bash
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
 jobs:
-  deploy:
+  # Build job
+  build:
     runs-on: ubuntu-latest
+    env:
+      HUGO_VERSION: "0.83.0"
     steps:
-      - name: Git checkout
-        uses: actions/checkout@v2
+      - name: Check version
+        if: ${{ github.event.inputs.hugoVersion }}
+        run: export HUGO_VERSION="${{ github.event.inputs.hugoVersion }}"
+      - name: Install Hugo CLI
+        run: |
+          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.deb \
+          && sudo dpkg -i ${{ runner.temp }}/hugo.deb
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: exampleSite
-
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v1
       - name: Get Theme
         run: git submodule update --init --recursive
-
       - name: Update theme to Latest commit
         run: git submodule update --remote --merge
-
-      - name: Setup hugo
-        uses: peaceiris/actions-hugo@v2
+      - name: Build with Hugo
+        run: |
+          hugo \
+            --buildDrafts --gc --verbose \
+            --baseURL ${{ steps.pages.outputs.base_url }}
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
         with:
-          hugo-version: "${{ github.event.inputs.hugoVersion }}"
-
-      - name: Build
-        run: hugo --buildDrafts --gc --verbose --minify
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.TOKEN }}
-          publish_dir: ./public
+          path: ./public
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1