diff --git a/starter-sample/.github/workflows/defang.yaml b/starter-sample/.github/workflows/defang.yaml
index 58f02c18..a3dd3eef 100644
--- a/starter-sample/.github/workflows/defang.yaml
+++ b/starter-sample/.github/workflows/defang.yaml
@@ -9,6 +9,7 @@ jobs:
   deploy:
     environment: defang-production
     runs-on: ubuntu-latest
+    timeout-minutes: 70
     permissions:
       contents: read
       id-token: write
diff --git a/templates/defang.yaml b/templates/defang.yaml
index f1a13234..97fb1cb1 100644
--- a/templates/defang.yaml
+++ b/templates/defang.yaml
@@ -23,6 +23,7 @@ jobs:
     name: Defang ${{ github.event.inputs.action || 'up' }} ${{ github.event.inputs.stack || 'default stack' }}
     environment: defang-production
     runs-on: ubuntu-latest
+    timeout-minutes: 70
     permissions:
       contents: read
       id-token: write