diff --git a/components/common-go/baseserver/server.go b/components/common-go/baseserver/server.go
index 38b3b3fd203af5..c1e621850d08b0 100644
--- a/components/common-go/baseserver/server.go
+++ b/components/common-go/baseserver/server.go
@@ -259,7 +259,9 @@ func (s *Server) initializeGRPC() error {
 	common_grpc.SetupLogging()
 
 	grpcMetrics := grpc_prometheus.NewServerMetrics()
-	grpcMetrics.EnableHandlingTimeHistogram()
+	grpcMetrics.EnableHandlingTimeHistogram(
+		grpc_prometheus.WithHistogramBuckets([]float64{.005, .025, .05, .1, .5, 1, 2.5, 5, 30, 60, 120, 240, 600}),
+	)
 	if err := s.MetricsRegistry().Register(grpcMetrics); err != nil {
 		return fmt.Errorf("failed to register grpc metrics: %w", err)
 	}
diff --git a/components/ws-manager/cmd/run.go b/components/ws-manager/cmd/run.go
index 74ec208b730db2..a83ef5b12488c5 100644
--- a/components/ws-manager/cmd/run.go
+++ b/components/ws-manager/cmd/run.go
@@ -125,7 +125,9 @@ var runCmd = &cobra.Command{
 		metrics.Registry.MustRegister(ratelimits)
 
 		grpcMetrics := grpc_prometheus.NewServerMetrics()
-		grpcMetrics.EnableHandlingTimeHistogram()
+		grpcMetrics.EnableHandlingTimeHistogram(
+			grpc_prometheus.WithHistogramBuckets([]float64{.005, .025, .05, .1, .5, 1, 2.5, 5, 30, 60, 120, 240, 600}),
+		)
 		metrics.Registry.MustRegister(grpcMetrics)
 
 		grpcOpts := common_grpc.ServerOptionsWithInterceptors(