diff --git a/.github/workflows/index-general-search.yml b/.github/workflows/index-general-search.yml
index 3d8838ac5f47..f9df6b8c788e 100644
--- a/.github/workflows/index-general-search.yml
+++ b/.github/workflows/index-general-search.yml
@@ -19,7 +19,7 @@ on:
   schedule:
     - cron: '20 16 * * *' # Run every 24 hours at 20 minutes past the hour
   workflow_run:
-    workflows: ['Azure Production - Build and Deploy']
+    workflows: ['Purge Fastly']
     types:
       - completed
 
diff --git a/.github/workflows/notify-about-deployment.yml b/.github/workflows/notify-about-deployment.yml
index 1c2b8827c1ee..1849bdf540db 100644
--- a/.github/workflows/notify-about-deployment.yml
+++ b/.github/workflows/notify-about-deployment.yml
@@ -7,8 +7,7 @@ name: Notify about production deployment
 on:
   workflow_dispatch:
   workflow_run:
-    # Note, we could do this after the "Purge Fastly" finished
-    workflows: ['Azure Production - Build and Deploy']
+    workflows: ['Purge Fastly']
     types:
       - completed
 
diff --git a/.github/workflows/purge-fastly.yml b/.github/workflows/purge-fastly.yml
index 795bfb7c0e5f..b0415c6c44bd 100644
--- a/.github/workflows/purge-fastly.yml
+++ b/.github/workflows/purge-fastly.yml
@@ -16,10 +16,9 @@ on:
         description: "Comma separated languages. E.g. 'en,ja, es' (defaults to all)"
         required: false
         default: ''
-  workflow_run:
-    workflows: ['Azure Production - Build and Deploy']
-    types:
-      - completed
+  push:
+    branches:
+      - main
 
 permissions:
   contents: read
@@ -43,6 +42,23 @@ jobs:
 
       - uses: ./.github/actions/node-npm-setup
 
+      - name: Wait for production to match build number
+        run: |
+          needs=$(git rev-parse HEAD)
+          start_time=$(date +%s)
+          timeout_seconds=1200
+          while [[ $needs != $(curl -s --fail --retry-connrefused --retry 5 https://docs.github.com/_build) ]]
+          do
+            if [[ $(($(date +%s) - $start_time)) -gt $timeout_seconds ]]
+            then
+              echo "Production did not match the build number within $timeout_seconds seconds"
+              exit 1
+            fi
+            echo "Production is not up to date with the build commit"
+            sleep 10
+          done
+          echo "Production is up to date with the build commit"
+
       - name: Purge Fastly edge cache independent of language
         if: ${{ inputs.nuke_all }}
         run: npm run purge-fastly-edge-cache
diff --git a/ownership.yaml b/ownership.yaml
index fd23b50c4c67..a15e62d00c4e 100644
--- a/ownership.yaml
+++ b/ownership.yaml
@@ -9,6 +9,7 @@ ownership:
     description: Please use <https://catalog.githubapp.com/services/docs> instead.
     exec_sponsor: nerdneha
     product_manager: docs-bot
+    team_slack: docs
     qos: best_effort
     tier: 2
     sev1: