diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index ca5c3c3..d0247e8 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -33,6 +33,6 @@ steps:
   env:
   - PROJECT_IN=measurement-lab
   args:
-  - gcloud app operations wait $(gcloud app operations list --format="value(id)" --pending --limit=1) || true
+  - sleep 30 # Give all operations in previous step a few seconds to complete
   - gcloud app deploy grafana-public/dispatch.yaml --project $PROJECT_ID