diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml
index 20c1e0a1..acc23a25 100644
--- a/.github/workflows/smoke-test.yaml
+++ b/.github/workflows/smoke-test.yaml
@@ -3,8 +3,12 @@ name: Smoke Test
 on:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   smoke-test:
+    timeout-minutes: 20
     runs-on:
     - environment=production
     - size=xxlarge