diff --git a/pages/gatsby.yml b/pages/gatsby.yml
index 9cdf3fc..4f2857d 100644
--- a/pages/gatsby.yml
+++ b/pages/gatsby.yml
@@ -57,7 +57,7 @@ jobs:
           cache: ${{ steps.detect-package-manager.outputs.manager }}
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v1
+        uses: actions/configure-pages@v2
         with:
           # Automatically inject pathPrefix in your Gatsby configuration file.
           #
diff --git a/pages/hugo.yml b/pages/hugo.yml
index da2f462..fb8c924 100644
--- a/pages/hugo.yml
+++ b/pages/hugo.yml
@@ -42,7 +42,7 @@ jobs:
           submodules: recursive
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v1
+        uses: actions/configure-pages@v2
       - name: Build with Hugo
         env:
           # For maximum backward compatibility with Hugo modules
@@ -51,7 +51,7 @@ jobs:
         run: |
           hugo \
             --minify \
-            --baseURL ${{ steps.pages.outputs.base_url }}
+            --baseURL "${{ steps.pages.outputs.base_url }}/"
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:
diff --git a/pages/jekyll-gh-pages.yml b/pages/jekyll-gh-pages.yml
index 7ee1e97..8c7a207 100644
--- a/pages/jekyll-gh-pages.yml
+++ b/pages/jekyll-gh-pages.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup Pages
-        uses: actions/configure-pages@v1
+        uses: actions/configure-pages@v2
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@v1
         with:
diff --git a/pages/jekyll.yml b/pages/jekyll.yml
index c3f7781..37ee818 100644
--- a/pages/jekyll.yml
+++ b/pages/jekyll.yml
@@ -40,12 +40,15 @@ jobs:
           cache-version: 0 # Increment this number if you need to re-download cached gems
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v1
-      - run: bundle exec jekyll build --baseurl ${{ steps.pages.outputs.base_path }} # defaults output to '/_site'
+        uses: actions/configure-pages@v2
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
         env:
           JEKYLL_ENV: production
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1 # This will automatically upload an artifact from the '/_site' directory
+        # Automatically uploads an artifact from the './_site' directory by default
+        uses: actions/upload-pages-artifact@v1
 
   # Deployment job
   deploy:
diff --git a/pages/nextjs.yml b/pages/nextjs.yml
index 79a1cc8..5c2bf67 100644
--- a/pages/nextjs.yml
+++ b/pages/nextjs.yml
@@ -53,8 +53,7 @@ jobs:
           node-version: "16"
           cache: ${{ steps.detect-package-manager.outputs.manager }}
       - name: Setup Pages
-        id: pages
-        uses: actions/configure-pages@v1
+        uses: actions/configure-pages@v2
         with:
           # Automatically inject basePath in your Next.js configuration file and disable
           # server side image optimization (https://nextjs.org/docs/api-reference/next/image#unoptimized).
diff --git a/pages/nuxtjs.yml b/pages/nuxtjs.yml
index 87c1201..4178f18 100644
--- a/pages/nuxtjs.yml
+++ b/pages/nuxtjs.yml
@@ -51,8 +51,7 @@ jobs:
           node-version: "16"
           cache: ${{ steps.detect-package-manager.outputs.manager }}
       - name: Setup Pages
-        id: pages
-        uses: actions/configure-pages@v1
+        uses: actions/configure-pages@v2
         with:
           # Automatically inject router.base in your Nuxt configuration file and set
           # target to static (https://nuxtjs.org/docs/configuration-glossary/configuration-target/).
diff --git a/pages/static.yml b/pages/static.yml
index 350b2c8..9e0e871 100644
--- a/pages/static.yml
+++ b/pages/static.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup Pages
-        uses: actions/configure-pages@v1
+        uses: actions/configure-pages@v2
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with: