diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 8b863cfd4..fc56f158f 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -43,10 +43,11 @@ Required environment secrets:
 
 Required shared secret:
 
-1. **TS_AUTHKEY**
-   - Tailscale auth key used by the governed demo deploy/update workflows before SSH
+1. **TS_OAUTH_CLIENT_ID** and **TS_OAUTH_SECRET**
+   - Tailscale OAuth client (business tailnet `tawny-powan.ts.net`, scope Auth Keys write, tag `tag:infra`) used by the governed demo deploy/update workflows before SSH
+   - The action mints an ephemeral, pre-authorized, tagged node key per run, so runners join and garbage-collect themselves; unlike the retired static `TS_AUTHKEY`, the OAuth secret does not expire every 90 days
    - Allows GitHub-hosted runners to reach private demo targets such as the stable `pulse-relay` Tailscale host
-   - May be stored as a repository secret or repeated in the selected environment if desired
+   - May be stored as repository secrets or repeated in the selected environment if desired
 
 Required environment variables:
 
diff --git a/.github/workflows/deploy-demo-server.yml b/.github/workflows/deploy-demo-server.yml
index 3f0e0ac59..9321be24f 100644
--- a/.github/workflows/deploy-demo-server.yml
+++ b/.github/workflows/deploy-demo-server.yml
@@ -135,7 +135,9 @@ jobs:
       - name: Tailscale
         uses: tailscale/github-action@4e4c49acaa9818630ce0bd7a564372c17e33fb4d # v2
         with:
-          authkey: ${{ secrets.TS_AUTHKEY }}
+          oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
+          oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
+          tags: tag:infra
 
       - name: Setup SSH
         env:
diff --git a/.github/workflows/update-demo-server.yml b/.github/workflows/update-demo-server.yml
index acd10c13b..16f095199 100644
--- a/.github/workflows/update-demo-server.yml
+++ b/.github/workflows/update-demo-server.yml
@@ -242,7 +242,9 @@ jobs:
       - name: Tailscale
         uses: tailscale/github-action@4e4c49acaa9818630ce0bd7a564372c17e33fb4d # v2
         with:
-          authkey: ${{ secrets.TS_AUTHKEY }}
+          oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
+          oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
+          tags: tag:infra
 
       - name: Setup SSH
         env: