diff --git a/.github/workflows/real-time-benchmark.yml b/.github/workflows/real-time-benchmark.yml
index 54362f0157e0..1c2067ad7a3c 100644
--- a/.github/workflows/real-time-benchmark.yml
+++ b/.github/workflows/real-time-benchmark.yml
@@ -131,18 +131,6 @@ jobs:
           repository: php/real-time-benchmark-data
           ssh-key: ${{ secrets.PHP_VERSION_BENCHMARK_RESULTS_DEPLOY_KEY }}
           path: 'php-version-benchmarks/docs/results'
-      - name: Setup infra config
-        run: |
-          set -e
-
-          cp ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini.dist ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
-          ESCAPED_DOCKER_REGISTRY=$(printf '%s\n' "${{ secrets.PHP_VERSION_BENCHMARK_DOCKER_REGISTRY }}" | sed -e 's/[\/&]/\\&/g')
-          sed -i "s/INFRA_DOCKER_REGISTRY=public.ecr.aws\/abcdefgh/INFRA_DOCKER_REGISTRY=$ESCAPED_DOCKER_REGISTRY/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
-          sed -i "s/INFRA_MEASURE_INSTRUCTION_COUNT=0/INFRA_MEASURE_INSTRUCTION_COUNT=${{ env.INSTRUCTION_COUNT }}/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
-          cp ./php-version-benchmarks/build/infrastructure/config/aws.tfvars.dist ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
-          sed -i 's/access_key = ""/access_key = "${{ secrets.PHP_VERSION_BENCHMARK_AWS_ACCESS_KEY }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
-          sed -i 's/secret_key = ""/secret_key = "${{ secrets.PHP_VERSION_BENCHMARK_AWS_SECRET_KEY }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
-          sed -i 's/github_token = ""/github_token = "${{ secrets.GITHUB_TOKEN }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
       - name: Setup PHP config - baseline PHP version
         run: |
           set -e
@@ -153,7 +141,7 @@ jobs:
             PHP_NAME="PHP - baseline@$BASELINE_SHORT_SHA"
             PHP_ID=php_baseline
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=${{ env.BASELINE_COMMIT }}
 
@@ -170,7 +158,7 @@ jobs:
             PHP_NAME="PHP - baseline@$BASELINE_SHORT_SHA (JIT)"
             PHP_ID=php_baseline_jit
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=${{ env.BASELINE_COMMIT }}
 
@@ -191,11 +179,13 @@ jobs:
             LAST_RESULT_SHA="$(cd ./php-version-benchmarks/tmp/php_${{ env.ID }}/ && git --no-pager log --until="$YESTERDAY" -n 1 --pretty='%H')"
           fi
 
+          echo "LAST_RESULT_SHA=$LAST_RESULT_SHA" >> $GITHUB_ENV
+
           cat << EOF > ./php-version-benchmarks/config/php/previous.ini
             PHP_NAME="PHP - previous ${{ env.BRANCH }}"
             PHP_ID=php_previous
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=$LAST_RESULT_SHA
 
@@ -209,7 +199,7 @@ jobs:
             PHP_NAME="PHP - ${{ env.BRANCH }}"
             PHP_ID=php_${{ env.ID }}
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=${{ env.COMMIT }}
 
@@ -224,7 +214,7 @@ jobs:
             PHP_NAME="PHP - ${{ env.BRANCH }} (JIT)"
             PHP_ID=php_${{ env.ID }}_jit
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=${{ env.COMMIT }}
 
@@ -244,6 +234,32 @@ jobs:
           if [ "${{ env.RUN_MICRO_BENCH }}" -eq "1" ]; then
             cp ./php-version-benchmarks/config/test/6_micro_bench.php.ini.dist ./php-version-benchmarks/config/test/6_micro_bench.php.ini
           fi
+      - name: Setup infra config
+        run: |
+          set -e
+
+          cp ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini.dist ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
+          ESCAPED_DOCKER_REGISTRY=$(printf '%s\n' "${{ secrets.PHP_VERSION_BENCHMARK_DOCKER_REGISTRY }}" | sed -e 's/[\/&]/\\&/g')
+          sed -i "s/INFRA_DOCKER_REGISTRY=public.ecr.aws\/abcdefgh/INFRA_DOCKER_REGISTRY=$ESCAPED_DOCKER_REGISTRY/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
+          sed -i "s/INFRA_MEASURE_INSTRUCTION_COUNT=0/INFRA_MEASURE_INSTRUCTION_COUNT=${{ env.INSTRUCTION_COUNT }}/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
+          cp ./php-version-benchmarks/build/infrastructure/config/aws.tfvars.dist ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's/access_key = ""/access_key = "${{ secrets.PHP_VERSION_BENCHMARK_AWS_ACCESS_KEY }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's/secret_key = ""/secret_key = "${{ secrets.PHP_VERSION_BENCHMARK_AWS_SECRET_KEY }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's/github_token = ""/github_token = "${{ secrets.GITHUB_TOKEN }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+
+          WORKFLOW_RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          sed -i 's|log_url = ""|log_url = "$WORKFLOW_RUN_URL"|g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's|artifact_url = ""|artifact_url = "#ARTIFACT_URL#"|g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            BASE_COMMIT="${{ env.BASELINE_COMMIT }}"
+          else
+            BASE_COMMIT="${{ env.LAST_RESULT_SHA }}"
+          fi
+          CHANGESET_URL="${{ github.server_url }}/${{ github.repository }}/compare/$BASE_COMMIT..${{ env.COMMIT }}"
+
+          sed -i 's|extra_title = ""|extra_title = "Changeset"|g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's|extra_text = ""|extra_text = "$CHANGESET_URL"|g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
       - name: Run benchmark
         run: ./php-version-benchmarks/benchmark.sh run aws
       - name: Store results
@@ -264,7 +280,7 @@ jobs:
           git commit -m "Add result for ${{ github.repository }}@${{ github.sha }}"
           git push
       - name: Upload artifacts
-        if: github.event_name == 'workflow_dispatch'
+        id: upload
         uses: actions/upload-artifact@v6
         with:
           name: results
@@ -278,6 +294,7 @@ jobs:
         run: |
           cd ./php-version-benchmarks/tmp/php_${{ env.ID }}
           NEWEST_RESULT_DIRECTORY=$(ls -td ${{ github.workspace }}/php-version-benchmarks/docs/results/${{ env.YEAR }}/*/ | head -1)
+          sed -i "s|#ARTIFACT_URL#|${{ steps.upload.outputs.artifact-url }}|g" "${NEWEST_RESULT_DIRECTORY}result.md"
           gh pr comment ${{ inputs.pull_request }} --body-file "${NEWEST_RESULT_DIRECTORY}result.md" --repo ${{ github.repository }}
       - name: Cleanup
         if: always()