diff --git a/.github/files/test-plugin-update/prepare-zips.sh b/.github/files/test-plugin-update/prepare-zips.sh
index 25db0f067af2..7f1830014c1f 100755
--- a/.github/files/test-plugin-update/prepare-zips.sh
+++ b/.github/files/test-plugin-update/prepare-zips.sh
@@ -16,7 +16,7 @@ while IFS=$'\t' read -r SRC MIRROR SLUG; do
 	echo "::endgroup::"
 
 	echo "::group::Fetching $SLUG-trunk.zip..."
-	BETASLUG="$(jq -r '.extra["beta-plugin-slug"] // .extra["wp-plugin-slug"] // ""' "monorepo/$SRC/composer.json")"
+	BETASLUG="$(jq -r '.extra["beta-plugin-slug"] // .extra["wp-plugin-slug"] // ""' "commit/$SRC/composer.json")"
 	if [[ -z "$BETASLUG" ]]; then
 		echo "No beta-plugin-slug or wp-plugin-slug in composer.json, skipping"
 	else
diff --git a/.github/files/test-plugin-update/setup.sh b/.github/files/test-plugin-update/setup.sh
index 7d844aaf392c..97e77648cedd 100755
--- a/.github/files/test-plugin-update/setup.sh
+++ b/.github/files/test-plugin-update/setup.sh
@@ -28,5 +28,5 @@ echo "::group::Install WordPress"
 wp --allow-root core install --url="$WP_DOMAIN" --title="$WP_TITLE" --admin_user="$WP_ADMIN_USER" --admin_password="$WP_ADMIN_PASSWORD" --admin_email="$WP_ADMIN_EMAIL" --skip-email
 rm -f index.html
 mkdir -p wp-content/mu-plugins
-cp "$GITHUB_WORKSPACE/monorepo/.github/files/test-plugin-update/mu-plugin.php" wp-content/mu-plugins/hack.php
+cp "$GITHUB_WORKSPACE/trunk/.github/files/test-plugin-update/mu-plugin.php" wp-content/mu-plugins/hack.php
 echo "::endgroup::"
diff --git a/.github/files/test-plugin-update/test.sh b/.github/files/test-plugin-update/test.sh
index fa019e354974..8e393079e00f 100755
--- a/.github/files/test-plugin-update/test.sh
+++ b/.github/files/test-plugin-update/test.sh
@@ -2,7 +2,7 @@
 
 set -eo pipefail
 
-source "$GITHUB_WORKSPACE/monorepo/.github/files/gh-funcs.sh"
+source "$GITHUB_WORKSPACE/trunk/.github/files/gh-funcs.sh"
 
 ZIPDIR="$GITHUB_WORKSPACE/zips"
 EXIT=0
diff --git a/.github/workflows/post-build.yml b/.github/workflows/post-build.yml
index 155ec5bdfb8c..6ecb1a2c89f8 100644
--- a/.github/workflows/post-build.yml
+++ b/.github/workflows/post-build.yml
@@ -208,11 +208,15 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          path: monorepo
+          path: trunk
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.workflow_run.head_commit.id }}
+          path: commit
 
       - name: Get token
         id: get_token
-        uses: ./monorepo/.github/actions/gh-app-token
+        uses: ./trunk/.github/actions/gh-app-token
         env:
           # Work around a weird node 16/openssl 3 issue in the docker env
           OPENSSL_CONF: '/dev/null'
@@ -221,7 +225,7 @@ jobs:
           private_key: ${{ secrets.JP_LAUNCH_CONTROL_KEY }}
 
       - name: Notify check in progress
-        uses: ./monorepo/.github/actions/check-run
+        uses: ./trunk/.github/actions/check-run
         with:
           id: ${{ needs.setup.outputs.upgrade_check }}
           status: in_progress
@@ -255,19 +259,19 @@ jobs:
           tar --xz -xvvf build.tar.xz
 
       - name: Setup WordPress
-        run: monorepo/.github/files/test-plugin-update/setup.sh
+        run: trunk/.github/files/test-plugin-update/setup.sh
 
       - name: Prepare plugin zips
         id: zips
-        run: monorepo/.github/files/test-plugin-update/prepare-zips.sh
+        run: trunk/.github/files/test-plugin-update/prepare-zips.sh
 
       - name: Test upgrades
         id: tests
-        run: monorepo/.github/files/test-plugin-update/test.sh
+        run: trunk/.github/files/test-plugin-update/test.sh
 
       - name: Notify final status
         if: always()
-        uses: ./monorepo/.github/actions/check-run
+        uses: ./trunk/.github/actions/check-run
         with:
           id: ${{ needs.setup.outputs.upgrade_check }}
           conclusion: ${{ job.status }}