diff --git a/lib/generators.sh b/lib/generators.sh
index 5a3a002..eb223e8 100644
--- a/lib/generators.sh
+++ b/lib/generators.sh
@@ -405,6 +405,9 @@ services:
       WOODPECKER_SERVER: localhost:9000
       WOODPECKER_AGENT_SECRET: ${WOODPECKER_AGENT_SECRET:-}
       WOODPECKER_GRPC_SECURE: "false"
+      WOODPECKER_GRPC_KEEPALIVE_TIME: "10s"
+      WOODPECKER_GRPC_KEEPALIVE_TIMEOUT: "20s"
+      WOODPECKER_GRPC_KEEPALIVE_PERMIT_WITHOUT_CALLS: "true"
       WOODPECKER_HEALTHCHECK_ADDR: ":3333"
       WOODPECKER_BACKEND_DOCKER_NETWORK: ${WOODPECKER_CI_NETWORK:-disinto_disinto-net}
       WOODPECKER_MAX_WORKFLOWS: 1
diff --git a/nomad/jobs/woodpecker-agent.hcl b/nomad/jobs/woodpecker-agent.hcl
index c7779a2..a4111fe 100644
--- a/nomad/jobs/woodpecker-agent.hcl
+++ b/nomad/jobs/woodpecker-agent.hcl
@@ -57,7 +57,7 @@ job "woodpecker-agent" {
       check {
         type     = "http"
         path     = "/healthz"
-        interval = "15s"
+        interval = "10s"
         timeout  = "3s"
       }
     }
@@ -89,10 +89,13 @@ job "woodpecker-agent" {
       # Nomad's port stanza to the allocation's IP (not localhost), so the
       # agent must use the LXC's eth0 IP, not 127.0.0.1.
       env {
-        WOODPECKER_SERVER         = "${attr.unique.network.ip-address}:9000"
-        WOODPECKER_GRPC_SECURE    = "false"
-        WOODPECKER_MAX_WORKFLOWS  = "1"
-        WOODPECKER_HEALTHCHECK_ADDR = ":3333"
+        WOODPECKER_SERVER                   = "${attr.unique.network.ip-address}:9000"
+        WOODPECKER_GRPC_SECURE              = "false"
+        WOODPECKER_GRPC_KEEPALIVE_TIME      = "10s"
+        WOODPECKER_GRPC_KEEPALIVE_TIMEOUT   = "20s"
+        WOODPECKER_GRPC_KEEPALIVE_PERMIT_WITHOUT_CALLS = "true"
+        WOODPECKER_MAX_WORKFLOWS            = "1"
+        WOODPECKER_HEALTHCHECK_ADDR         = ":3333"
       }
 
       # ── Vault-templated agent secret ──────────────────────────────────