diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
index cc24aea..4ea8f58 100644
--- a/.github/workflows/build-site.yml
+++ b/.github/workflows/build-site.yml
@@ -3,22 +3,41 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+defaults:
+  run:
+    shell: bash
+
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      HUGO_VERSION: 0.108.0
+      NODE_VERSION: 18.12.1
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
+          fetch-depth: 0
+      - name: Setup pages
+        id: pages
+        uses: actions/configure-pages@v2
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: lts/*
+          node-version: "${{ env.NODE_VERSION }}"
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: "latest"
+          hugo-version: "${{ env.HUGO_VERSION }}"
           extended: true
       - name: Configure npm
         run: |
@@ -29,16 +48,18 @@ jobs:
           npm -g install postcss-cli
       - name: Install npm packages
         run: |
-          npm install
+          npm ci
       - name: Run Hugo
         run: |
           hugo --environment production --minify
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: ./public
       - name: Deploy to gh-pages
-        if: ${{ !env.ACT }}
-        uses: rdarida/simple-github-pages-deploy-action@v1
+        if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
+        uses: peaceiris/actions-gh-pages@v3
         with:
-          git-user: "MillironX"
-          git-email: "25492070+MillironX@users.noreply.github.com"
-          git-base-folder: "public"
-          commit-message: "Build and deploy"
-          branch: "gh-pages"
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          publish_dir: ./public
+          cname: millironx.com