diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml
index b700e92..cae84be 100644
--- a/.github/workflows/deploy-pages.yml
+++ b/.github/workflows/deploy-pages.yml
@@ -27,14 +27,25 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          working-directory: ./pages
+          ruby-version: '3.3' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
       - name: Setup Pages
         uses: actions/configure-pages@v5
+        id: pages
       - name: Build with Jekyll
-        uses: actions/jekyll-build-pages@v1
-        with:
-          source: ./pages
+        # Outputs to the './_site' directory by default
+        run: cd ./pages && bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: production
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
+        with:
+          path: ./pages/_site
 
   # Deployment job
   deploy:
diff --git a/pages/_config.yml b/pages/_config.yml
index 21862fb..f541bdc 100644
--- a/pages/_config.yml
+++ b/pages/_config.yml
@@ -24,7 +24,8 @@ description: A tool for monitoring BigIP Devices with Grafana, Prometheus, and O
 
 # Build settings
 theme: just-the-docs
-url: https://f5devcentral.github.io/application-study-tool/
+url: https://f5devcentral.github.io
+baseurl: /application-study-tool/
 
 aux_links:
   AST Repository: https://github.com/f5devcentral/application-study-tool/