diff --git a/runner/builtin/runner.go b/runner/builtin/runner.go
index d08524b12..a8c3ef9c7 100644
--- a/runner/builtin/runner.go
+++ b/runner/builtin/runner.go
@@ -120,7 +120,8 @@ func (r *Runner) Run(w *queue.Work) error {
 		if err != nil {
 			return err
 		}
-		worker := newWorkerTimeout(client, w.Repo.Timeout+10) // 10 minute buffer
+
+		worker := newWorkerTimeout(client, w.Repo.Timeout)
 		workers = append(workers, worker)
 		cname := cname(task)
 		state, builderr := worker.Build(cname, in)
diff --git a/server/repos.go b/server/repos.go
index c175176b5..660ba33f8 100644
--- a/server/repos.go
+++ b/server/repos.go
@@ -210,6 +210,7 @@ func PostRepo(c *gin.Context) {
 	r.UserID = user.ID
 	r.PostCommit = true
 	r.PullRequest = true
+	r.Timeout = 60 // 1 hour default build time
 	r.Self = fmt.Sprintf(
 		"%s/%s",
 		httputil.GetURL(c.Request),