diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aea3d0a..b2bf9d9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,9 +19,9 @@ jobs:
       pull-requests: write
 
     env:
-      PR_PATH: ${{ github.event.repository.name }}/pull/${{github.event.number}}
-      DOMAIN: gradle.github.io
+      PREVIEW_DOMAIN: gradle.github.io
       PREVIEW_REPO: community-site-preview
+      PREVIEW_PATH: ${{ github.event.repository.name }}/pull/${{github.event.number}}
 
     steps:
       - name: Checkout
@@ -47,7 +47,7 @@ jobs:
           deploy_key: ${{ secrets.PREVIEW_DEPLOYMENT_KEY }}
           external_repository: gradle/${{ env.PREVIEW_REPO }}
           publish_dir: ./_site
-          destination_dir: ${{ env.PR_PATH }}
+          destination_dir: ${{ env.PREVIEW_PATH }}
 
       - name: Update comment
         uses: hasura/comment-progress@v2.2.0
@@ -60,6 +60,6 @@ jobs:
           message: > 
             A preview of ${{ github.event.after }} is uploaded and can be seen here:
             
-            ✨ https://${{ env.DOMAIN }}/${{ env.PREVIEW_REPO }}/${{ env.PR_PATH}}/ ✨
+            ✨ https://${{ env.PREVIEW_DOMAIN }}/${{ env.PREVIEW_REPO }}/${{ env.PREVIEW_PATH}}/ ✨
             
             Changes may take a few minutes to propagate. 
diff --git a/.github/workflows/preview-cleanup.yml b/.github/workflows/preview-cleanup.yml
index cc23212..875ff0e 100644
--- a/.github/workflows/preview-cleanup.yml
+++ b/.github/workflows/preview-cleanup.yml
@@ -7,9 +7,9 @@ jobs:
   delete_preview:
     runs-on: ubuntu-20.04
     env:
-      PR_PATH: ${{ github.event.repository.name }}/pull/${{github.event.number}}
-      DOMAIN: gradle.github.io
+      PREVIEW_DOMAIN: gradle.github.io
       PREVIEW_REPO: community-site-preview
+      PREVIEW_PATH: ${{ github.event.repository.name }}/pull/${{github.event.number}}
 
     permissions:
       pull-requests: write
@@ -23,8 +23,7 @@ jobs:
         with:
           deploy_key: ${{ secrets.PREVIEW_DEPLOYMENT_KEY }}
           external_repository: gradle/${{ env.PREVIEW_REPO }}
-          publish_dir: ./public
-          destination_dir: ${{ env.PR_PATH }}
+          destination_dir: ${{ env.PREVIEW_PATH }}
 
       - name: Comment on PR
         uses: hasura/comment-progress@v2.2.0
@@ -34,4 +33,4 @@ jobs:
           number: ${{ github.event.number }}
           id: deploy-preview
           message: > 
-            🪓 PR closed, deleted preview at https://github.com/${{ env.PREVIEW_REPO }}/tree/gh-pages/${{ env.PR_PATH }}/
+            🪓 PR closed, deleted preview at https://github.com/${{ env.PREVIEW_REPO }}/tree/gh-pages/${{ env.PPREVIEW_PATH }}/