diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a51063c..dd1ddec 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -13,6 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     container: ruby:2.7.2
 
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+      url: ${{steps.deployment.outputs.page_url}}
+
     name: Build and Deploy Beer-Garden.io
     steps:
       - uses: actions/checkout@v2
@@ -36,10 +45,12 @@ jobs:
         env:
           NOKOGIRI_USE_SYSTEM_LIBRARIES: true
 
-      - name: Deploy to GitHub Pages
-        uses: crazy-max/ghaction-github-pages@v4
+      - name: Upload Artifact
+        uses: actions/upload-pages-artifact@v2
         with:
-          target_branch: gh-pages
-          build_dir: public
-        env:
-          GITHUB_TOKEN: ${{ secrets.BUILDBOT_PAGES }}
+          path: 'public'
+      
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 2352b64..29b158e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,8 +6,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
     asciidoctor (1.5.6.1)
     ast (2.4.1)
@@ -59,7 +59,8 @@ GEM
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
     formatador (0.2.5)
-    git (1.7.0)
+    git (1.13.1)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
     guard (2.16.2)
       formatador (>= 0.2.4)