diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 82e38d0..67e1d5b 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build-production:
     runs-on: ubuntu-24.04
-    if: github.ref_name == github.event.repository.default_branch
+    if: github.event_name == 'pull_request' || github.ref_name == github.event.repository.default_branch
     name: Build and push production image
     permissions:
       contents: read
diff --git a/gocd/pipelines/reload.yaml b/gocd/pipelines/reload.yaml
index 385b677..158b194 100644
--- a/gocd/pipelines/reload.yaml
+++ b/gocd/pipelines/reload.yaml
@@ -25,13 +25,14 @@ pipelines:
                   jobs:
                       checks:
                           environment_variables:
-                              # Required for checkruns.
-                              GITHUB_TOKEN: "{{SECRET:[devinfra-github][token]}}"
+                              # Required for checkruns2.
+                              GITHUB_APP_ID: "{{SECRET:[devinfra-github][app_id]}}"
+                              GITHUB_APP_PRIVATE_KEY: "{{SECRET:[devinfra-github][private_key]}}"
                           timeout: 1200
                           elastic_profile_id: reload
                           tasks:
                               - script: |
-                                    checks-githubactions-checkruns \
+                                    checks-githubactions-checkruns2 \
                                     getsentry/reload \
                                     ${GO_REVISION_RELOAD_REPO} \
                                     "Build and push production image"