diff --git a/.github/workflows/crawler.yml b/.github/workflows/crawler.yml
index a86585c6c61..7804a49f35e 100644
--- a/.github/workflows/crawler.yml
+++ b/.github/workflows/crawler.yml
@@ -2,11 +2,14 @@ name: Algolia Crawler
 on:
   push:
     branches: [ current ]
+
+  # Only used for testing within PR, delete before merge
   pull_request:
     types: ['opened', 'edited', 'reopened', 'synchronize']
 
 jobs:
   algolia_recrawl:
+    if: ${{ github.event.label.name == 'trigger-crawl' }}
     name: Trigger Algolia Crawl
     runs-on: ubuntu-latest
     steps:
@@ -18,11 +21,11 @@ jobs:
       - name: Get deployment URL
         id: deployment
         uses: dorshinar/get-deployment-url@master
-        timeout-minutes: 10
+        timeout-minutes: 15
         with:
           token: ${{ github.token }}
-          # Check for deploy URL every 30 seconds
-          retryInterval: '30000'
+          # Check for deploy URL every 20 seconds
+          retryInterval: '20000'
 
       # Once deploy URL is found, trigger Algolia crawl
       - name: Run Algolia Crawler