diff --git a/pkg/auth/oauth.go b/pkg/auth/oauth.go
index 2ba75b0c5..d503d1721 100644
--- a/pkg/auth/oauth.go
+++ b/pkg/auth/oauth.go
@@ -123,6 +123,7 @@ func LoginBrowser(cfg OAuthProviderConfig) (*AuthCredential, error) {
 		ReadTimeout:       10 * time.Second,
 		ReadHeaderTimeout: 5 * time.Second,
 		WriteTimeout:      10 * time.Second,
+		IdleTimeout:       120 * time.Second,
 	}
 	go server.Serve(listener)
 	defer func() {
diff --git a/pkg/channels/manager.go b/pkg/channels/manager.go
index 12924cd56..bf08399f5 100644
--- a/pkg/channels/manager.go
+++ b/pkg/channels/manager.go
@@ -333,6 +333,7 @@ func (m *Manager) SetupHTTPServer(addr string, healthServer *health.Server) {
 		ReadTimeout:       30 * time.Second,
 		ReadHeaderTimeout: 10 * time.Second,
 		WriteTimeout:      30 * time.Second,
+		IdleTimeout:       120 * time.Second,
 	}
 }
 
diff --git a/pkg/health/server.go b/pkg/health/server.go
index a3f6e4df2..632e4c346 100644
--- a/pkg/health/server.go
+++ b/pkg/health/server.go
@@ -49,6 +49,7 @@ func NewServer(host string, port int) *Server {
 		ReadTimeout:       5 * time.Second,
 		ReadHeaderTimeout: 3 * time.Second,
 		WriteTimeout:      5 * time.Second,
+		IdleTimeout:       120 * time.Second,
 	}
 
 	return s