diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
index d5dc997..454fb37 100644
--- a/.github/workflows/jekyll.yml
+++ b/.github/workflows/jekyll.yml
@@ -50,7 +50,7 @@ jobs:
         run: npm clean-install
       - name: Build with Jekyll
         # Outputs to the './_site' directory by default
-        run: bundle exec jekyll build --trace --baseurl "${{ github.ref_name == github.event.repository.default_branch && steps.pages.outputs.base_path || github.ref_name}}"
+        run: bundle exec jekyll build --trace --baseurl "${{steps.pages.outputs.base_path}}/${{ github.ref_name != github.event.repository.default_branch && github.ref_name}}"
         env:
           JEKYLL_ENV: production
       - name: Upload artifact
@@ -61,7 +61,7 @@ jobs:
   deploy:
     environment:
       name: github-pages
-      url: "${{ github.ref_name == github.event.repository.default_branch && steps.pages.outputs.base_path || github.ref_name}}"
+      url: "${{steps.pages.outputs.base_path}}/${{ github.ref_name != github.event.repository.default_branch && github.ref_name}}"
     runs-on: ubuntu-latest
     needs: build
     steps: