diff --git a/cmd/sessions/internal/serve/serve.go b/cmd/sessions/internal/serve/serve.go
index 0b69e65..386bdd4 100644
--- a/cmd/sessions/internal/serve/serve.go
+++ b/cmd/sessions/internal/serve/serve.go
@@ -28,10 +28,11 @@ import (
 
 const (
 	defaultPort           = "9234"
-	readTimeout           = 2 * time.Second
-	readHeaderTimeout     = 2 * time.Second
-	writeTimeout          = 2 * time.Second
-	idleTimeout           = 2 * time.Second
+	readTimeout           = 5 * time.Second
+	readHeaderTimeout     = time.Second
+	handlerTimeout        = time.Second
+	writeTimeout          = 10 * time.Second
+	idleTimeout           = 180 * time.Second
 	serverShutdownTimeout = 10 * time.Second
 	metaEndpointsPrefix   = "/_meta"
 )
@@ -110,7 +111,7 @@ func newServer(logger *zap.Logger, db *bun.DB) (*http.Server, error) {
 
 	return &http.Server{
 		Addr:              ":" + defaultPort,
-		Handler:           r,
+		Handler:           http.TimeoutHandler(r, handlerTimeout, "Timeout"),
 		ReadTimeout:       readTimeout,
 		ReadHeaderTimeout: readHeaderTimeout,
 		WriteTimeout:      writeTimeout,