diff --git a/bot_bottle/git_gate.py b/bot_bottle/git_gate.py
index e2063c5..8b945eb 100644
--- a/bot_bottle/git_gate.py
+++ b/bot_bottle/git_gate.py
@@ -44,7 +44,7 @@ GIT_GATE_HOSTNAME = "git-gate"
 # Bound half-open git client sessions. If an agent/tool runner is
 # interrupted during push, git daemon should reap the receive-pack
 # child instead of keeping the gate wedged indefinitely.
-GIT_GATE_DAEMON_TIMEOUT_SECS = 60
+GIT_GATE_DAEMON_TIMEOUT_SECS = 15
 
 
 def _empty_str_map() -> dict[str, str]:
diff --git a/tests/unit/test_git_gate.py b/tests/unit/test_git_gate.py
index 0ad2727..3fe5856 100644
--- a/tests/unit/test_git_gate.py
+++ b/tests/unit/test_git_gate.py
@@ -170,8 +170,8 @@ class TestEntrypointRender(unittest.TestCase):
         # Daemon line is what keeps PID 1 alive.
         self.assertIn("exec git daemon", script)
         self.assertIn("--enable=receive-pack", script)
-        self.assertIn("--timeout=60", script)
-        self.assertIn("--init-timeout=60", script)
+        self.assertIn("--timeout=15", script)
+        self.assertIn("--init-timeout=15", script)
         self.assertIn("--base-path=/git", script)
         # The access-hook is what makes fetch a mirror operation
         # against the upstream (PRD 0008 v1.1).