diff --git a/.github/workflows/gcp-deploy-staging.yml b/.github/workflows/gcp-deploy-staging.yml
index 5bb1cdc0..2173cb31 100644
--- a/.github/workflows/gcp-deploy-staging.yml
+++ b/.github/workflows/gcp-deploy-staging.yml
@@ -23,7 +23,7 @@ jobs:
         run: |
           ssh -i ~/.ssh/private.key ${{ secrets.GCP_STAGING_USERNAME }}@${{ secrets.GCP_STAGING_HOST }} << 'EOF'
             # Stop and remove any existing container
-            docker stop sourcebot-staging || true
+            docker stop -t 60 sourcebot-staging || true
             docker rm sourcebot-staging || true
 
             # Run new container