diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml
index ecd2e43d7b..3b303847a8 100644
--- a/.github/workflows/publish-to-test-pypi.yml
+++ b/.github/workflows/publish-to-test-pypi.yml
@@ -54,28 +54,11 @@ jobs:
         fi
 
         # Get the run ID of the triggered workflow
-        max_attempts=60  # Try for up to 1 minute
-        attempt=1
-        while true; do
-          sleep 1
-          run_id=$(curl -s -H "authorization: Bearer ${{ secrets.PAT_TOKEN }}" \
-                   "https://api.github.com/repos/meta-llama/llama-stack-client-python/actions/runs?event=repository_dispatch" \
-                   | jq '.workflow_runs[0].id')
-
-          if [ "$run_id" != "null" ] && [ -n "$run_id" ]; then
-            echo "Found workflow ID: $run_id"
-            echo "workflow_id=$run_id" >> $GITHUB_OUTPUT
-            break
-          fi
-
-          if [ $attempt -ge $max_attempts ]; then
-            echo "Failed to get workflow ID after $max_attempts attempts"
-            exit 1
-          fi
-
-          echo "Attempt $attempt: Workflow ID not found yet, retrying..."
-          attempt=$((attempt + 1))
-        done
+        sleep 5  # Wait for workflow to be created
+        run_id=$(curl -s -H "authorization: Bearer ${{ secrets.PAT_TOKEN }}" \
+                 "https://api.github.com/repos/meta-llama/llama-stack-client-python/actions/runs?event=repository_dispatch" \
+                 | jq '.workflow_runs[0].id')
+        echo "workflow_id=$run_id" >> $GITHUB_OUTPUT
 
     - name: Trigger llama-models workflow
       id: trigger-models
@@ -93,28 +76,11 @@ jobs:
         fi
 
         # Get the run ID of the triggered workflow
-        max_attempts=60  # Try for up to 1 minute
-        attempt=1
-        while true; do
-          sleep 1
-          run_id=$(curl -s -H "authorization: Bearer ${{ secrets.PAT_TOKEN }}" \
-                   "https://api.github.com/repos/meta-llama/llama-models/actions/runs?event=repository_dispatch" \
-                   | jq '.workflow_runs[0].id')
-
-          if [ "$run_id" != "null" ] && [ -n "$run_id" ]; then
-            echo "Found workflow ID: $run_id"
-            echo "workflow_id=$run_id" >> $GITHUB_OUTPUT
-            break
-          fi
-
-          if [ $attempt -ge $max_attempts ]; then
-            echo "Failed to get workflow ID after $max_attempts attempts"
-            exit 1
-          fi
-
-          echo "Attempt $attempt: Workflow ID not found yet, retrying..."
-          attempt=$((attempt + 1))
-        done
+        sleep 5  # Wait for workflow to be created
+        run_id=$(curl -s -H "authorization: Bearer ${{ secrets.PAT_TOKEN }}" \
+                 "https://api.github.com/repos/meta-llama/llama-models/actions/runs?event=repository_dispatch" \
+                 | jq '.workflow_runs[0].id')
+        echo "workflow_id=$run_id" >> $GITHUB_OUTPUT
 
   wait-for-workflows:
     name: Wait for triggered workflows