diff --git a/deployment-configuration/skaffold-template.yaml b/deployment-configuration/skaffold-template.yaml
index 8c7b346ce..6331c4d8b 100644
--- a/deployment-configuration/skaffold-template.yaml
+++ b/deployment-configuration/skaffold-template.yaml
@@ -13,6 +13,8 @@ deploy:
     flags:
       upgrade:
         - --install
+      install:
+        - --timeout=10m
     releases:
     - name: null
       chartPath: deployment/helm
diff --git a/tools/deployment-cli-tools/tests/test_skaffold.py b/tools/deployment-cli-tools/tests/test_skaffold.py
index 17c0832d3..999ad6396 100644
--- a/tools/deployment-cli-tools/tests/test_skaffold.py
+++ b/tools/deployment-cli-tools/tests/test_skaffold.py
@@ -104,6 +104,10 @@ def test_create_skaffold_configuration():
 
     assert len(sk['test'][1]['custom']) == 2
 
+    flags = sk['deploy']['helm']['flags']
+    assert '--timeout=10m' in flags['install']
+    assert '--install' in flags['upgrade']
+
     shutil.rmtree(OUT)
     shutil.rmtree(BUILD_DIR)