diff --git a/pkg/admin/api/grpc/gateway.go b/pkg/admin/api/grpc/gateway.go
index 311e989fc8..833285b5a8 100644
--- a/pkg/admin/api/grpc/gateway.go
+++ b/pkg/admin/api/grpc/gateway.go
@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	"github.com/caos/utils/api/grpc/server"
+	"github.com/caos/zitadel/internal/api/grpc/server"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"strings"
 )
diff --git a/pkg/admin/api/grpc/server.go b/pkg/admin/api/grpc/server.go
index 7fad14521e..e31a3edd1b 100644
--- a/pkg/admin/api/grpc/server.go
+++ b/pkg/admin/api/grpc/server.go
@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	grpc_utils "github.com/caos/zitadel/internal/api/grpc"
+	"github.com/caos/zitadel/internal/api/grpc/server/middleware"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	"google.golang.org/grpc"
 )
@@ -31,9 +31,10 @@ func (s *Server) GRPCPort() string {
 
 func (s *Server) GRPCServer() (*grpc.Server, error) {
 	gs := grpc.NewServer(
+		middleware.TracingStatsServer("/Healthz", "/Ready", "/Validate"),
 		grpc.UnaryInterceptor(
 			grpc_middleware.ChainUnaryServer(
-				grpc_utils.ErrorHandler(),
+				middleware.ErrorHandler(),
 			),
 		),
 	)
diff --git a/pkg/auth/api/grpc/gateway.go b/pkg/auth/api/grpc/gateway.go
index 8718cd3fcd..c8b845e6a4 100644
--- a/pkg/auth/api/grpc/gateway.go
+++ b/pkg/auth/api/grpc/gateway.go
@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	"github.com/caos/utils/api/grpc/server"
+	"github.com/caos/zitadel/internal/api/grpc/server"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"strings"
 )
diff --git a/pkg/auth/api/grpc/server.go b/pkg/auth/api/grpc/server.go
index 51c82892a7..0a60ba96d9 100644
--- a/pkg/auth/api/grpc/server.go
+++ b/pkg/auth/api/grpc/server.go
@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	grpc_utils "github.com/caos/zitadel/internal/api/grpc"
+	"github.com/caos/zitadel/internal/api/grpc/server/middleware"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	"google.golang.org/grpc"
 )
@@ -31,9 +31,10 @@ func (s *Server) GRPCPort() string {
 
 func (s *Server) GRPCServer() (*grpc.Server, error) {
 	gs := grpc.NewServer(
+		middleware.TracingStatsServer("/Healthz", "/Ready", "/Validate"),
 		grpc.UnaryInterceptor(
 			grpc_middleware.ChainUnaryServer(
-				grpc_utils.ErrorHandler(),
+				middleware.ErrorHandler(),
 			),
 		),
 	)
diff --git a/pkg/management/api/grpc/gateway.go b/pkg/management/api/grpc/gateway.go
index 75aa957434..8884d8e5f5 100644
--- a/pkg/management/api/grpc/gateway.go
+++ b/pkg/management/api/grpc/gateway.go
@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	"github.com/caos/utils/api/grpc/server"
+	"github.com/caos/zitadel/internal/api/grpc/server"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"strings"
 )
diff --git a/pkg/management/api/grpc/server.go b/pkg/management/api/grpc/server.go
index 13df6492c0..07981551fb 100644
--- a/pkg/management/api/grpc/server.go
+++ b/pkg/management/api/grpc/server.go
@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	grpc_utils "github.com/caos/zitadel/internal/api/grpc"
+	"github.com/caos/zitadel/internal/api/grpc/server/middleware"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	"google.golang.org/grpc"
 )
@@ -31,9 +31,10 @@ func (s *Server) GRPCPort() string {
 
 func (s *Server) GRPCServer() (*grpc.Server, error) {
 	gs := grpc.NewServer(
+		middleware.TracingStatsServer("/Healthz", "/Ready", "/Validate"),
 		grpc.UnaryInterceptor(
 			grpc_middleware.ChainUnaryServer(
-				grpc_utils.ErrorHandler(),
+				middleware.ErrorHandler(),
 			),
 		),
 	)