diff --git a/cmd/buildkitd/main.go b/cmd/buildkitd/main.go
index b56ea8d043e5..7a245a2c660b 100644
--- a/cmd/buildkitd/main.go
+++ b/cmd/buildkitd/main.go
@@ -67,6 +67,8 @@ import (
 	tracev1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/health"
+	healthv1 "google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/grpc/reflection"
 )
 
@@ -309,6 +311,7 @@ func main() {
 		}
 		defer controller.Close()
 
+		healthv1.RegisterHealthServer(server, health.NewServer())
 		controller.Register(server)
 		reflection.Register(server)