diff --git a/.github/workflows/csharp-server.yml b/.github/workflows/csharp-server.yml
index a2a8335..5d587dd 100644
--- a/.github/workflows/csharp-server.yml
+++ b/.github/workflows/csharp-server.yml
@@ -54,7 +54,7 @@ jobs:
 
   deploy-runner-fleet:
     name: One-shot runner fleet deployment
-    if: github.event_name == 'pull_request' && github.head_ref == 'ops/deploy-runner-fleet-20260818'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[deploy-runner-fleet]')
     runs-on: [self-hosted, Linux, X64, co-server]
     concurrency:
       group: one-shot-runner-fleet-deployment