diff --git a/.github/workflows/macos-probe.yml b/.github/workflows/macos-probe.yml
deleted file mode 100644
index 1f33856..0000000
--- a/.github/workflows/macos-probe.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Temporary diagnostic: minimal repro for the 2026-06-12 macOS setup-php
-# failures across the extension repos. Dispatch manually; delete when
-# upstream recovers.
-name: macOS probe
-on: workflow_dispatch
-jobs:
-  v2:
-    runs-on: macos-14
-    steps:
-      - uses: shivammathur/setup-php@v2
-        with: {php-version: '8.4'}
-      - run: php -v
-  v2371:
-    runs-on: macos-14
-    steps:
-      - uses: shivammathur/setup-php@2.37.1
-        with: {php-version: '8.4'}
-      - run: php -v
-  v2360:
-    runs-on: macos-14
-    steps:
-      - uses: shivammathur/setup-php@2.36.0
-        with: {php-version: '8.4'}
-      - run: php -v
diff --git a/template/managed/.github/workflows/ci.yml b/template/managed/.github/workflows/ci.yml
index 2199bf1..0719753 100644
--- a/template/managed/.github/workflows/ci.yml
+++ b/template/managed/.github/workflows/ci.yml
@@ -32,11 +32,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y {{APT_DEPS}}
 
-      # Pinned to 2.36.0: setup-php 2.37.x stopped installing PHP on the
-      # macos-14 runners on 2026-06-12 (empty-variable cascade inside its
-      # brew path; minimal repro in ext-template's "macOS probe" workflow).
-      # Re-probe and unpin when upstream ships a fix.
-      - uses: shivammathur/setup-php@2.36.0
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: '8.4'
           tools: none
@@ -62,13 +58,6 @@ jobs:
         # 8.5 is the current stable; 8.4 is the most-deployed; 8.3 is
         # security-only through end of 2026 but still widely installed.
         php: ['8.3', '8.4', '8.5']
-        exclude:
-          # setup-php cannot currently install PHP 8.5 on the macos-14
-          # runners (2026-06-12: 2.37.x fails for every PHP version there,
-          # and 2.36.0 predates 8.5). Re-add this leg when ext-template's
-          # "macOS probe" workflow passes on @v2 again.
-          - os: macos-14
-            php: '8.5'
     steps:
       - uses: actions/checkout@v4
 
@@ -83,11 +72,7 @@ jobs:
         # `true` when the extension needs nothing beyond Xcode CLT.
         run: {{BREW_INSTALL}}
 
-      # Pinned to 2.36.0: setup-php 2.37.x stopped installing PHP on the
-      # macos-14 runners on 2026-06-12 (empty-variable cascade inside its
-      # brew path; minimal repro in ext-template's "macOS probe" workflow).
-      # Re-probe and unpin when upstream ships a fix.
-      - uses: shivammathur/setup-php@2.36.0
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           tools: none
diff --git a/template/managed/.github/workflows/release.yml b/template/managed/.github/workflows/release.yml
index 4b56832..521424e 100644
--- a/template/managed/.github/workflows/release.yml
+++ b/template/managed/.github/workflows/release.yml
@@ -146,11 +146,7 @@ jobs:
         if: runner.os == 'macOS'
         run: {{BREW_INSTALL}}
 
-      # Pinned to 2.36.0: setup-php 2.37.x stopped installing PHP on the
-      # macos-14 runners on 2026-06-12 (empty-variable cascade inside its
-      # brew path; minimal repro in ext-template's "macOS probe" workflow).
-      # Re-probe and unpin when upstream ships a fix.
-      - uses: shivammathur/setup-php@2.36.0
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           tools: none