diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 8e7a2bd..1d40222 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -32,7 +32,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Setup Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version-file: 'go.mod'
         cache: false
diff --git a/Dockerfile b/Dockerfile
index 36cd888..9111d80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN apk -U add curl \
     ${GRPC_HEALTH_PROBE_URL}/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 \
  && chmod +x /bin/grpc_health_probe
 
-FROM gcr.io/distroless/static-debian12:nonroot
+FROM gcr.io/distroless/static-debian13:nonroot
 WORKDIR /
 COPY --from=health-downloader /bin/grpc_health_probe /bin/grpc_health_probe
 COPY bin/server /masterdata-api
diff --git a/Makefile b/Makefile
index 393e552..e6cf400 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ server: protoc generate
 								   -X 'github.com/metal-stack/v.Revision=$(GITVERSION)' \
 								   -X 'github.com/metal-stack/v.GitSHA1=$(SHA)' \
 								   -X 'github.com/metal-stack/v.BuildDate=$(BUILDDATE)'" \
-						 -o bin/server server/main.go
+						 -o bin/server github.com/metal-stack/masterdata-api/cmd/server
 	strip bin/server
 
 .PHONY: client
@@ -63,18 +63,12 @@ mocks:
 
 .PHONY: postgres-up
 postgres-up: postgres-rm
-	docker run -d --name masterdatadb -p 5432:5432 -e POSTGRES_PASSWORD="password" -e POSTGRES_USER="masterdata" -e POSTGRES_DB="masterdata" postgres:16-alpine
+	docker run -d --name masterdatadb -p 5432:5432 -e POSTGRES_PASSWORD="password" -e POSTGRES_USER="masterdata" -e POSTGRES_DB="masterdata" postgres:18-alpine
 
 .PHONY: postgres-rm
 postgres-rm:
 	docker rm -f masterdatadb || true
 
-.PHONY: certs
-certs:
-	cd certs && cfssl gencert -initca ca-csr.json | cfssljson -bare ca -
-	cd certs && cfssl gencert -ca=ca.pem -ca-key=ca-key.pem -config=ca-config.json -profile client-server server.json | cfssljson -bare server -
-	cd certs && cfssl gencert -ca=ca.pem -ca-key=ca-key.pem -config=ca-config.json -profile client client.json | cfssljson -bare client -
-
 .PHONY: mini-lab-push
 mini-lab-push:
 	docker build -t metalstack/masterdata-api:latest .
diff --git a/api/v1/apiv1connect/project.connect.go b/api/v1/apiv1connect/project.connect.go
new file mode 100644
index 0000000..efee546
--- /dev/null
+++ b/api/v1/apiv1connect/project.connect.go
@@ -0,0 +1,273 @@
+// Code generated by protoc-gen-connect-go. DO NOT EDIT.
+//
+// Source: api/v1/project.proto
+
+package apiv1connect
+
+import (
+	connect "connectrpc.com/connect"
+	context "context"
+	errors "errors"
+	v1 "github.com/metal-stack/masterdata-api/api/v1"
+	http "net/http"
+	strings "strings"
+)
+
+// This is a compile-time assertion to ensure that this generated file and the connect package are
+// compatible. If you get a compiler error that this constant is not defined, this code was
+// generated with a version of connect newer than the one compiled into your binary. You can fix the
+// problem by either regenerating this code with an older version of connect or updating the connect
+// version compiled into your binary.
+const _ = connect.IsAtLeastVersion1_13_0
+
+const (
+	// ProjectServiceName is the fully-qualified name of the ProjectService service.
+	ProjectServiceName = "api.v1.ProjectService"
+)
+
+// These constants are the fully-qualified names of the RPCs defined in this package. They're
+// exposed at runtime as Spec.Procedure and as the final two segments of the HTTP route.
+//
+// Note that these are different from the fully-qualified method names used by
+// google.golang.org/protobuf/reflect/protoreflect. To convert from these constants to
+// reflection-formatted method names, remove the leading slash and convert the remaining slash to a
+// period.
+const (
+	// ProjectServiceCreateProcedure is the fully-qualified name of the ProjectService's Create RPC.
+	ProjectServiceCreateProcedure = "/api.v1.ProjectService/Create"
+	// ProjectServiceUpdateProcedure is the fully-qualified name of the ProjectService's Update RPC.
+	ProjectServiceUpdateProcedure = "/api.v1.ProjectService/Update"
+	// ProjectServiceDeleteProcedure is the fully-qualified name of the ProjectService's Delete RPC.
+	ProjectServiceDeleteProcedure = "/api.v1.ProjectService/Delete"
+	// ProjectServiceGetProcedure is the fully-qualified name of the ProjectService's Get RPC.
+	ProjectServiceGetProcedure = "/api.v1.ProjectService/Get"
+	// ProjectServiceGetHistoryProcedure is the fully-qualified name of the ProjectService's GetHistory
+	// RPC.
+	ProjectServiceGetHistoryProcedure = "/api.v1.ProjectService/GetHistory"
+	// ProjectServiceFindProcedure is the fully-qualified name of the ProjectService's Find RPC.
+	ProjectServiceFindProcedure = "/api.v1.ProjectService/Find"
+)
+
+// ProjectServiceClient is a client for the api.v1.ProjectService service.
+type ProjectServiceClient interface {
+	Create(context.Context, *v1.ProjectCreateRequest) (*v1.ProjectResponse, error)
+	Update(context.Context, *v1.ProjectUpdateRequest) (*v1.ProjectResponse, error)
+	Delete(context.Context, *v1.ProjectDeleteRequest) (*v1.ProjectResponse, error)
+	Get(context.Context, *v1.ProjectGetRequest) (*v1.ProjectResponse, error)
+	GetHistory(context.Context, *v1.ProjectGetHistoryRequest) (*v1.ProjectResponse, error)
+	Find(context.Context, *v1.ProjectFindRequest) (*v1.ProjectListResponse, error)
+}
+
+// NewProjectServiceClient constructs a client for the api.v1.ProjectService service. By default, it
+// uses the Connect protocol with the binary Protobuf Codec, asks for gzipped responses, and sends
+// uncompressed requests. To use the gRPC or gRPC-Web protocols, supply the connect.WithGRPC() or
+// connect.WithGRPCWeb() options.
+//
+// The URL supplied here should be the base URL for the Connect or gRPC server (for example,
+// http://api.acme.com or https://acme.com/grpc).
+func NewProjectServiceClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) ProjectServiceClient {
+	baseURL = strings.TrimRight(baseURL, "/")
+	projectServiceMethods := v1.File_api_v1_project_proto.Services().ByName("ProjectService").Methods()
+	return &projectServiceClient{
+		create: connect.NewClient[v1.ProjectCreateRequest, v1.ProjectResponse](
+			httpClient,
+			baseURL+ProjectServiceCreateProcedure,
+			connect.WithSchema(projectServiceMethods.ByName("Create")),
+			connect.WithClientOptions(opts...),
+		),
+		update: connect.NewClient[v1.ProjectUpdateRequest, v1.ProjectResponse](
+			httpClient,
+			baseURL+ProjectServiceUpdateProcedure,
+			connect.WithSchema(projectServiceMethods.ByName("Update")),
+			connect.WithClientOptions(opts...),
+		),
+		delete: connect.NewClient[v1.ProjectDeleteRequest, v1.ProjectResponse](
+			httpClient,
+			baseURL+ProjectServiceDeleteProcedure,
+			connect.WithSchema(projectServiceMethods.ByName("Delete")),
+			connect.WithClientOptions(opts...),
+		),
+		get: connect.NewClient[v1.ProjectGetRequest, v1.ProjectResponse](
+			httpClient,
+			baseURL+ProjectServiceGetProcedure,
+			connect.WithSchema(projectServiceMethods.ByName("Get")),
+			connect.WithClientOptions(opts...),
+		),
+		getHistory: connect.NewClient[v1.ProjectGetHistoryRequest, v1.ProjectResponse](
+			httpClient,
+			baseURL+ProjectServiceGetHistoryProcedure,
+			connect.WithSchema(projectServiceMethods.ByName("GetHistory")),
+			connect.WithClientOptions(opts...),
+		),
+		find: connect.NewClient[v1.ProjectFindRequest, v1.ProjectListResponse](
+			httpClient,
+			baseURL+ProjectServiceFindProcedure,
+			connect.WithSchema(projectServiceMethods.ByName("Find")),
+			connect.WithClientOptions(opts...),
+		),
+	}
+}
+
+// projectServiceClient implements ProjectServiceClient.
+type projectServiceClient struct {
+	create     *connect.Client[v1.ProjectCreateRequest, v1.ProjectResponse]
+	update     *connect.Client[v1.ProjectUpdateRequest, v1.ProjectResponse]
+	delete     *connect.Client[v1.ProjectDeleteRequest, v1.ProjectResponse]
+	get        *connect.Client[v1.ProjectGetRequest, v1.ProjectResponse]
+	getHistory *connect.Client[v1.ProjectGetHistoryRequest, v1.ProjectResponse]
+	find       *connect.Client[v1.ProjectFindRequest, v1.ProjectListResponse]
+}
+
+// Create calls api.v1.ProjectService.Create.
+func (c *projectServiceClient) Create(ctx context.Context, req *v1.ProjectCreateRequest) (*v1.ProjectResponse, error) {
+	response, err := c.create.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Update calls api.v1.ProjectService.Update.
+func (c *projectServiceClient) Update(ctx context.Context, req *v1.ProjectUpdateRequest) (*v1.ProjectResponse, error) {
+	response, err := c.update.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Delete calls api.v1.ProjectService.Delete.
+func (c *projectServiceClient) Delete(ctx context.Context, req *v1.ProjectDeleteRequest) (*v1.ProjectResponse, error) {
+	response, err := c.delete.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Get calls api.v1.ProjectService.Get.
+func (c *projectServiceClient) Get(ctx context.Context, req *v1.ProjectGetRequest) (*v1.ProjectResponse, error) {
+	response, err := c.get.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// GetHistory calls api.v1.ProjectService.GetHistory.
+func (c *projectServiceClient) GetHistory(ctx context.Context, req *v1.ProjectGetHistoryRequest) (*v1.ProjectResponse, error) {
+	response, err := c.getHistory.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Find calls api.v1.ProjectService.Find.
+func (c *projectServiceClient) Find(ctx context.Context, req *v1.ProjectFindRequest) (*v1.ProjectListResponse, error) {
+	response, err := c.find.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// ProjectServiceHandler is an implementation of the api.v1.ProjectService service.
+type ProjectServiceHandler interface {
+	Create(context.Context, *v1.ProjectCreateRequest) (*v1.ProjectResponse, error)
+	Update(context.Context, *v1.ProjectUpdateRequest) (*v1.ProjectResponse, error)
+	Delete(context.Context, *v1.ProjectDeleteRequest) (*v1.ProjectResponse, error)
+	Get(context.Context, *v1.ProjectGetRequest) (*v1.ProjectResponse, error)
+	GetHistory(context.Context, *v1.ProjectGetHistoryRequest) (*v1.ProjectResponse, error)
+	Find(context.Context, *v1.ProjectFindRequest) (*v1.ProjectListResponse, error)
+}
+
+// NewProjectServiceHandler builds an HTTP handler from the service implementation. It returns the
+// path on which to mount the handler and the handler itself.
+//
+// By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf
+// and JSON codecs. They also support gzip compression.
+func NewProjectServiceHandler(svc ProjectServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) {
+	projectServiceMethods := v1.File_api_v1_project_proto.Services().ByName("ProjectService").Methods()
+	projectServiceCreateHandler := connect.NewUnaryHandlerSimple(
+		ProjectServiceCreateProcedure,
+		svc.Create,
+		connect.WithSchema(projectServiceMethods.ByName("Create")),
+		connect.WithHandlerOptions(opts...),
+	)
+	projectServiceUpdateHandler := connect.NewUnaryHandlerSimple(
+		ProjectServiceUpdateProcedure,
+		svc.Update,
+		connect.WithSchema(projectServiceMethods.ByName("Update")),
+		connect.WithHandlerOptions(opts...),
+	)
+	projectServiceDeleteHandler := connect.NewUnaryHandlerSimple(
+		ProjectServiceDeleteProcedure,
+		svc.Delete,
+		connect.WithSchema(projectServiceMethods.ByName("Delete")),
+		connect.WithHandlerOptions(opts...),
+	)
+	projectServiceGetHandler := connect.NewUnaryHandlerSimple(
+		ProjectServiceGetProcedure,
+		svc.Get,
+		connect.WithSchema(projectServiceMethods.ByName("Get")),
+		connect.WithHandlerOptions(opts...),
+	)
+	projectServiceGetHistoryHandler := connect.NewUnaryHandlerSimple(
+		ProjectServiceGetHistoryProcedure,
+		svc.GetHistory,
+		connect.WithSchema(projectServiceMethods.ByName("GetHistory")),
+		connect.WithHandlerOptions(opts...),
+	)
+	projectServiceFindHandler := connect.NewUnaryHandlerSimple(
+		ProjectServiceFindProcedure,
+		svc.Find,
+		connect.WithSchema(projectServiceMethods.ByName("Find")),
+		connect.WithHandlerOptions(opts...),
+	)
+	return "/api.v1.ProjectService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case ProjectServiceCreateProcedure:
+			projectServiceCreateHandler.ServeHTTP(w, r)
+		case ProjectServiceUpdateProcedure:
+			projectServiceUpdateHandler.ServeHTTP(w, r)
+		case ProjectServiceDeleteProcedure:
+			projectServiceDeleteHandler.ServeHTTP(w, r)
+		case ProjectServiceGetProcedure:
+			projectServiceGetHandler.ServeHTTP(w, r)
+		case ProjectServiceGetHistoryProcedure:
+			projectServiceGetHistoryHandler.ServeHTTP(w, r)
+		case ProjectServiceFindProcedure:
+			projectServiceFindHandler.ServeHTTP(w, r)
+		default:
+			http.NotFound(w, r)
+		}
+	})
+}
+
+// UnimplementedProjectServiceHandler returns CodeUnimplemented from all methods.
+type UnimplementedProjectServiceHandler struct{}
+
+func (UnimplementedProjectServiceHandler) Create(context.Context, *v1.ProjectCreateRequest) (*v1.ProjectResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectService.Create is not implemented"))
+}
+
+func (UnimplementedProjectServiceHandler) Update(context.Context, *v1.ProjectUpdateRequest) (*v1.ProjectResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectService.Update is not implemented"))
+}
+
+func (UnimplementedProjectServiceHandler) Delete(context.Context, *v1.ProjectDeleteRequest) (*v1.ProjectResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectService.Delete is not implemented"))
+}
+
+func (UnimplementedProjectServiceHandler) Get(context.Context, *v1.ProjectGetRequest) (*v1.ProjectResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectService.Get is not implemented"))
+}
+
+func (UnimplementedProjectServiceHandler) GetHistory(context.Context, *v1.ProjectGetHistoryRequest) (*v1.ProjectResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectService.GetHistory is not implemented"))
+}
+
+func (UnimplementedProjectServiceHandler) Find(context.Context, *v1.ProjectFindRequest) (*v1.ProjectListResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectService.Find is not implemented"))
+}
diff --git a/api/v1/apiv1connect/project_member.connect.go b/api/v1/apiv1connect/project_member.connect.go
new file mode 100644
index 0000000..396dfaf
--- /dev/null
+++ b/api/v1/apiv1connect/project_member.connect.go
@@ -0,0 +1,245 @@
+// Code generated by protoc-gen-connect-go. DO NOT EDIT.
+//
+// Source: api/v1/project_member.proto
+
+package apiv1connect
+
+import (
+	connect "connectrpc.com/connect"
+	context "context"
+	errors "errors"
+	v1 "github.com/metal-stack/masterdata-api/api/v1"
+	http "net/http"
+	strings "strings"
+)
+
+// This is a compile-time assertion to ensure that this generated file and the connect package are
+// compatible. If you get a compiler error that this constant is not defined, this code was
+// generated with a version of connect newer than the one compiled into your binary. You can fix the
+// problem by either regenerating this code with an older version of connect or updating the connect
+// version compiled into your binary.
+const _ = connect.IsAtLeastVersion1_13_0
+
+const (
+	// ProjectMemberServiceName is the fully-qualified name of the ProjectMemberService service.
+	ProjectMemberServiceName = "api.v1.ProjectMemberService"
+)
+
+// These constants are the fully-qualified names of the RPCs defined in this package. They're
+// exposed at runtime as Spec.Procedure and as the final two segments of the HTTP route.
+//
+// Note that these are different from the fully-qualified method names used by
+// google.golang.org/protobuf/reflect/protoreflect. To convert from these constants to
+// reflection-formatted method names, remove the leading slash and convert the remaining slash to a
+// period.
+const (
+	// ProjectMemberServiceCreateProcedure is the fully-qualified name of the ProjectMemberService's
+	// Create RPC.
+	ProjectMemberServiceCreateProcedure = "/api.v1.ProjectMemberService/Create"
+	// ProjectMemberServiceUpdateProcedure is the fully-qualified name of the ProjectMemberService's
+	// Update RPC.
+	ProjectMemberServiceUpdateProcedure = "/api.v1.ProjectMemberService/Update"
+	// ProjectMemberServiceDeleteProcedure is the fully-qualified name of the ProjectMemberService's
+	// Delete RPC.
+	ProjectMemberServiceDeleteProcedure = "/api.v1.ProjectMemberService/Delete"
+	// ProjectMemberServiceGetProcedure is the fully-qualified name of the ProjectMemberService's Get
+	// RPC.
+	ProjectMemberServiceGetProcedure = "/api.v1.ProjectMemberService/Get"
+	// ProjectMemberServiceFindProcedure is the fully-qualified name of the ProjectMemberService's Find
+	// RPC.
+	ProjectMemberServiceFindProcedure = "/api.v1.ProjectMemberService/Find"
+)
+
+// ProjectMemberServiceClient is a client for the api.v1.ProjectMemberService service.
+type ProjectMemberServiceClient interface {
+	Create(context.Context, *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error)
+	Update(context.Context, *v1.ProjectMemberUpdateRequest) (*v1.ProjectMemberResponse, error)
+	Delete(context.Context, *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error)
+	Get(context.Context, *v1.ProjectMemberGetRequest) (*v1.ProjectMemberResponse, error)
+	Find(context.Context, *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error)
+}
+
+// NewProjectMemberServiceClient constructs a client for the api.v1.ProjectMemberService service. By
+// default, it uses the Connect protocol with the binary Protobuf Codec, asks for gzipped responses,
+// and sends uncompressed requests. To use the gRPC or gRPC-Web protocols, supply the
+// connect.WithGRPC() or connect.WithGRPCWeb() options.
+//
+// The URL supplied here should be the base URL for the Connect or gRPC server (for example,
+// http://api.acme.com or https://acme.com/grpc).
+func NewProjectMemberServiceClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) ProjectMemberServiceClient {
+	baseURL = strings.TrimRight(baseURL, "/")
+	projectMemberServiceMethods := v1.File_api_v1_project_member_proto.Services().ByName("ProjectMemberService").Methods()
+	return &projectMemberServiceClient{
+		create: connect.NewClient[v1.ProjectMemberCreateRequest, v1.ProjectMemberResponse](
+			httpClient,
+			baseURL+ProjectMemberServiceCreateProcedure,
+			connect.WithSchema(projectMemberServiceMethods.ByName("Create")),
+			connect.WithClientOptions(opts...),
+		),
+		update: connect.NewClient[v1.ProjectMemberUpdateRequest, v1.ProjectMemberResponse](
+			httpClient,
+			baseURL+ProjectMemberServiceUpdateProcedure,
+			connect.WithSchema(projectMemberServiceMethods.ByName("Update")),
+			connect.WithClientOptions(opts...),
+		),
+		delete: connect.NewClient[v1.ProjectMemberDeleteRequest, v1.ProjectMemberResponse](
+			httpClient,
+			baseURL+ProjectMemberServiceDeleteProcedure,
+			connect.WithSchema(projectMemberServiceMethods.ByName("Delete")),
+			connect.WithClientOptions(opts...),
+		),
+		get: connect.NewClient[v1.ProjectMemberGetRequest, v1.ProjectMemberResponse](
+			httpClient,
+			baseURL+ProjectMemberServiceGetProcedure,
+			connect.WithSchema(projectMemberServiceMethods.ByName("Get")),
+			connect.WithClientOptions(opts...),
+		),
+		find: connect.NewClient[v1.ProjectMemberFindRequest, v1.ProjectMemberListResponse](
+			httpClient,
+			baseURL+ProjectMemberServiceFindProcedure,
+			connect.WithSchema(projectMemberServiceMethods.ByName("Find")),
+			connect.WithClientOptions(opts...),
+		),
+	}
+}
+
+// projectMemberServiceClient implements ProjectMemberServiceClient.
+type projectMemberServiceClient struct {
+	create *connect.Client[v1.ProjectMemberCreateRequest, v1.ProjectMemberResponse]
+	update *connect.Client[v1.ProjectMemberUpdateRequest, v1.ProjectMemberResponse]
+	delete *connect.Client[v1.ProjectMemberDeleteRequest, v1.ProjectMemberResponse]
+	get    *connect.Client[v1.ProjectMemberGetRequest, v1.ProjectMemberResponse]
+	find   *connect.Client[v1.ProjectMemberFindRequest, v1.ProjectMemberListResponse]
+}
+
+// Create calls api.v1.ProjectMemberService.Create.
+func (c *projectMemberServiceClient) Create(ctx context.Context, req *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error) {
+	response, err := c.create.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Update calls api.v1.ProjectMemberService.Update.
+func (c *projectMemberServiceClient) Update(ctx context.Context, req *v1.ProjectMemberUpdateRequest) (*v1.ProjectMemberResponse, error) {
+	response, err := c.update.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Delete calls api.v1.ProjectMemberService.Delete.
+func (c *projectMemberServiceClient) Delete(ctx context.Context, req *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error) {
+	response, err := c.delete.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Get calls api.v1.ProjectMemberService.Get.
+func (c *projectMemberServiceClient) Get(ctx context.Context, req *v1.ProjectMemberGetRequest) (*v1.ProjectMemberResponse, error) {
+	response, err := c.get.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Find calls api.v1.ProjectMemberService.Find.
+func (c *projectMemberServiceClient) Find(ctx context.Context, req *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error) {
+	response, err := c.find.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// ProjectMemberServiceHandler is an implementation of the api.v1.ProjectMemberService service.
+type ProjectMemberServiceHandler interface {
+	Create(context.Context, *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error)
+	Update(context.Context, *v1.ProjectMemberUpdateRequest) (*v1.ProjectMemberResponse, error)
+	Delete(context.Context, *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error)
+	Get(context.Context, *v1.ProjectMemberGetRequest) (*v1.ProjectMemberResponse, error)
+	Find(context.Context, *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error)
+}
+
+// NewProjectMemberServiceHandler builds an HTTP handler from the service implementation. It returns
+// the path on which to mount the handler and the handler itself.
+//
+// By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf
+// and JSON codecs. They also support gzip compression.
+func NewProjectMemberServiceHandler(svc ProjectMemberServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) {
+	projectMemberServiceMethods := v1.File_api_v1_project_member_proto.Services().ByName("ProjectMemberService").Methods()
+	projectMemberServiceCreateHandler := connect.NewUnaryHandlerSimple(
+		ProjectMemberServiceCreateProcedure,
+		svc.Create,
+		connect.WithSchema(projectMemberServiceMethods.ByName("Create")),
+		connect.WithHandlerOptions(opts...),
+	)
+	projectMemberServiceUpdateHandler := connect.NewUnaryHandlerSimple(
+		ProjectMemberServiceUpdateProcedure,
+		svc.Update,
+		connect.WithSchema(projectMemberServiceMethods.ByName("Update")),
+		connect.WithHandlerOptions(opts...),
+	)
+	projectMemberServiceDeleteHandler := connect.NewUnaryHandlerSimple(
+		ProjectMemberServiceDeleteProcedure,
+		svc.Delete,
+		connect.WithSchema(projectMemberServiceMethods.ByName("Delete")),
+		connect.WithHandlerOptions(opts...),
+	)
+	projectMemberServiceGetHandler := connect.NewUnaryHandlerSimple(
+		ProjectMemberServiceGetProcedure,
+		svc.Get,
+		connect.WithSchema(projectMemberServiceMethods.ByName("Get")),
+		connect.WithHandlerOptions(opts...),
+	)
+	projectMemberServiceFindHandler := connect.NewUnaryHandlerSimple(
+		ProjectMemberServiceFindProcedure,
+		svc.Find,
+		connect.WithSchema(projectMemberServiceMethods.ByName("Find")),
+		connect.WithHandlerOptions(opts...),
+	)
+	return "/api.v1.ProjectMemberService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case ProjectMemberServiceCreateProcedure:
+			projectMemberServiceCreateHandler.ServeHTTP(w, r)
+		case ProjectMemberServiceUpdateProcedure:
+			projectMemberServiceUpdateHandler.ServeHTTP(w, r)
+		case ProjectMemberServiceDeleteProcedure:
+			projectMemberServiceDeleteHandler.ServeHTTP(w, r)
+		case ProjectMemberServiceGetProcedure:
+			projectMemberServiceGetHandler.ServeHTTP(w, r)
+		case ProjectMemberServiceFindProcedure:
+			projectMemberServiceFindHandler.ServeHTTP(w, r)
+		default:
+			http.NotFound(w, r)
+		}
+	})
+}
+
+// UnimplementedProjectMemberServiceHandler returns CodeUnimplemented from all methods.
+type UnimplementedProjectMemberServiceHandler struct{}
+
+func (UnimplementedProjectMemberServiceHandler) Create(context.Context, *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectMemberService.Create is not implemented"))
+}
+
+func (UnimplementedProjectMemberServiceHandler) Update(context.Context, *v1.ProjectMemberUpdateRequest) (*v1.ProjectMemberResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectMemberService.Update is not implemented"))
+}
+
+func (UnimplementedProjectMemberServiceHandler) Delete(context.Context, *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectMemberService.Delete is not implemented"))
+}
+
+func (UnimplementedProjectMemberServiceHandler) Get(context.Context, *v1.ProjectMemberGetRequest) (*v1.ProjectMemberResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectMemberService.Get is not implemented"))
+}
+
+func (UnimplementedProjectMemberServiceHandler) Find(context.Context, *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.ProjectMemberService.Find is not implemented"))
+}
diff --git a/api/v1/apiv1connect/tenant.connect.go b/api/v1/apiv1connect/tenant.connect.go
new file mode 100644
index 0000000..63f78fe
--- /dev/null
+++ b/api/v1/apiv1connect/tenant.connect.go
@@ -0,0 +1,372 @@
+// Code generated by protoc-gen-connect-go. DO NOT EDIT.
+//
+// Source: api/v1/tenant.proto
+
+package apiv1connect
+
+import (
+	connect "connectrpc.com/connect"
+	context "context"
+	errors "errors"
+	v1 "github.com/metal-stack/masterdata-api/api/v1"
+	http "net/http"
+	strings "strings"
+)
+
+// This is a compile-time assertion to ensure that this generated file and the connect package are
+// compatible. If you get a compiler error that this constant is not defined, this code was
+// generated with a version of connect newer than the one compiled into your binary. You can fix the
+// problem by either regenerating this code with an older version of connect or updating the connect
+// version compiled into your binary.
+const _ = connect.IsAtLeastVersion1_13_0
+
+const (
+	// TenantServiceName is the fully-qualified name of the TenantService service.
+	TenantServiceName = "api.v1.TenantService"
+)
+
+// These constants are the fully-qualified names of the RPCs defined in this package. They're
+// exposed at runtime as Spec.Procedure and as the final two segments of the HTTP route.
+//
+// Note that these are different from the fully-qualified method names used by
+// google.golang.org/protobuf/reflect/protoreflect. To convert from these constants to
+// reflection-formatted method names, remove the leading slash and convert the remaining slash to a
+// period.
+const (
+	// TenantServiceCreateProcedure is the fully-qualified name of the TenantService's Create RPC.
+	TenantServiceCreateProcedure = "/api.v1.TenantService/Create"
+	// TenantServiceUpdateProcedure is the fully-qualified name of the TenantService's Update RPC.
+	TenantServiceUpdateProcedure = "/api.v1.TenantService/Update"
+	// TenantServiceDeleteProcedure is the fully-qualified name of the TenantService's Delete RPC.
+	TenantServiceDeleteProcedure = "/api.v1.TenantService/Delete"
+	// TenantServiceGetProcedure is the fully-qualified name of the TenantService's Get RPC.
+	TenantServiceGetProcedure = "/api.v1.TenantService/Get"
+	// TenantServiceGetHistoryProcedure is the fully-qualified name of the TenantService's GetHistory
+	// RPC.
+	TenantServiceGetHistoryProcedure = "/api.v1.TenantService/GetHistory"
+	// TenantServiceFindProcedure is the fully-qualified name of the TenantService's Find RPC.
+	TenantServiceFindProcedure = "/api.v1.TenantService/Find"
+	// TenantServiceListTenantMembersProcedure is the fully-qualified name of the TenantService's
+	// ListTenantMembers RPC.
+	TenantServiceListTenantMembersProcedure = "/api.v1.TenantService/ListTenantMembers"
+	// TenantServiceFindParticipatingProjectsProcedure is the fully-qualified name of the
+	// TenantService's FindParticipatingProjects RPC.
+	TenantServiceFindParticipatingProjectsProcedure = "/api.v1.TenantService/FindParticipatingProjects"
+	// TenantServiceFindParticipatingTenantsProcedure is the fully-qualified name of the TenantService's
+	// FindParticipatingTenants RPC.
+	TenantServiceFindParticipatingTenantsProcedure = "/api.v1.TenantService/FindParticipatingTenants"
+)
+
+// TenantServiceClient is a client for the api.v1.TenantService service.
+type TenantServiceClient interface {
+	Create(context.Context, *v1.TenantCreateRequest) (*v1.TenantResponse, error)
+	Update(context.Context, *v1.TenantUpdateRequest) (*v1.TenantResponse, error)
+	Delete(context.Context, *v1.TenantDeleteRequest) (*v1.TenantResponse, error)
+	Get(context.Context, *v1.TenantGetRequest) (*v1.TenantResponse, error)
+	GetHistory(context.Context, *v1.TenantGetHistoryRequest) (*v1.TenantResponse, error)
+	Find(context.Context, *v1.TenantFindRequest) (*v1.TenantListResponse, error)
+	ListTenantMembers(context.Context, *v1.ListTenantMembersRequest) (*v1.ListTenantMembersResponse, error)
+	FindParticipatingProjects(context.Context, *v1.FindParticipatingProjectsRequest) (*v1.FindParticipatingProjectsResponse, error)
+	FindParticipatingTenants(context.Context, *v1.FindParticipatingTenantsRequest) (*v1.FindParticipatingTenantsResponse, error)
+}
+
+// NewTenantServiceClient constructs a client for the api.v1.TenantService service. By default, it
+// uses the Connect protocol with the binary Protobuf Codec, asks for gzipped responses, and sends
+// uncompressed requests. To use the gRPC or gRPC-Web protocols, supply the connect.WithGRPC() or
+// connect.WithGRPCWeb() options.
+//
+// The URL supplied here should be the base URL for the Connect or gRPC server (for example,
+// http://api.acme.com or https://acme.com/grpc).
+func NewTenantServiceClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) TenantServiceClient {
+	baseURL = strings.TrimRight(baseURL, "/")
+	tenantServiceMethods := v1.File_api_v1_tenant_proto.Services().ByName("TenantService").Methods()
+	return &tenantServiceClient{
+		create: connect.NewClient[v1.TenantCreateRequest, v1.TenantResponse](
+			httpClient,
+			baseURL+TenantServiceCreateProcedure,
+			connect.WithSchema(tenantServiceMethods.ByName("Create")),
+			connect.WithClientOptions(opts...),
+		),
+		update: connect.NewClient[v1.TenantUpdateRequest, v1.TenantResponse](
+			httpClient,
+			baseURL+TenantServiceUpdateProcedure,
+			connect.WithSchema(tenantServiceMethods.ByName("Update")),
+			connect.WithClientOptions(opts...),
+		),
+		delete: connect.NewClient[v1.TenantDeleteRequest, v1.TenantResponse](
+			httpClient,
+			baseURL+TenantServiceDeleteProcedure,
+			connect.WithSchema(tenantServiceMethods.ByName("Delete")),
+			connect.WithClientOptions(opts...),
+		),
+		get: connect.NewClient[v1.TenantGetRequest, v1.TenantResponse](
+			httpClient,
+			baseURL+TenantServiceGetProcedure,
+			connect.WithSchema(tenantServiceMethods.ByName("Get")),
+			connect.WithClientOptions(opts...),
+		),
+		getHistory: connect.NewClient[v1.TenantGetHistoryRequest, v1.TenantResponse](
+			httpClient,
+			baseURL+TenantServiceGetHistoryProcedure,
+			connect.WithSchema(tenantServiceMethods.ByName("GetHistory")),
+			connect.WithClientOptions(opts...),
+		),
+		find: connect.NewClient[v1.TenantFindRequest, v1.TenantListResponse](
+			httpClient,
+			baseURL+TenantServiceFindProcedure,
+			connect.WithSchema(tenantServiceMethods.ByName("Find")),
+			connect.WithClientOptions(opts...),
+		),
+		listTenantMembers: connect.NewClient[v1.ListTenantMembersRequest, v1.ListTenantMembersResponse](
+			httpClient,
+			baseURL+TenantServiceListTenantMembersProcedure,
+			connect.WithSchema(tenantServiceMethods.ByName("ListTenantMembers")),
+			connect.WithClientOptions(opts...),
+		),
+		findParticipatingProjects: connect.NewClient[v1.FindParticipatingProjectsRequest, v1.FindParticipatingProjectsResponse](
+			httpClient,
+			baseURL+TenantServiceFindParticipatingProjectsProcedure,
+			connect.WithSchema(tenantServiceMethods.ByName("FindParticipatingProjects")),
+			connect.WithClientOptions(opts...),
+		),
+		findParticipatingTenants: connect.NewClient[v1.FindParticipatingTenantsRequest, v1.FindParticipatingTenantsResponse](
+			httpClient,
+			baseURL+TenantServiceFindParticipatingTenantsProcedure,
+			connect.WithSchema(tenantServiceMethods.ByName("FindParticipatingTenants")),
+			connect.WithClientOptions(opts...),
+		),
+	}
+}
+
+// tenantServiceClient implements TenantServiceClient.
+type tenantServiceClient struct {
+	create                    *connect.Client[v1.TenantCreateRequest, v1.TenantResponse]
+	update                    *connect.Client[v1.TenantUpdateRequest, v1.TenantResponse]
+	delete                    *connect.Client[v1.TenantDeleteRequest, v1.TenantResponse]
+	get                       *connect.Client[v1.TenantGetRequest, v1.TenantResponse]
+	getHistory                *connect.Client[v1.TenantGetHistoryRequest, v1.TenantResponse]
+	find                      *connect.Client[v1.TenantFindRequest, v1.TenantListResponse]
+	listTenantMembers         *connect.Client[v1.ListTenantMembersRequest, v1.ListTenantMembersResponse]
+	findParticipatingProjects *connect.Client[v1.FindParticipatingProjectsRequest, v1.FindParticipatingProjectsResponse]
+	findParticipatingTenants  *connect.Client[v1.FindParticipatingTenantsRequest, v1.FindParticipatingTenantsResponse]
+}
+
+// Create calls api.v1.TenantService.Create.
+func (c *tenantServiceClient) Create(ctx context.Context, req *v1.TenantCreateRequest) (*v1.TenantResponse, error) {
+	response, err := c.create.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Update calls api.v1.TenantService.Update.
+func (c *tenantServiceClient) Update(ctx context.Context, req *v1.TenantUpdateRequest) (*v1.TenantResponse, error) {
+	response, err := c.update.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Delete calls api.v1.TenantService.Delete.
+func (c *tenantServiceClient) Delete(ctx context.Context, req *v1.TenantDeleteRequest) (*v1.TenantResponse, error) {
+	response, err := c.delete.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Get calls api.v1.TenantService.Get.
+func (c *tenantServiceClient) Get(ctx context.Context, req *v1.TenantGetRequest) (*v1.TenantResponse, error) {
+	response, err := c.get.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// GetHistory calls api.v1.TenantService.GetHistory.
+func (c *tenantServiceClient) GetHistory(ctx context.Context, req *v1.TenantGetHistoryRequest) (*v1.TenantResponse, error) {
+	response, err := c.getHistory.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Find calls api.v1.TenantService.Find.
+func (c *tenantServiceClient) Find(ctx context.Context, req *v1.TenantFindRequest) (*v1.TenantListResponse, error) {
+	response, err := c.find.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// ListTenantMembers calls api.v1.TenantService.ListTenantMembers.
+func (c *tenantServiceClient) ListTenantMembers(ctx context.Context, req *v1.ListTenantMembersRequest) (*v1.ListTenantMembersResponse, error) {
+	response, err := c.listTenantMembers.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// FindParticipatingProjects calls api.v1.TenantService.FindParticipatingProjects.
+func (c *tenantServiceClient) FindParticipatingProjects(ctx context.Context, req *v1.FindParticipatingProjectsRequest) (*v1.FindParticipatingProjectsResponse, error) {
+	response, err := c.findParticipatingProjects.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// FindParticipatingTenants calls api.v1.TenantService.FindParticipatingTenants.
+func (c *tenantServiceClient) FindParticipatingTenants(ctx context.Context, req *v1.FindParticipatingTenantsRequest) (*v1.FindParticipatingTenantsResponse, error) {
+	response, err := c.findParticipatingTenants.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// TenantServiceHandler is an implementation of the api.v1.TenantService service.
+type TenantServiceHandler interface {
+	Create(context.Context, *v1.TenantCreateRequest) (*v1.TenantResponse, error)
+	Update(context.Context, *v1.TenantUpdateRequest) (*v1.TenantResponse, error)
+	Delete(context.Context, *v1.TenantDeleteRequest) (*v1.TenantResponse, error)
+	Get(context.Context, *v1.TenantGetRequest) (*v1.TenantResponse, error)
+	GetHistory(context.Context, *v1.TenantGetHistoryRequest) (*v1.TenantResponse, error)
+	Find(context.Context, *v1.TenantFindRequest) (*v1.TenantListResponse, error)
+	ListTenantMembers(context.Context, *v1.ListTenantMembersRequest) (*v1.ListTenantMembersResponse, error)
+	FindParticipatingProjects(context.Context, *v1.FindParticipatingProjectsRequest) (*v1.FindParticipatingProjectsResponse, error)
+	FindParticipatingTenants(context.Context, *v1.FindParticipatingTenantsRequest) (*v1.FindParticipatingTenantsResponse, error)
+}
+
+// NewTenantServiceHandler builds an HTTP handler from the service implementation. It returns the
+// path on which to mount the handler and the handler itself.
+//
+// By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf
+// and JSON codecs. They also support gzip compression.
+func NewTenantServiceHandler(svc TenantServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) {
+	tenantServiceMethods := v1.File_api_v1_tenant_proto.Services().ByName("TenantService").Methods()
+	tenantServiceCreateHandler := connect.NewUnaryHandlerSimple(
+		TenantServiceCreateProcedure,
+		svc.Create,
+		connect.WithSchema(tenantServiceMethods.ByName("Create")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantServiceUpdateHandler := connect.NewUnaryHandlerSimple(
+		TenantServiceUpdateProcedure,
+		svc.Update,
+		connect.WithSchema(tenantServiceMethods.ByName("Update")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantServiceDeleteHandler := connect.NewUnaryHandlerSimple(
+		TenantServiceDeleteProcedure,
+		svc.Delete,
+		connect.WithSchema(tenantServiceMethods.ByName("Delete")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantServiceGetHandler := connect.NewUnaryHandlerSimple(
+		TenantServiceGetProcedure,
+		svc.Get,
+		connect.WithSchema(tenantServiceMethods.ByName("Get")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantServiceGetHistoryHandler := connect.NewUnaryHandlerSimple(
+		TenantServiceGetHistoryProcedure,
+		svc.GetHistory,
+		connect.WithSchema(tenantServiceMethods.ByName("GetHistory")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantServiceFindHandler := connect.NewUnaryHandlerSimple(
+		TenantServiceFindProcedure,
+		svc.Find,
+		connect.WithSchema(tenantServiceMethods.ByName("Find")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantServiceListTenantMembersHandler := connect.NewUnaryHandlerSimple(
+		TenantServiceListTenantMembersProcedure,
+		svc.ListTenantMembers,
+		connect.WithSchema(tenantServiceMethods.ByName("ListTenantMembers")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantServiceFindParticipatingProjectsHandler := connect.NewUnaryHandlerSimple(
+		TenantServiceFindParticipatingProjectsProcedure,
+		svc.FindParticipatingProjects,
+		connect.WithSchema(tenantServiceMethods.ByName("FindParticipatingProjects")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantServiceFindParticipatingTenantsHandler := connect.NewUnaryHandlerSimple(
+		TenantServiceFindParticipatingTenantsProcedure,
+		svc.FindParticipatingTenants,
+		connect.WithSchema(tenantServiceMethods.ByName("FindParticipatingTenants")),
+		connect.WithHandlerOptions(opts...),
+	)
+	return "/api.v1.TenantService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case TenantServiceCreateProcedure:
+			tenantServiceCreateHandler.ServeHTTP(w, r)
+		case TenantServiceUpdateProcedure:
+			tenantServiceUpdateHandler.ServeHTTP(w, r)
+		case TenantServiceDeleteProcedure:
+			tenantServiceDeleteHandler.ServeHTTP(w, r)
+		case TenantServiceGetProcedure:
+			tenantServiceGetHandler.ServeHTTP(w, r)
+		case TenantServiceGetHistoryProcedure:
+			tenantServiceGetHistoryHandler.ServeHTTP(w, r)
+		case TenantServiceFindProcedure:
+			tenantServiceFindHandler.ServeHTTP(w, r)
+		case TenantServiceListTenantMembersProcedure:
+			tenantServiceListTenantMembersHandler.ServeHTTP(w, r)
+		case TenantServiceFindParticipatingProjectsProcedure:
+			tenantServiceFindParticipatingProjectsHandler.ServeHTTP(w, r)
+		case TenantServiceFindParticipatingTenantsProcedure:
+			tenantServiceFindParticipatingTenantsHandler.ServeHTTP(w, r)
+		default:
+			http.NotFound(w, r)
+		}
+	})
+}
+
+// UnimplementedTenantServiceHandler returns CodeUnimplemented from all methods.
+type UnimplementedTenantServiceHandler struct{}
+
+func (UnimplementedTenantServiceHandler) Create(context.Context, *v1.TenantCreateRequest) (*v1.TenantResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantService.Create is not implemented"))
+}
+
+func (UnimplementedTenantServiceHandler) Update(context.Context, *v1.TenantUpdateRequest) (*v1.TenantResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantService.Update is not implemented"))
+}
+
+func (UnimplementedTenantServiceHandler) Delete(context.Context, *v1.TenantDeleteRequest) (*v1.TenantResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantService.Delete is not implemented"))
+}
+
+func (UnimplementedTenantServiceHandler) Get(context.Context, *v1.TenantGetRequest) (*v1.TenantResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantService.Get is not implemented"))
+}
+
+func (UnimplementedTenantServiceHandler) GetHistory(context.Context, *v1.TenantGetHistoryRequest) (*v1.TenantResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantService.GetHistory is not implemented"))
+}
+
+func (UnimplementedTenantServiceHandler) Find(context.Context, *v1.TenantFindRequest) (*v1.TenantListResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantService.Find is not implemented"))
+}
+
+func (UnimplementedTenantServiceHandler) ListTenantMembers(context.Context, *v1.ListTenantMembersRequest) (*v1.ListTenantMembersResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantService.ListTenantMembers is not implemented"))
+}
+
+func (UnimplementedTenantServiceHandler) FindParticipatingProjects(context.Context, *v1.FindParticipatingProjectsRequest) (*v1.FindParticipatingProjectsResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantService.FindParticipatingProjects is not implemented"))
+}
+
+func (UnimplementedTenantServiceHandler) FindParticipatingTenants(context.Context, *v1.FindParticipatingTenantsRequest) (*v1.FindParticipatingTenantsResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantService.FindParticipatingTenants is not implemented"))
+}
diff --git a/api/v1/apiv1connect/tenant_member.connect.go b/api/v1/apiv1connect/tenant_member.connect.go
new file mode 100644
index 0000000..36098ab
--- /dev/null
+++ b/api/v1/apiv1connect/tenant_member.connect.go
@@ -0,0 +1,244 @@
+// Code generated by protoc-gen-connect-go. DO NOT EDIT.
+//
+// Source: api/v1/tenant_member.proto
+
+package apiv1connect
+
+import (
+	connect "connectrpc.com/connect"
+	context "context"
+	errors "errors"
+	v1 "github.com/metal-stack/masterdata-api/api/v1"
+	http "net/http"
+	strings "strings"
+)
+
+// This is a compile-time assertion to ensure that this generated file and the connect package are
+// compatible. If you get a compiler error that this constant is not defined, this code was
+// generated with a version of connect newer than the one compiled into your binary. You can fix the
+// problem by either regenerating this code with an older version of connect or updating the connect
+// version compiled into your binary.
+const _ = connect.IsAtLeastVersion1_13_0
+
+const (
+	// TenantMemberServiceName is the fully-qualified name of the TenantMemberService service.
+	TenantMemberServiceName = "api.v1.TenantMemberService"
+)
+
+// These constants are the fully-qualified names of the RPCs defined in this package. They're
+// exposed at runtime as Spec.Procedure and as the final two segments of the HTTP route.
+//
+// Note that these are different from the fully-qualified method names used by
+// google.golang.org/protobuf/reflect/protoreflect. To convert from these constants to
+// reflection-formatted method names, remove the leading slash and convert the remaining slash to a
+// period.
+const (
+	// TenantMemberServiceCreateProcedure is the fully-qualified name of the TenantMemberService's
+	// Create RPC.
+	TenantMemberServiceCreateProcedure = "/api.v1.TenantMemberService/Create"
+	// TenantMemberServiceUpdateProcedure is the fully-qualified name of the TenantMemberService's
+	// Update RPC.
+	TenantMemberServiceUpdateProcedure = "/api.v1.TenantMemberService/Update"
+	// TenantMemberServiceDeleteProcedure is the fully-qualified name of the TenantMemberService's
+	// Delete RPC.
+	TenantMemberServiceDeleteProcedure = "/api.v1.TenantMemberService/Delete"
+	// TenantMemberServiceGetProcedure is the fully-qualified name of the TenantMemberService's Get RPC.
+	TenantMemberServiceGetProcedure = "/api.v1.TenantMemberService/Get"
+	// TenantMemberServiceFindProcedure is the fully-qualified name of the TenantMemberService's Find
+	// RPC.
+	TenantMemberServiceFindProcedure = "/api.v1.TenantMemberService/Find"
+)
+
+// TenantMemberServiceClient is a client for the api.v1.TenantMemberService service.
+type TenantMemberServiceClient interface {
+	Create(context.Context, *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error)
+	Update(context.Context, *v1.TenantMemberUpdateRequest) (*v1.TenantMemberResponse, error)
+	Delete(context.Context, *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error)
+	Get(context.Context, *v1.TenantMemberGetRequest) (*v1.TenantMemberResponse, error)
+	Find(context.Context, *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error)
+}
+
+// NewTenantMemberServiceClient constructs a client for the api.v1.TenantMemberService service. By
+// default, it uses the Connect protocol with the binary Protobuf Codec, asks for gzipped responses,
+// and sends uncompressed requests. To use the gRPC or gRPC-Web protocols, supply the
+// connect.WithGRPC() or connect.WithGRPCWeb() options.
+//
+// The URL supplied here should be the base URL for the Connect or gRPC server (for example,
+// http://api.acme.com or https://acme.com/grpc).
+func NewTenantMemberServiceClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) TenantMemberServiceClient {
+	baseURL = strings.TrimRight(baseURL, "/")
+	tenantMemberServiceMethods := v1.File_api_v1_tenant_member_proto.Services().ByName("TenantMemberService").Methods()
+	return &tenantMemberServiceClient{
+		create: connect.NewClient[v1.TenantMemberCreateRequest, v1.TenantMemberResponse](
+			httpClient,
+			baseURL+TenantMemberServiceCreateProcedure,
+			connect.WithSchema(tenantMemberServiceMethods.ByName("Create")),
+			connect.WithClientOptions(opts...),
+		),
+		update: connect.NewClient[v1.TenantMemberUpdateRequest, v1.TenantMemberResponse](
+			httpClient,
+			baseURL+TenantMemberServiceUpdateProcedure,
+			connect.WithSchema(tenantMemberServiceMethods.ByName("Update")),
+			connect.WithClientOptions(opts...),
+		),
+		delete: connect.NewClient[v1.TenantMemberDeleteRequest, v1.TenantMemberResponse](
+			httpClient,
+			baseURL+TenantMemberServiceDeleteProcedure,
+			connect.WithSchema(tenantMemberServiceMethods.ByName("Delete")),
+			connect.WithClientOptions(opts...),
+		),
+		get: connect.NewClient[v1.TenantMemberGetRequest, v1.TenantMemberResponse](
+			httpClient,
+			baseURL+TenantMemberServiceGetProcedure,
+			connect.WithSchema(tenantMemberServiceMethods.ByName("Get")),
+			connect.WithClientOptions(opts...),
+		),
+		find: connect.NewClient[v1.TenantMemberFindRequest, v1.TenantMemberListResponse](
+			httpClient,
+			baseURL+TenantMemberServiceFindProcedure,
+			connect.WithSchema(tenantMemberServiceMethods.ByName("Find")),
+			connect.WithClientOptions(opts...),
+		),
+	}
+}
+
+// tenantMemberServiceClient implements TenantMemberServiceClient.
+type tenantMemberServiceClient struct {
+	create *connect.Client[v1.TenantMemberCreateRequest, v1.TenantMemberResponse]
+	update *connect.Client[v1.TenantMemberUpdateRequest, v1.TenantMemberResponse]
+	delete *connect.Client[v1.TenantMemberDeleteRequest, v1.TenantMemberResponse]
+	get    *connect.Client[v1.TenantMemberGetRequest, v1.TenantMemberResponse]
+	find   *connect.Client[v1.TenantMemberFindRequest, v1.TenantMemberListResponse]
+}
+
+// Create calls api.v1.TenantMemberService.Create.
+func (c *tenantMemberServiceClient) Create(ctx context.Context, req *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error) {
+	response, err := c.create.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Update calls api.v1.TenantMemberService.Update.
+func (c *tenantMemberServiceClient) Update(ctx context.Context, req *v1.TenantMemberUpdateRequest) (*v1.TenantMemberResponse, error) {
+	response, err := c.update.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Delete calls api.v1.TenantMemberService.Delete.
+func (c *tenantMemberServiceClient) Delete(ctx context.Context, req *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error) {
+	response, err := c.delete.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Get calls api.v1.TenantMemberService.Get.
+func (c *tenantMemberServiceClient) Get(ctx context.Context, req *v1.TenantMemberGetRequest) (*v1.TenantMemberResponse, error) {
+	response, err := c.get.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// Find calls api.v1.TenantMemberService.Find.
+func (c *tenantMemberServiceClient) Find(ctx context.Context, req *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error) {
+	response, err := c.find.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// TenantMemberServiceHandler is an implementation of the api.v1.TenantMemberService service.
+type TenantMemberServiceHandler interface {
+	Create(context.Context, *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error)
+	Update(context.Context, *v1.TenantMemberUpdateRequest) (*v1.TenantMemberResponse, error)
+	Delete(context.Context, *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error)
+	Get(context.Context, *v1.TenantMemberGetRequest) (*v1.TenantMemberResponse, error)
+	Find(context.Context, *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error)
+}
+
+// NewTenantMemberServiceHandler builds an HTTP handler from the service implementation. It returns
+// the path on which to mount the handler and the handler itself.
+//
+// By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf
+// and JSON codecs. They also support gzip compression.
+func NewTenantMemberServiceHandler(svc TenantMemberServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) {
+	tenantMemberServiceMethods := v1.File_api_v1_tenant_member_proto.Services().ByName("TenantMemberService").Methods()
+	tenantMemberServiceCreateHandler := connect.NewUnaryHandlerSimple(
+		TenantMemberServiceCreateProcedure,
+		svc.Create,
+		connect.WithSchema(tenantMemberServiceMethods.ByName("Create")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantMemberServiceUpdateHandler := connect.NewUnaryHandlerSimple(
+		TenantMemberServiceUpdateProcedure,
+		svc.Update,
+		connect.WithSchema(tenantMemberServiceMethods.ByName("Update")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantMemberServiceDeleteHandler := connect.NewUnaryHandlerSimple(
+		TenantMemberServiceDeleteProcedure,
+		svc.Delete,
+		connect.WithSchema(tenantMemberServiceMethods.ByName("Delete")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantMemberServiceGetHandler := connect.NewUnaryHandlerSimple(
+		TenantMemberServiceGetProcedure,
+		svc.Get,
+		connect.WithSchema(tenantMemberServiceMethods.ByName("Get")),
+		connect.WithHandlerOptions(opts...),
+	)
+	tenantMemberServiceFindHandler := connect.NewUnaryHandlerSimple(
+		TenantMemberServiceFindProcedure,
+		svc.Find,
+		connect.WithSchema(tenantMemberServiceMethods.ByName("Find")),
+		connect.WithHandlerOptions(opts...),
+	)
+	return "/api.v1.TenantMemberService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case TenantMemberServiceCreateProcedure:
+			tenantMemberServiceCreateHandler.ServeHTTP(w, r)
+		case TenantMemberServiceUpdateProcedure:
+			tenantMemberServiceUpdateHandler.ServeHTTP(w, r)
+		case TenantMemberServiceDeleteProcedure:
+			tenantMemberServiceDeleteHandler.ServeHTTP(w, r)
+		case TenantMemberServiceGetProcedure:
+			tenantMemberServiceGetHandler.ServeHTTP(w, r)
+		case TenantMemberServiceFindProcedure:
+			tenantMemberServiceFindHandler.ServeHTTP(w, r)
+		default:
+			http.NotFound(w, r)
+		}
+	})
+}
+
+// UnimplementedTenantMemberServiceHandler returns CodeUnimplemented from all methods.
+type UnimplementedTenantMemberServiceHandler struct{}
+
+func (UnimplementedTenantMemberServiceHandler) Create(context.Context, *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantMemberService.Create is not implemented"))
+}
+
+func (UnimplementedTenantMemberServiceHandler) Update(context.Context, *v1.TenantMemberUpdateRequest) (*v1.TenantMemberResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantMemberService.Update is not implemented"))
+}
+
+func (UnimplementedTenantMemberServiceHandler) Delete(context.Context, *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantMemberService.Delete is not implemented"))
+}
+
+func (UnimplementedTenantMemberServiceHandler) Get(context.Context, *v1.TenantMemberGetRequest) (*v1.TenantMemberResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantMemberService.Get is not implemented"))
+}
+
+func (UnimplementedTenantMemberServiceHandler) Find(context.Context, *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.TenantMemberService.Find is not implemented"))
+}
diff --git a/api/v1/apiv1connect/version.connect.go b/api/v1/apiv1connect/version.connect.go
new file mode 100644
index 0000000..184db34
--- /dev/null
+++ b/api/v1/apiv1connect/version.connect.go
@@ -0,0 +1,112 @@
+// Code generated by protoc-gen-connect-go. DO NOT EDIT.
+//
+// Source: api/v1/version.proto
+
+package apiv1connect
+
+import (
+	connect "connectrpc.com/connect"
+	context "context"
+	errors "errors"
+	v1 "github.com/metal-stack/masterdata-api/api/v1"
+	http "net/http"
+	strings "strings"
+)
+
+// This is a compile-time assertion to ensure that this generated file and the connect package are
+// compatible. If you get a compiler error that this constant is not defined, this code was
+// generated with a version of connect newer than the one compiled into your binary. You can fix the
+// problem by either regenerating this code with an older version of connect or updating the connect
+// version compiled into your binary.
+const _ = connect.IsAtLeastVersion1_13_0
+
+const (
+	// VersionServiceName is the fully-qualified name of the VersionService service.
+	VersionServiceName = "api.v1.VersionService"
+)
+
+// These constants are the fully-qualified names of the RPCs defined in this package. They're
+// exposed at runtime as Spec.Procedure and as the final two segments of the HTTP route.
+//
+// Note that these are different from the fully-qualified method names used by
+// google.golang.org/protobuf/reflect/protoreflect. To convert from these constants to
+// reflection-formatted method names, remove the leading slash and convert the remaining slash to a
+// period.
+const (
+	// VersionServiceGetProcedure is the fully-qualified name of the VersionService's Get RPC.
+	VersionServiceGetProcedure = "/api.v1.VersionService/Get"
+)
+
+// VersionServiceClient is a client for the api.v1.VersionService service.
+type VersionServiceClient interface {
+	Get(context.Context, *v1.GetVersionRequest) (*v1.GetVersionResponse, error)
+}
+
+// NewVersionServiceClient constructs a client for the api.v1.VersionService service. By default, it
+// uses the Connect protocol with the binary Protobuf Codec, asks for gzipped responses, and sends
+// uncompressed requests. To use the gRPC or gRPC-Web protocols, supply the connect.WithGRPC() or
+// connect.WithGRPCWeb() options.
+//
+// The URL supplied here should be the base URL for the Connect or gRPC server (for example,
+// http://api.acme.com or https://acme.com/grpc).
+func NewVersionServiceClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) VersionServiceClient {
+	baseURL = strings.TrimRight(baseURL, "/")
+	versionServiceMethods := v1.File_api_v1_version_proto.Services().ByName("VersionService").Methods()
+	return &versionServiceClient{
+		get: connect.NewClient[v1.GetVersionRequest, v1.GetVersionResponse](
+			httpClient,
+			baseURL+VersionServiceGetProcedure,
+			connect.WithSchema(versionServiceMethods.ByName("Get")),
+			connect.WithClientOptions(opts...),
+		),
+	}
+}
+
+// versionServiceClient implements VersionServiceClient.
+type versionServiceClient struct {
+	get *connect.Client[v1.GetVersionRequest, v1.GetVersionResponse]
+}
+
+// Get calls api.v1.VersionService.Get.
+func (c *versionServiceClient) Get(ctx context.Context, req *v1.GetVersionRequest) (*v1.GetVersionResponse, error) {
+	response, err := c.get.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// VersionServiceHandler is an implementation of the api.v1.VersionService service.
+type VersionServiceHandler interface {
+	Get(context.Context, *v1.GetVersionRequest) (*v1.GetVersionResponse, error)
+}
+
+// NewVersionServiceHandler builds an HTTP handler from the service implementation. It returns the
+// path on which to mount the handler and the handler itself.
+//
+// By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf
+// and JSON codecs. They also support gzip compression.
+func NewVersionServiceHandler(svc VersionServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) {
+	versionServiceMethods := v1.File_api_v1_version_proto.Services().ByName("VersionService").Methods()
+	versionServiceGetHandler := connect.NewUnaryHandlerSimple(
+		VersionServiceGetProcedure,
+		svc.Get,
+		connect.WithSchema(versionServiceMethods.ByName("Get")),
+		connect.WithHandlerOptions(opts...),
+	)
+	return "/api.v1.VersionService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case VersionServiceGetProcedure:
+			versionServiceGetHandler.ServeHTTP(w, r)
+		default:
+			http.NotFound(w, r)
+		}
+	})
+}
+
+// UnimplementedVersionServiceHandler returns CodeUnimplemented from all methods.
+type UnimplementedVersionServiceHandler struct{}
+
+func (UnimplementedVersionServiceHandler) Get(context.Context, *v1.GetVersionRequest) (*v1.GetVersionResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("api.v1.VersionService.Get is not implemented"))
+}
diff --git a/api/v1/common.pb.go b/api/v1/common.pb.go
index 32de349..ffe6da5 100644
--- a/api/v1/common.pb.go
+++ b/api/v1/common.pb.go
@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.8
+// 	protoc-gen-go v1.36.10
 // 	protoc        (unknown)
-// source: v1/common.proto
+// source: api/v1/common.proto
 
-package v1
+package apiv1
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -34,7 +34,7 @@ type Paging struct {
 
 func (x *Paging) Reset() {
 	*x = Paging{}
-	mi := &file_v1_common_proto_msgTypes[0]
+	mi := &file_api_v1_common_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -46,7 +46,7 @@ func (x *Paging) String() string {
 func (*Paging) ProtoMessage() {}
 
 func (x *Paging) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_common_proto_msgTypes[0]
+	mi := &file_api_v1_common_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -59,7 +59,7 @@ func (x *Paging) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Paging.ProtoReflect.Descriptor instead.
 func (*Paging) Descriptor() ([]byte, []int) {
-	return file_v1_common_proto_rawDescGZIP(), []int{0}
+	return file_api_v1_common_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Paging) GetPage() uint64 {
@@ -76,35 +76,36 @@ func (x *Paging) GetCount() uint64 {
 	return 0
 }
 
-var File_v1_common_proto protoreflect.FileDescriptor
+var File_api_v1_common_proto protoreflect.FileDescriptor
 
-const file_v1_common_proto_rawDesc = "" +
+const file_api_v1_common_proto_rawDesc = "" +
 	"\n" +
-	"\x0fv1/common.proto\x12\x02v1\"O\n" +
+	"\x13api/v1/common.proto\x12\x06api.v1\"O\n" +
 	"\x06Paging\x12\x17\n" +
 	"\x04page\x18\x01 \x01(\x04H\x00R\x04page\x88\x01\x01\x12\x19\n" +
 	"\x05count\x18\x02 \x01(\x04H\x01R\x05count\x88\x01\x01B\a\n" +
 	"\x05_pageB\b\n" +
-	"\x06_countBg\n" +
-	"\x06com.v1B\vCommonProtoP\x01Z(github.com/metal-stack/masterdata-api/v1\xa2\x02\x03VXX\xaa\x02\x02V1\xca\x02\x02V1\xe2\x02\x0eV1\\GPBMetadata\xea\x02\x02V1b\x06proto3"
+	"\x06_countB\x86\x01\n" +
+	"\n" +
+	"com.api.v1B\vCommonProtoP\x01Z2github.com/metal-stack/masterdata-api/api/v1;apiv1\xa2\x02\x03AXX\xaa\x02\x06Api.V1\xca\x02\x06Api\\V1\xe2\x02\x12Api\\V1\\GPBMetadata\xea\x02\aApi::V1b\x06proto3"
 
 var (
-	file_v1_common_proto_rawDescOnce sync.Once
-	file_v1_common_proto_rawDescData []byte
+	file_api_v1_common_proto_rawDescOnce sync.Once
+	file_api_v1_common_proto_rawDescData []byte
 )
 
-func file_v1_common_proto_rawDescGZIP() []byte {
-	file_v1_common_proto_rawDescOnce.Do(func() {
-		file_v1_common_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_v1_common_proto_rawDesc), len(file_v1_common_proto_rawDesc)))
+func file_api_v1_common_proto_rawDescGZIP() []byte {
+	file_api_v1_common_proto_rawDescOnce.Do(func() {
+		file_api_v1_common_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_common_proto_rawDesc), len(file_api_v1_common_proto_rawDesc)))
 	})
-	return file_v1_common_proto_rawDescData
+	return file_api_v1_common_proto_rawDescData
 }
 
-var file_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_v1_common_proto_goTypes = []any{
-	(*Paging)(nil), // 0: v1.Paging
+var file_api_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_api_v1_common_proto_goTypes = []any{
+	(*Paging)(nil), // 0: api.v1.Paging
 }
-var file_v1_common_proto_depIdxs = []int32{
+var file_api_v1_common_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
@@ -112,27 +113,27 @@ var file_v1_common_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for field type_name
 }
 
-func init() { file_v1_common_proto_init() }
-func file_v1_common_proto_init() {
-	if File_v1_common_proto != nil {
+func init() { file_api_v1_common_proto_init() }
+func file_api_v1_common_proto_init() {
+	if File_api_v1_common_proto != nil {
 		return
 	}
-	file_v1_common_proto_msgTypes[0].OneofWrappers = []any{}
+	file_api_v1_common_proto_msgTypes[0].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_common_proto_rawDesc), len(file_v1_common_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_common_proto_rawDesc), len(file_api_v1_common_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_v1_common_proto_goTypes,
-		DependencyIndexes: file_v1_common_proto_depIdxs,
-		MessageInfos:      file_v1_common_proto_msgTypes,
+		GoTypes:           file_api_v1_common_proto_goTypes,
+		DependencyIndexes: file_api_v1_common_proto_depIdxs,
+		MessageInfos:      file_api_v1_common_proto_msgTypes,
 	}.Build()
-	File_v1_common_proto = out.File
-	file_v1_common_proto_goTypes = nil
-	file_v1_common_proto_depIdxs = nil
+	File_api_v1_common_proto = out.File
+	file_api_v1_common_proto_goTypes = nil
+	file_api_v1_common_proto_depIdxs = nil
 }
diff --git a/api/v1/errors.go b/api/v1/errors.go
index cc9e22f..965dc03 100644
--- a/api/v1/errors.go
+++ b/api/v1/errors.go
@@ -1,4 +1,4 @@
-package v1
+package apiv1
 
 import (
 	"google.golang.org/grpc/codes"
diff --git a/api/v1/iam.pb.go b/api/v1/iam.pb.go
index 3ce6296..713feda 100644
--- a/api/v1/iam.pb.go
+++ b/api/v1/iam.pb.go
@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.8
+// 	protoc-gen-go v1.36.10
 // 	protoc        (unknown)
-// source: v1/iam.proto
+// source: api/v1/iam.proto
 
-package v1
+package apiv1
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -32,7 +32,7 @@ type IAMConfig struct {
 
 func (x *IAMConfig) Reset() {
 	*x = IAMConfig{}
-	mi := &file_v1_iam_proto_msgTypes[0]
+	mi := &file_api_v1_iam_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -44,7 +44,7 @@ func (x *IAMConfig) String() string {
 func (*IAMConfig) ProtoMessage() {}
 
 func (x *IAMConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_iam_proto_msgTypes[0]
+	mi := &file_api_v1_iam_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -57,7 +57,7 @@ func (x *IAMConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IAMConfig.ProtoReflect.Descriptor instead.
 func (*IAMConfig) Descriptor() ([]byte, []int) {
-	return file_v1_iam_proto_rawDescGZIP(), []int{0}
+	return file_api_v1_iam_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *IAMConfig) GetIssuerConfig() *IssuerConfig {
@@ -91,7 +91,7 @@ type IssuerConfig struct {
 
 func (x *IssuerConfig) Reset() {
 	*x = IssuerConfig{}
-	mi := &file_v1_iam_proto_msgTypes[1]
+	mi := &file_api_v1_iam_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -103,7 +103,7 @@ func (x *IssuerConfig) String() string {
 func (*IssuerConfig) ProtoMessage() {}
 
 func (x *IssuerConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_iam_proto_msgTypes[1]
+	mi := &file_api_v1_iam_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -116,7 +116,7 @@ func (x *IssuerConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IssuerConfig.ProtoReflect.Descriptor instead.
 func (*IssuerConfig) Descriptor() ([]byte, []int) {
-	return file_v1_iam_proto_rawDescGZIP(), []int{1}
+	return file_api_v1_iam_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *IssuerConfig) GetUrl() string {
@@ -145,7 +145,7 @@ type IDMConfig struct {
 
 func (x *IDMConfig) Reset() {
 	*x = IDMConfig{}
-	mi := &file_v1_iam_proto_msgTypes[2]
+	mi := &file_api_v1_iam_proto_msgTypes[2]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -157,7 +157,7 @@ func (x *IDMConfig) String() string {
 func (*IDMConfig) ProtoMessage() {}
 
 func (x *IDMConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_iam_proto_msgTypes[2]
+	mi := &file_api_v1_iam_proto_msgTypes[2]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -170,7 +170,7 @@ func (x *IDMConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IDMConfig.ProtoReflect.Descriptor instead.
 func (*IDMConfig) Descriptor() ([]byte, []int) {
-	return file_v1_iam_proto_rawDescGZIP(), []int{2}
+	return file_api_v1_iam_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *IDMConfig) GetIdmType() string {
@@ -210,7 +210,7 @@ type NamespaceGroupConfig struct {
 
 func (x *NamespaceGroupConfig) Reset() {
 	*x = NamespaceGroupConfig{}
-	mi := &file_v1_iam_proto_msgTypes[3]
+	mi := &file_api_v1_iam_proto_msgTypes[3]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -222,7 +222,7 @@ func (x *NamespaceGroupConfig) String() string {
 func (*NamespaceGroupConfig) ProtoMessage() {}
 
 func (x *NamespaceGroupConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_iam_proto_msgTypes[3]
+	mi := &file_api_v1_iam_proto_msgTypes[3]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -235,7 +235,7 @@ func (x *NamespaceGroupConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NamespaceGroupConfig.ProtoReflect.Descriptor instead.
 func (*NamespaceGroupConfig) Descriptor() ([]byte, []int) {
-	return file_v1_iam_proto_rawDescGZIP(), []int{3}
+	return file_api_v1_iam_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *NamespaceGroupConfig) GetExcludedNamespaces() string {
@@ -297,7 +297,7 @@ type ConnectorConfig struct {
 
 func (x *ConnectorConfig) Reset() {
 	*x = ConnectorConfig{}
-	mi := &file_v1_iam_proto_msgTypes[4]
+	mi := &file_api_v1_iam_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -309,7 +309,7 @@ func (x *ConnectorConfig) String() string {
 func (*ConnectorConfig) ProtoMessage() {}
 
 func (x *ConnectorConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_iam_proto_msgTypes[4]
+	mi := &file_api_v1_iam_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -322,7 +322,7 @@ func (x *ConnectorConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConnectorConfig.ProtoReflect.Descriptor instead.
 func (*ConnectorConfig) Descriptor() ([]byte, []int) {
-	return file_v1_iam_proto_rawDescGZIP(), []int{4}
+	return file_api_v1_iam_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *ConnectorConfig) GetIdmApiUrl() string {
@@ -423,22 +423,22 @@ func (x *ConnectorConfig) GetIdmReqEmail() string {
 	return ""
 }
 
-var File_v1_iam_proto protoreflect.FileDescriptor
+var File_api_v1_iam_proto protoreflect.FileDescriptor
 
-const file_v1_iam_proto_rawDesc = "" +
+const file_api_v1_iam_proto_rawDesc = "" +
 	"\n" +
-	"\fv1/iam.proto\x12\x02v1\"\xad\x01\n" +
-	"\tIAMConfig\x125\n" +
-	"\rissuer_config\x18\x01 \x01(\v2\x10.v1.IssuerConfigR\fissuerConfig\x12,\n" +
+	"\x10api/v1/iam.proto\x12\x06api.v1\"\xb9\x01\n" +
+	"\tIAMConfig\x129\n" +
+	"\rissuer_config\x18\x01 \x01(\v2\x14.api.v1.IssuerConfigR\fissuerConfig\x120\n" +
 	"\n" +
-	"idm_config\x18\x02 \x01(\v2\r.v1.IDMConfigR\tidmConfig\x12;\n" +
-	"\fgroup_config\x18\x03 \x01(\v2\x18.v1.NamespaceGroupConfigR\vgroupConfig\"=\n" +
+	"idm_config\x18\x02 \x01(\v2\x11.api.v1.IDMConfigR\tidmConfig\x12?\n" +
+	"\fgroup_config\x18\x03 \x01(\v2\x1c.api.v1.NamespaceGroupConfigR\vgroupConfig\"=\n" +
 	"\fIssuerConfig\x12\x10\n" +
 	"\x03url\x18\x01 \x01(\tR\x03url\x12\x1b\n" +
-	"\tclient_id\x18\x02 \x01(\tR\bclientId\"f\n" +
+	"\tclient_id\x18\x02 \x01(\tR\bclientId\"j\n" +
 	"\tIDMConfig\x12\x19\n" +
-	"\bidm_type\x18\x01 \x01(\tR\aidmType\x12>\n" +
-	"\x10connector_config\x18\x02 \x01(\v2\x13.v1.ConnectorConfigR\x0fconnectorConfig\"\xa5\x02\n" +
+	"\bidm_type\x18\x01 \x01(\tR\aidmType\x12B\n" +
+	"\x10connector_config\x18\x02 \x01(\v2\x17.api.v1.ConnectorConfigR\x0fconnectorConfig\"\xa5\x02\n" +
 	"\x14NamespaceGroupConfig\x12/\n" +
 	"\x13excluded_namespaces\x18\x01 \x01(\tR\x12excludedNamespaces\x120\n" +
 	"\x14expected_groups_list\x18\x02 \x01(\tR\x12expectedGroupsList\x120\n" +
@@ -464,34 +464,35 @@ const file_v1_iam_proto_rawDesc = "" +
 	"\x0eidm_req_system\x18\r \x01(\tR\fidmReqSystem\x12 \n" +
 	"\fidm_req_user\x18\x0e \x01(\tR\n" +
 	"idmReqUser\x12\"\n" +
-	"\ridm_req_email\x18\x0f \x01(\tR\vidmReqEmailJ\x04\b\b\x10\tR\x16idm_groupname_templateBd\n" +
-	"\x06com.v1B\bIamProtoP\x01Z(github.com/metal-stack/masterdata-api/v1\xa2\x02\x03VXX\xaa\x02\x02V1\xca\x02\x02V1\xe2\x02\x0eV1\\GPBMetadata\xea\x02\x02V1b\x06proto3"
+	"\ridm_req_email\x18\x0f \x01(\tR\vidmReqEmailJ\x04\b\b\x10\tR\x16idm_groupname_templateB\x83\x01\n" +
+	"\n" +
+	"com.api.v1B\bIamProtoP\x01Z2github.com/metal-stack/masterdata-api/api/v1;apiv1\xa2\x02\x03AXX\xaa\x02\x06Api.V1\xca\x02\x06Api\\V1\xe2\x02\x12Api\\V1\\GPBMetadata\xea\x02\aApi::V1b\x06proto3"
 
 var (
-	file_v1_iam_proto_rawDescOnce sync.Once
-	file_v1_iam_proto_rawDescData []byte
+	file_api_v1_iam_proto_rawDescOnce sync.Once
+	file_api_v1_iam_proto_rawDescData []byte
 )
 
-func file_v1_iam_proto_rawDescGZIP() []byte {
-	file_v1_iam_proto_rawDescOnce.Do(func() {
-		file_v1_iam_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_v1_iam_proto_rawDesc), len(file_v1_iam_proto_rawDesc)))
+func file_api_v1_iam_proto_rawDescGZIP() []byte {
+	file_api_v1_iam_proto_rawDescOnce.Do(func() {
+		file_api_v1_iam_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_iam_proto_rawDesc), len(file_api_v1_iam_proto_rawDesc)))
 	})
-	return file_v1_iam_proto_rawDescData
-}
-
-var file_v1_iam_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_v1_iam_proto_goTypes = []any{
-	(*IAMConfig)(nil),            // 0: v1.IAMConfig
-	(*IssuerConfig)(nil),         // 1: v1.IssuerConfig
-	(*IDMConfig)(nil),            // 2: v1.IDMConfig
-	(*NamespaceGroupConfig)(nil), // 3: v1.NamespaceGroupConfig
-	(*ConnectorConfig)(nil),      // 4: v1.ConnectorConfig
-}
-var file_v1_iam_proto_depIdxs = []int32{
-	1, // 0: v1.IAMConfig.issuer_config:type_name -> v1.IssuerConfig
-	2, // 1: v1.IAMConfig.idm_config:type_name -> v1.IDMConfig
-	3, // 2: v1.IAMConfig.group_config:type_name -> v1.NamespaceGroupConfig
-	4, // 3: v1.IDMConfig.connector_config:type_name -> v1.ConnectorConfig
+	return file_api_v1_iam_proto_rawDescData
+}
+
+var file_api_v1_iam_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_api_v1_iam_proto_goTypes = []any{
+	(*IAMConfig)(nil),            // 0: api.v1.IAMConfig
+	(*IssuerConfig)(nil),         // 1: api.v1.IssuerConfig
+	(*IDMConfig)(nil),            // 2: api.v1.IDMConfig
+	(*NamespaceGroupConfig)(nil), // 3: api.v1.NamespaceGroupConfig
+	(*ConnectorConfig)(nil),      // 4: api.v1.ConnectorConfig
+}
+var file_api_v1_iam_proto_depIdxs = []int32{
+	1, // 0: api.v1.IAMConfig.issuer_config:type_name -> api.v1.IssuerConfig
+	2, // 1: api.v1.IAMConfig.idm_config:type_name -> api.v1.IDMConfig
+	3, // 2: api.v1.IAMConfig.group_config:type_name -> api.v1.NamespaceGroupConfig
+	4, // 3: api.v1.IDMConfig.connector_config:type_name -> api.v1.ConnectorConfig
 	4, // [4:4] is the sub-list for method output_type
 	4, // [4:4] is the sub-list for method input_type
 	4, // [4:4] is the sub-list for extension type_name
@@ -499,26 +500,26 @@ var file_v1_iam_proto_depIdxs = []int32{
 	0, // [0:4] is the sub-list for field type_name
 }
 
-func init() { file_v1_iam_proto_init() }
-func file_v1_iam_proto_init() {
-	if File_v1_iam_proto != nil {
+func init() { file_api_v1_iam_proto_init() }
+func file_api_v1_iam_proto_init() {
+	if File_api_v1_iam_proto != nil {
 		return
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_iam_proto_rawDesc), len(file_v1_iam_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_iam_proto_rawDesc), len(file_api_v1_iam_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_v1_iam_proto_goTypes,
-		DependencyIndexes: file_v1_iam_proto_depIdxs,
-		MessageInfos:      file_v1_iam_proto_msgTypes,
+		GoTypes:           file_api_v1_iam_proto_goTypes,
+		DependencyIndexes: file_api_v1_iam_proto_depIdxs,
+		MessageInfos:      file_api_v1_iam_proto_msgTypes,
 	}.Build()
-	File_v1_iam_proto = out.File
-	file_v1_iam_proto_goTypes = nil
-	file_v1_iam_proto_depIdxs = nil
+	File_api_v1_iam_proto = out.File
+	file_api_v1_iam_proto_goTypes = nil
+	file_api_v1_iam_proto_depIdxs = nil
 }
diff --git a/api/v1/meta.go b/api/v1/meta.go
index 0ac8e72..c0bd313 100644
--- a/api/v1/meta.go
+++ b/api/v1/meta.go
@@ -1,4 +1,4 @@
-package v1
+package apiv1
 
 import (
 	jsoniter "github.com/json-iterator/go"
diff --git a/api/v1/meta.pb.go b/api/v1/meta.pb.go
index 863c51b..db1a354 100644
--- a/api/v1/meta.pb.go
+++ b/api/v1/meta.pb.go
@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.8
+// 	protoc-gen-go v1.36.10
 // 	protoc        (unknown)
-// source: v1/meta.proto
+// source: api/v1/meta.proto
 
-package v1
+package apiv1
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -38,7 +38,7 @@ type Meta struct {
 
 func (x *Meta) Reset() {
 	*x = Meta{}
-	mi := &file_v1_meta_proto_msgTypes[0]
+	mi := &file_api_v1_meta_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -50,7 +50,7 @@ func (x *Meta) String() string {
 func (*Meta) ProtoMessage() {}
 
 func (x *Meta) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_meta_proto_msgTypes[0]
+	mi := &file_api_v1_meta_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -63,7 +63,7 @@ func (x *Meta) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Meta.ProtoReflect.Descriptor instead.
 func (*Meta) Descriptor() ([]byte, []int) {
-	return file_v1_meta_proto_rawDescGZIP(), []int{0}
+	return file_api_v1_meta_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Meta) GetId() string {
@@ -122,11 +122,11 @@ func (x *Meta) GetLabels() []string {
 	return nil
 }
 
-var File_v1_meta_proto protoreflect.FileDescriptor
+var File_api_v1_meta_proto protoreflect.FileDescriptor
 
-const file_v1_meta_proto_rawDesc = "" +
+const file_api_v1_meta_proto_rawDesc = "" +
 	"\n" +
-	"\rv1/meta.proto\x12\x02v1\x1a\x1fgoogle/protobuf/timestamp.proto\"\xf7\x02\n" +
+	"\x11api/v1/meta.proto\x12\x06api.v1\x1a\x1fgoogle/protobuf/timestamp.proto\"\xfb\x02\n" +
 	"\x04Meta\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
 	"\x04kind\x18\x02 \x01(\tR\x04kind\x12\x1e\n" +
@@ -135,36 +135,37 @@ const file_v1_meta_proto_rawDesc = "" +
 	"apiversion\x12\x18\n" +
 	"\aversion\x18\x04 \x01(\x03R\aversion\x12=\n" +
 	"\fcreated_time\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\vcreatedTime\x12=\n" +
-	"\fupdated_time\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampR\vupdatedTime\x12;\n" +
-	"\vannotations\x18\a \x03(\v2\x19.v1.Meta.AnnotationsEntryR\vannotations\x12\x16\n" +
+	"\fupdated_time\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampR\vupdatedTime\x12?\n" +
+	"\vannotations\x18\a \x03(\v2\x1d.api.v1.Meta.AnnotationsEntryR\vannotations\x12\x16\n" +
 	"\x06labels\x18\b \x03(\tR\x06labels\x1a>\n" +
 	"\x10AnnotationsEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
-	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01Be\n" +
-	"\x06com.v1B\tMetaProtoP\x01Z(github.com/metal-stack/masterdata-api/v1\xa2\x02\x03VXX\xaa\x02\x02V1\xca\x02\x02V1\xe2\x02\x0eV1\\GPBMetadata\xea\x02\x02V1b\x06proto3"
+	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\x84\x01\n" +
+	"\n" +
+	"com.api.v1B\tMetaProtoP\x01Z2github.com/metal-stack/masterdata-api/api/v1;apiv1\xa2\x02\x03AXX\xaa\x02\x06Api.V1\xca\x02\x06Api\\V1\xe2\x02\x12Api\\V1\\GPBMetadata\xea\x02\aApi::V1b\x06proto3"
 
 var (
-	file_v1_meta_proto_rawDescOnce sync.Once
-	file_v1_meta_proto_rawDescData []byte
+	file_api_v1_meta_proto_rawDescOnce sync.Once
+	file_api_v1_meta_proto_rawDescData []byte
 )
 
-func file_v1_meta_proto_rawDescGZIP() []byte {
-	file_v1_meta_proto_rawDescOnce.Do(func() {
-		file_v1_meta_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_v1_meta_proto_rawDesc), len(file_v1_meta_proto_rawDesc)))
+func file_api_v1_meta_proto_rawDescGZIP() []byte {
+	file_api_v1_meta_proto_rawDescOnce.Do(func() {
+		file_api_v1_meta_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_meta_proto_rawDesc), len(file_api_v1_meta_proto_rawDesc)))
 	})
-	return file_v1_meta_proto_rawDescData
+	return file_api_v1_meta_proto_rawDescData
 }
 
-var file_v1_meta_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_v1_meta_proto_goTypes = []any{
-	(*Meta)(nil),                  // 0: v1.Meta
-	nil,                           // 1: v1.Meta.AnnotationsEntry
+var file_api_v1_meta_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_api_v1_meta_proto_goTypes = []any{
+	(*Meta)(nil),                  // 0: api.v1.Meta
+	nil,                           // 1: api.v1.Meta.AnnotationsEntry
 	(*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp
 }
-var file_v1_meta_proto_depIdxs = []int32{
-	2, // 0: v1.Meta.created_time:type_name -> google.protobuf.Timestamp
-	2, // 1: v1.Meta.updated_time:type_name -> google.protobuf.Timestamp
-	1, // 2: v1.Meta.annotations:type_name -> v1.Meta.AnnotationsEntry
+var file_api_v1_meta_proto_depIdxs = []int32{
+	2, // 0: api.v1.Meta.created_time:type_name -> google.protobuf.Timestamp
+	2, // 1: api.v1.Meta.updated_time:type_name -> google.protobuf.Timestamp
+	1, // 2: api.v1.Meta.annotations:type_name -> api.v1.Meta.AnnotationsEntry
 	3, // [3:3] is the sub-list for method output_type
 	3, // [3:3] is the sub-list for method input_type
 	3, // [3:3] is the sub-list for extension type_name
@@ -172,26 +173,26 @@ var file_v1_meta_proto_depIdxs = []int32{
 	0, // [0:3] is the sub-list for field type_name
 }
 
-func init() { file_v1_meta_proto_init() }
-func file_v1_meta_proto_init() {
-	if File_v1_meta_proto != nil {
+func init() { file_api_v1_meta_proto_init() }
+func file_api_v1_meta_proto_init() {
+	if File_api_v1_meta_proto != nil {
 		return
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_meta_proto_rawDesc), len(file_v1_meta_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_meta_proto_rawDesc), len(file_api_v1_meta_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_v1_meta_proto_goTypes,
-		DependencyIndexes: file_v1_meta_proto_depIdxs,
-		MessageInfos:      file_v1_meta_proto_msgTypes,
+		GoTypes:           file_api_v1_meta_proto_goTypes,
+		DependencyIndexes: file_api_v1_meta_proto_depIdxs,
+		MessageInfos:      file_api_v1_meta_proto_msgTypes,
 	}.Build()
-	File_v1_meta_proto = out.File
-	file_v1_meta_proto_goTypes = nil
-	file_v1_meta_proto_depIdxs = nil
+	File_api_v1_meta_proto = out.File
+	file_api_v1_meta_proto_goTypes = nil
+	file_api_v1_meta_proto_depIdxs = nil
 }
diff --git a/api/v1/mocks/apiv1connect/ProjectMemberServiceClient.go b/api/v1/mocks/apiv1connect/ProjectMemberServiceClient.go
new file mode 100644
index 0000000..c2a77d4
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/ProjectMemberServiceClient.go
@@ -0,0 +1,182 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// ProjectMemberServiceClient is an autogenerated mock type for the ProjectMemberServiceClient type
+type ProjectMemberServiceClient struct {
+	mock.Mock
+}
+
+// Create provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceClient) Create(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Delete provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceClient) Delete(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Find provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceClient) Find(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberListResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) *connect.Response[apiv1.ProjectMemberListResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberListResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceClient) Get(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Update provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceClient) Update(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewProjectMemberServiceClient creates a new instance of ProjectMemberServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewProjectMemberServiceClient(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *ProjectMemberServiceClient {
+	mock := &ProjectMemberServiceClient{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/mocks/apiv1connect/ProjectMemberServiceHandler.go b/api/v1/mocks/apiv1connect/ProjectMemberServiceHandler.go
new file mode 100644
index 0000000..4a1e61e
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/ProjectMemberServiceHandler.go
@@ -0,0 +1,182 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// ProjectMemberServiceHandler is an autogenerated mock type for the ProjectMemberServiceHandler type
+type ProjectMemberServiceHandler struct {
+	mock.Mock
+}
+
+// Create provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceHandler) Create(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Delete provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceHandler) Delete(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Find provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceHandler) Find(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberListResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) *connect.Response[apiv1.ProjectMemberListResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberListResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceHandler) Get(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Update provides a mock function with given fields: _a0, _a1
+func (_m *ProjectMemberServiceHandler) Update(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewProjectMemberServiceHandler creates a new instance of ProjectMemberServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewProjectMemberServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *ProjectMemberServiceHandler {
+	mock := &ProjectMemberServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/mocks/apiv1connect/ProjectServiceClient.go b/api/v1/mocks/apiv1connect/ProjectServiceClient.go
new file mode 100644
index 0000000..0dc920c
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/ProjectServiceClient.go
@@ -0,0 +1,212 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// ProjectServiceClient is an autogenerated mock type for the ProjectServiceClient type
+type ProjectServiceClient struct {
+	mock.Mock
+}
+
+// Create provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceClient) Create(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Delete provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceClient) Delete(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Find provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceClient) Find(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectListResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) *connect.Response[apiv1.ProjectListResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectListResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceClient) Get(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetHistory provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceClient) GetHistory(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetHistory")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Update provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceClient) Update(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewProjectServiceClient creates a new instance of ProjectServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewProjectServiceClient(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *ProjectServiceClient {
+	mock := &ProjectServiceClient{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/mocks/apiv1connect/ProjectServiceHandler.go b/api/v1/mocks/apiv1connect/ProjectServiceHandler.go
new file mode 100644
index 0000000..e6cd03b
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/ProjectServiceHandler.go
@@ -0,0 +1,212 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// ProjectServiceHandler is an autogenerated mock type for the ProjectServiceHandler type
+type ProjectServiceHandler struct {
+	mock.Mock
+}
+
+// Create provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceHandler) Create(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Delete provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceHandler) Delete(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Find provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceHandler) Find(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectListResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) *connect.Response[apiv1.ProjectListResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectListResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceHandler) Get(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetHistory provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceHandler) GetHistory(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetHistory")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Update provides a mock function with given fields: _a0, _a1
+func (_m *ProjectServiceHandler) Update(_a0 context.Context, _a1 *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewProjectServiceHandler creates a new instance of ProjectServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewProjectServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *ProjectServiceHandler {
+	mock := &ProjectServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/mocks/apiv1connect/TenantMemberServiceClient.go b/api/v1/mocks/apiv1connect/TenantMemberServiceClient.go
new file mode 100644
index 0000000..d7035df
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/TenantMemberServiceClient.go
@@ -0,0 +1,182 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// TenantMemberServiceClient is an autogenerated mock type for the TenantMemberServiceClient type
+type TenantMemberServiceClient struct {
+	mock.Mock
+}
+
+// Create provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceClient) Create(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Delete provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceClient) Delete(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Find provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceClient) Find(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberListResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) *connect.Response[apiv1.TenantMemberListResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberListResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceClient) Get(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Update provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceClient) Update(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewTenantMemberServiceClient creates a new instance of TenantMemberServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewTenantMemberServiceClient(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *TenantMemberServiceClient {
+	mock := &TenantMemberServiceClient{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/mocks/apiv1connect/TenantMemberServiceHandler.go b/api/v1/mocks/apiv1connect/TenantMemberServiceHandler.go
new file mode 100644
index 0000000..5b9504f
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/TenantMemberServiceHandler.go
@@ -0,0 +1,182 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// TenantMemberServiceHandler is an autogenerated mock type for the TenantMemberServiceHandler type
+type TenantMemberServiceHandler struct {
+	mock.Mock
+}
+
+// Create provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceHandler) Create(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Delete provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceHandler) Delete(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Find provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceHandler) Find(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberListResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) *connect.Response[apiv1.TenantMemberListResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberListResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceHandler) Get(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Update provides a mock function with given fields: _a0, _a1
+func (_m *TenantMemberServiceHandler) Update(_a0 context.Context, _a1 *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewTenantMemberServiceHandler creates a new instance of TenantMemberServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewTenantMemberServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *TenantMemberServiceHandler {
+	mock := &TenantMemberServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/mocks/apiv1connect/TenantServiceClient.go b/api/v1/mocks/apiv1connect/TenantServiceClient.go
new file mode 100644
index 0000000..bdf0464
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/TenantServiceClient.go
@@ -0,0 +1,302 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// TenantServiceClient is an autogenerated mock type for the TenantServiceClient type
+type TenantServiceClient struct {
+	mock.Mock
+}
+
+// Create provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceClient) Create(_a0 context.Context, _a1 *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Delete provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceClient) Delete(_a0 context.Context, _a1 *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Find provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceClient) Find(_a0 context.Context, _a1 *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.TenantListResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) *connect.Response[apiv1.TenantListResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantListResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FindParticipatingProjects provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceClient) FindParticipatingProjects(_a0 context.Context, _a1 *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FindParticipatingProjects")
+	}
+
+	var r0 *connect.Response[apiv1.FindParticipatingProjectsResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) *connect.Response[apiv1.FindParticipatingProjectsResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.FindParticipatingProjectsResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FindParticipatingTenants provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceClient) FindParticipatingTenants(_a0 context.Context, _a1 *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FindParticipatingTenants")
+	}
+
+	var r0 *connect.Response[apiv1.FindParticipatingTenantsResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) *connect.Response[apiv1.FindParticipatingTenantsResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.FindParticipatingTenantsResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceClient) Get(_a0 context.Context, _a1 *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetHistory provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceClient) GetHistory(_a0 context.Context, _a1 *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetHistory")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// ListTenantMembers provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceClient) ListTenantMembers(_a0 context.Context, _a1 *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ListTenantMembers")
+	}
+
+	var r0 *connect.Response[apiv1.ListTenantMembersResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) *connect.Response[apiv1.ListTenantMembersResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ListTenantMembersResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Update provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceClient) Update(_a0 context.Context, _a1 *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewTenantServiceClient creates a new instance of TenantServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewTenantServiceClient(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *TenantServiceClient {
+	mock := &TenantServiceClient{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/mocks/apiv1connect/TenantServiceHandler.go b/api/v1/mocks/apiv1connect/TenantServiceHandler.go
new file mode 100644
index 0000000..2107d38
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/TenantServiceHandler.go
@@ -0,0 +1,302 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// TenantServiceHandler is an autogenerated mock type for the TenantServiceHandler type
+type TenantServiceHandler struct {
+	mock.Mock
+}
+
+// Create provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceHandler) Create(_a0 context.Context, _a1 *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Delete provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceHandler) Delete(_a0 context.Context, _a1 *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Find provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceHandler) Find(_a0 context.Context, _a1 *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.TenantListResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) *connect.Response[apiv1.TenantListResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantListResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FindParticipatingProjects provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceHandler) FindParticipatingProjects(_a0 context.Context, _a1 *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FindParticipatingProjects")
+	}
+
+	var r0 *connect.Response[apiv1.FindParticipatingProjectsResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) *connect.Response[apiv1.FindParticipatingProjectsResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.FindParticipatingProjectsResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FindParticipatingTenants provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceHandler) FindParticipatingTenants(_a0 context.Context, _a1 *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FindParticipatingTenants")
+	}
+
+	var r0 *connect.Response[apiv1.FindParticipatingTenantsResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) *connect.Response[apiv1.FindParticipatingTenantsResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.FindParticipatingTenantsResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceHandler) Get(_a0 context.Context, _a1 *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetHistory provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceHandler) GetHistory(_a0 context.Context, _a1 *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetHistory")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// ListTenantMembers provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceHandler) ListTenantMembers(_a0 context.Context, _a1 *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ListTenantMembers")
+	}
+
+	var r0 *connect.Response[apiv1.ListTenantMembersResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) *connect.Response[apiv1.ListTenantMembersResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ListTenantMembersResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Update provides a mock function with given fields: _a0, _a1
+func (_m *TenantServiceHandler) Update(_a0 context.Context, _a1 *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewTenantServiceHandler creates a new instance of TenantServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewTenantServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *TenantServiceHandler {
+	mock := &TenantServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/mocks/apiv1connect/VersionServiceClient.go b/api/v1/mocks/apiv1connect/VersionServiceClient.go
new file mode 100644
index 0000000..d51fbd3
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/VersionServiceClient.go
@@ -0,0 +1,62 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// VersionServiceClient is an autogenerated mock type for the VersionServiceClient type
+type VersionServiceClient struct {
+	mock.Mock
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *VersionServiceClient) Get(_a0 context.Context, _a1 *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.GetVersionResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) *connect.Response[apiv1.GetVersionResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.GetVersionResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewVersionServiceClient creates a new instance of VersionServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewVersionServiceClient(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *VersionServiceClient {
+	mock := &VersionServiceClient{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/mocks/apiv1connect/VersionServiceHandler.go b/api/v1/mocks/apiv1connect/VersionServiceHandler.go
new file mode 100644
index 0000000..99ecd26
--- /dev/null
+++ b/api/v1/mocks/apiv1connect/VersionServiceHandler.go
@@ -0,0 +1,62 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	connect "connectrpc.com/connect"
+
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// VersionServiceHandler is an autogenerated mock type for the VersionServiceHandler type
+type VersionServiceHandler struct {
+	mock.Mock
+}
+
+// Get provides a mock function with given fields: _a0, _a1
+func (_m *VersionServiceHandler) Get(_a0 context.Context, _a1 *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error) {
+	ret := _m.Called(_a0, _a1)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.GetVersionResponse]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error)); ok {
+		return rf(_a0, _a1)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) *connect.Response[apiv1.GetVersionResponse]); ok {
+		r0 = rf(_a0, _a1)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.GetVersionResponse])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) error); ok {
+		r1 = rf(_a0, _a1)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewVersionServiceHandler creates a new instance of VersionServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewVersionServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *VersionServiceHandler {
+	mock := &VersionServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/api/v1/project.go b/api/v1/project.go
index d1a2bfc..7b4da74 100644
--- a/api/v1/project.go
+++ b/api/v1/project.go
@@ -1,6 +1,6 @@
-package v1
+package apiv1
 
-//go:generate go run ../../pkg/gen/genscanvaluer.go -package v1 -type Project
+//go:generate go run ../../pkg/gen/genscanvaluer.go -package apiv1 -type Project
 
 func (m *Project) NewProjectResponse() *ProjectResponse {
 	return &ProjectResponse{
diff --git a/api/v1/project.pb.go b/api/v1/project.pb.go
index cccfebb..9ffcfdc 100644
--- a/api/v1/project.pb.go
+++ b/api/v1/project.pb.go
@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.8
+// 	protoc-gen-go v1.36.10
 // 	protoc        (unknown)
-// source: v1/project.proto
+// source: api/v1/project.proto
 
-package v1
+package apiv1
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -37,7 +37,7 @@ type Project struct {
 
 func (x *Project) Reset() {
 	*x = Project{}
-	mi := &file_v1_project_proto_msgTypes[0]
+	mi := &file_api_v1_project_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -49,7 +49,7 @@ func (x *Project) String() string {
 func (*Project) ProtoMessage() {}
 
 func (x *Project) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_proto_msgTypes[0]
+	mi := &file_api_v1_project_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -62,7 +62,7 @@ func (x *Project) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Project.ProtoReflect.Descriptor instead.
 func (*Project) Descriptor() ([]byte, []int) {
-	return file_v1_project_proto_rawDescGZIP(), []int{0}
+	return file_api_v1_project_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Project) GetMeta() *Meta {
@@ -109,7 +109,7 @@ type ProjectCreateRequest struct {
 
 func (x *ProjectCreateRequest) Reset() {
 	*x = ProjectCreateRequest{}
-	mi := &file_v1_project_proto_msgTypes[1]
+	mi := &file_api_v1_project_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -121,7 +121,7 @@ func (x *ProjectCreateRequest) String() string {
 func (*ProjectCreateRequest) ProtoMessage() {}
 
 func (x *ProjectCreateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_proto_msgTypes[1]
+	mi := &file_api_v1_project_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -134,7 +134,7 @@ func (x *ProjectCreateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectCreateRequest.ProtoReflect.Descriptor instead.
 func (*ProjectCreateRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_proto_rawDescGZIP(), []int{1}
+	return file_api_v1_project_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *ProjectCreateRequest) GetProject() *Project {
@@ -153,7 +153,7 @@ type ProjectUpdateRequest struct {
 
 func (x *ProjectUpdateRequest) Reset() {
 	*x = ProjectUpdateRequest{}
-	mi := &file_v1_project_proto_msgTypes[2]
+	mi := &file_api_v1_project_proto_msgTypes[2]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -165,7 +165,7 @@ func (x *ProjectUpdateRequest) String() string {
 func (*ProjectUpdateRequest) ProtoMessage() {}
 
 func (x *ProjectUpdateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_proto_msgTypes[2]
+	mi := &file_api_v1_project_proto_msgTypes[2]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -178,7 +178,7 @@ func (x *ProjectUpdateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectUpdateRequest.ProtoReflect.Descriptor instead.
 func (*ProjectUpdateRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_proto_rawDescGZIP(), []int{2}
+	return file_api_v1_project_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *ProjectUpdateRequest) GetProject() *Project {
@@ -197,7 +197,7 @@ type ProjectDeleteRequest struct {
 
 func (x *ProjectDeleteRequest) Reset() {
 	*x = ProjectDeleteRequest{}
-	mi := &file_v1_project_proto_msgTypes[3]
+	mi := &file_api_v1_project_proto_msgTypes[3]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -209,7 +209,7 @@ func (x *ProjectDeleteRequest) String() string {
 func (*ProjectDeleteRequest) ProtoMessage() {}
 
 func (x *ProjectDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_proto_msgTypes[3]
+	mi := &file_api_v1_project_proto_msgTypes[3]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -222,7 +222,7 @@ func (x *ProjectDeleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectDeleteRequest.ProtoReflect.Descriptor instead.
 func (*ProjectDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_proto_rawDescGZIP(), []int{3}
+	return file_api_v1_project_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *ProjectDeleteRequest) GetId() string {
@@ -241,7 +241,7 @@ type ProjectGetRequest struct {
 
 func (x *ProjectGetRequest) Reset() {
 	*x = ProjectGetRequest{}
-	mi := &file_v1_project_proto_msgTypes[4]
+	mi := &file_api_v1_project_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -253,7 +253,7 @@ func (x *ProjectGetRequest) String() string {
 func (*ProjectGetRequest) ProtoMessage() {}
 
 func (x *ProjectGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_proto_msgTypes[4]
+	mi := &file_api_v1_project_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -266,7 +266,7 @@ func (x *ProjectGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectGetRequest.ProtoReflect.Descriptor instead.
 func (*ProjectGetRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_proto_rawDescGZIP(), []int{4}
+	return file_api_v1_project_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *ProjectGetRequest) GetId() string {
@@ -286,7 +286,7 @@ type ProjectGetHistoryRequest struct {
 
 func (x *ProjectGetHistoryRequest) Reset() {
 	*x = ProjectGetHistoryRequest{}
-	mi := &file_v1_project_proto_msgTypes[5]
+	mi := &file_api_v1_project_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -298,7 +298,7 @@ func (x *ProjectGetHistoryRequest) String() string {
 func (*ProjectGetHistoryRequest) ProtoMessage() {}
 
 func (x *ProjectGetHistoryRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_proto_msgTypes[5]
+	mi := &file_api_v1_project_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -311,7 +311,7 @@ func (x *ProjectGetHistoryRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectGetHistoryRequest.ProtoReflect.Descriptor instead.
 func (*ProjectGetHistoryRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_proto_rawDescGZIP(), []int{5}
+	return file_api_v1_project_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *ProjectGetHistoryRequest) GetId() string {
@@ -332,13 +332,13 @@ type ProjectFindRequest struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// TODO: remove in next release:
 	//
-	// Deprecated: Marked as deprecated in v1/project.proto.
+	// Deprecated: Marked as deprecated in api/v1/project.proto.
 	DeprecatedId *wrapperspb.StringValue `protobuf:"bytes,1,opt,name=deprecated_id,json=deprecatedId,proto3" json:"deprecated_id,omitempty"`
-	// Deprecated: Marked as deprecated in v1/project.proto.
+	// Deprecated: Marked as deprecated in api/v1/project.proto.
 	DeprecatedName *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=deprecated_name,json=deprecatedName,proto3" json:"deprecated_name,omitempty"`
-	// Deprecated: Marked as deprecated in v1/project.proto.
+	// Deprecated: Marked as deprecated in api/v1/project.proto.
 	DeprecatedDescription *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=deprecated_description,json=deprecatedDescription,proto3" json:"deprecated_description,omitempty"`
-	// Deprecated: Marked as deprecated in v1/project.proto.
+	// Deprecated: Marked as deprecated in api/v1/project.proto.
 	DeprecatedTenantId *wrapperspb.StringValue `protobuf:"bytes,4,opt,name=deprecated_tenant_id,json=deprecatedTenantId,proto3" json:"deprecated_tenant_id,omitempty"`
 	Paging             *Paging                 `protobuf:"bytes,5,opt,name=paging,proto3" json:"paging,omitempty"`
 	Annotations        map[string]string       `protobuf:"bytes,6,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
@@ -353,7 +353,7 @@ type ProjectFindRequest struct {
 
 func (x *ProjectFindRequest) Reset() {
 	*x = ProjectFindRequest{}
-	mi := &file_v1_project_proto_msgTypes[6]
+	mi := &file_api_v1_project_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -365,7 +365,7 @@ func (x *ProjectFindRequest) String() string {
 func (*ProjectFindRequest) ProtoMessage() {}
 
 func (x *ProjectFindRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_proto_msgTypes[6]
+	mi := &file_api_v1_project_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -378,10 +378,10 @@ func (x *ProjectFindRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectFindRequest.ProtoReflect.Descriptor instead.
 func (*ProjectFindRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_proto_rawDescGZIP(), []int{6}
+	return file_api_v1_project_proto_rawDescGZIP(), []int{6}
 }
 
-// Deprecated: Marked as deprecated in v1/project.proto.
+// Deprecated: Marked as deprecated in api/v1/project.proto.
 func (x *ProjectFindRequest) GetDeprecatedId() *wrapperspb.StringValue {
 	if x != nil {
 		return x.DeprecatedId
@@ -389,7 +389,7 @@ func (x *ProjectFindRequest) GetDeprecatedId() *wrapperspb.StringValue {
 	return nil
 }
 
-// Deprecated: Marked as deprecated in v1/project.proto.
+// Deprecated: Marked as deprecated in api/v1/project.proto.
 func (x *ProjectFindRequest) GetDeprecatedName() *wrapperspb.StringValue {
 	if x != nil {
 		return x.DeprecatedName
@@ -397,7 +397,7 @@ func (x *ProjectFindRequest) GetDeprecatedName() *wrapperspb.StringValue {
 	return nil
 }
 
-// Deprecated: Marked as deprecated in v1/project.proto.
+// Deprecated: Marked as deprecated in api/v1/project.proto.
 func (x *ProjectFindRequest) GetDeprecatedDescription() *wrapperspb.StringValue {
 	if x != nil {
 		return x.DeprecatedDescription
@@ -405,7 +405,7 @@ func (x *ProjectFindRequest) GetDeprecatedDescription() *wrapperspb.StringValue
 	return nil
 }
 
-// Deprecated: Marked as deprecated in v1/project.proto.
+// Deprecated: Marked as deprecated in api/v1/project.proto.
 func (x *ProjectFindRequest) GetDeprecatedTenantId() *wrapperspb.StringValue {
 	if x != nil {
 		return x.DeprecatedTenantId
@@ -471,7 +471,7 @@ type ProjectResponse struct {
 
 func (x *ProjectResponse) Reset() {
 	*x = ProjectResponse{}
-	mi := &file_v1_project_proto_msgTypes[7]
+	mi := &file_api_v1_project_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -483,7 +483,7 @@ func (x *ProjectResponse) String() string {
 func (*ProjectResponse) ProtoMessage() {}
 
 func (x *ProjectResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_proto_msgTypes[7]
+	mi := &file_api_v1_project_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -496,7 +496,7 @@ func (x *ProjectResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectResponse.ProtoReflect.Descriptor instead.
 func (*ProjectResponse) Descriptor() ([]byte, []int) {
-	return file_v1_project_proto_rawDescGZIP(), []int{7}
+	return file_api_v1_project_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *ProjectResponse) GetProject() *Project {
@@ -517,7 +517,7 @@ type ProjectListResponse struct {
 
 func (x *ProjectListResponse) Reset() {
 	*x = ProjectListResponse{}
-	mi := &file_v1_project_proto_msgTypes[8]
+	mi := &file_api_v1_project_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -529,7 +529,7 @@ func (x *ProjectListResponse) String() string {
 func (*ProjectListResponse) ProtoMessage() {}
 
 func (x *ProjectListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_proto_msgTypes[8]
+	mi := &file_api_v1_project_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -542,7 +542,7 @@ func (x *ProjectListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectListResponse.ProtoReflect.Descriptor instead.
 func (*ProjectListResponse) Descriptor() ([]byte, []int) {
-	return file_v1_project_proto_rawDescGZIP(), []int{8}
+	return file_api_v1_project_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *ProjectListResponse) GetProjects() []*Project {
@@ -559,36 +559,35 @@ func (x *ProjectListResponse) GetNextPage() uint64 {
 	return 0
 }
 
-var File_v1_project_proto protoreflect.FileDescriptor
+var File_api_v1_project_proto protoreflect.FileDescriptor
 
-const file_v1_project_proto_rawDesc = "" +
+const file_api_v1_project_proto_rawDesc = "" +
 	"\n" +
-	"\x10v1/project.proto\x12\x02v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a\x0fv1/common.proto\x1a\rv1/meta.proto\x1a\x0ev1/quota.proto\"\xa0\x01\n" +
-	"\aProject\x12\x1c\n" +
-	"\x04meta\x18\x01 \x01(\v2\b.v1.MetaR\x04meta\x12\x12\n" +
+	"\x14api/v1/project.proto\x12\x06api.v1\x1a\x13api/v1/common.proto\x1a\x11api/v1/meta.proto\x1a\x12api/v1/quota.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xa8\x01\n" +
+	"\aProject\x12 \n" +
+	"\x04meta\x18\x01 \x01(\v2\f.api.v1.MetaR\x04meta\x12\x12\n" +
 	"\x04name\x18\x02 \x01(\tR\x04name\x12 \n" +
 	"\vdescription\x18\x03 \x01(\tR\vdescription\x12\x1b\n" +
-	"\ttenant_id\x18\x04 \x01(\tR\btenantId\x12$\n" +
-	"\x06quotas\x18\x05 \x01(\v2\f.v1.QuotaSetR\x06quotas\"=\n" +
-	"\x14ProjectCreateRequest\x12%\n" +
-	"\aproject\x18\x01 \x01(\v2\v.v1.ProjectR\aproject\"=\n" +
-	"\x14ProjectUpdateRequest\x12%\n" +
-	"\aproject\x18\x01 \x01(\v2\v.v1.ProjectR\aproject\"&\n" +
+	"\ttenant_id\x18\x04 \x01(\tR\btenantId\x12(\n" +
+	"\x06quotas\x18\x05 \x01(\v2\x10.api.v1.QuotaSetR\x06quotas\"A\n" +
+	"\x14ProjectCreateRequest\x12)\n" +
+	"\aproject\x18\x01 \x01(\v2\x0f.api.v1.ProjectR\aproject\"A\n" +
+	"\x14ProjectUpdateRequest\x12)\n" +
+	"\aproject\x18\x01 \x01(\v2\x0f.api.v1.ProjectR\aproject\"&\n" +
 	"\x14ProjectDeleteRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"#\n" +
 	"\x11ProjectGetRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"V\n" +
 	"\x18ProjectGetHistoryRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12*\n" +
-	"\x02at\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\x02at\"\xbf\x05\n" +
+	"\x02at\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\x02at\"\xc7\x05\n" +
 	"\x12ProjectFindRequest\x12E\n" +
 	"\rdeprecated_id\x18\x01 \x01(\v2\x1c.google.protobuf.StringValueB\x02\x18\x01R\fdeprecatedId\x12I\n" +
 	"\x0fdeprecated_name\x18\x02 \x01(\v2\x1c.google.protobuf.StringValueB\x02\x18\x01R\x0edeprecatedName\x12W\n" +
 	"\x16deprecated_description\x18\x03 \x01(\v2\x1c.google.protobuf.StringValueB\x02\x18\x01R\x15deprecatedDescription\x12R\n" +
-	"\x14deprecated_tenant_id\x18\x04 \x01(\v2\x1c.google.protobuf.StringValueB\x02\x18\x01R\x12deprecatedTenantId\x12\"\n" +
-	"\x06paging\x18\x05 \x01(\v2\n" +
-	".v1.PagingR\x06paging\x12I\n" +
-	"\vannotations\x18\x06 \x03(\v2'.v1.ProjectFindRequest.AnnotationsEntryR\vannotations\x12\x13\n" +
+	"\x14deprecated_tenant_id\x18\x04 \x01(\v2\x1c.google.protobuf.StringValueB\x02\x18\x01R\x12deprecatedTenantId\x12&\n" +
+	"\x06paging\x18\x05 \x01(\v2\x0e.api.v1.PagingR\x06paging\x12M\n" +
+	"\vannotations\x18\x06 \x03(\v2+.api.v1.ProjectFindRequest.AnnotationsEntryR\vannotations\x12\x13\n" +
 	"\x02id\x18\a \x01(\tH\x00R\x02id\x88\x01\x01\x12\x17\n" +
 	"\x04name\x18\b \x01(\tH\x01R\x04name\x88\x01\x01\x12%\n" +
 	"\vdescription\x18\t \x01(\tH\x02R\vdescription\x88\x01\x01\x12 \n" +
@@ -602,80 +601,81 @@ const file_v1_project_proto_rawDesc = "" +
 	"\x05_nameB\x0e\n" +
 	"\f_descriptionB\f\n" +
 	"\n" +
-	"_tenant_id\"8\n" +
-	"\x0fProjectResponse\x12%\n" +
-	"\aproject\x18\x01 \x01(\v2\v.v1.ProjectR\aproject\"n\n" +
-	"\x13ProjectListResponse\x12'\n" +
-	"\bprojects\x18\x01 \x03(\v2\v.v1.ProjectR\bprojects\x12 \n" +
+	"_tenant_id\"<\n" +
+	"\x0fProjectResponse\x12)\n" +
+	"\aproject\x18\x01 \x01(\v2\x0f.api.v1.ProjectR\aproject\"r\n" +
+	"\x13ProjectListResponse\x12+\n" +
+	"\bprojects\x18\x01 \x03(\v2\x0f.api.v1.ProjectR\bprojects\x12 \n" +
 	"\tnext_page\x18\x02 \x01(\x04H\x00R\bnextPage\x88\x01\x01B\f\n" +
 	"\n" +
-	"_next_page2\xe8\x02\n" +
-	"\x0eProjectService\x127\n" +
-	"\x06Create\x12\x18.v1.ProjectCreateRequest\x1a\x13.v1.ProjectResponse\x127\n" +
-	"\x06Update\x12\x18.v1.ProjectUpdateRequest\x1a\x13.v1.ProjectResponse\x127\n" +
-	"\x06Delete\x12\x18.v1.ProjectDeleteRequest\x1a\x13.v1.ProjectResponse\x121\n" +
-	"\x03Get\x12\x15.v1.ProjectGetRequest\x1a\x13.v1.ProjectResponse\x12?\n" +
+	"_next_page2\x98\x03\n" +
+	"\x0eProjectService\x12?\n" +
+	"\x06Create\x12\x1c.api.v1.ProjectCreateRequest\x1a\x17.api.v1.ProjectResponse\x12?\n" +
+	"\x06Update\x12\x1c.api.v1.ProjectUpdateRequest\x1a\x17.api.v1.ProjectResponse\x12?\n" +
+	"\x06Delete\x12\x1c.api.v1.ProjectDeleteRequest\x1a\x17.api.v1.ProjectResponse\x129\n" +
+	"\x03Get\x12\x19.api.v1.ProjectGetRequest\x1a\x17.api.v1.ProjectResponse\x12G\n" +
 	"\n" +
-	"GetHistory\x12\x1c.v1.ProjectGetHistoryRequest\x1a\x13.v1.ProjectResponse\x127\n" +
-	"\x04Find\x12\x16.v1.ProjectFindRequest\x1a\x17.v1.ProjectListResponseBh\n" +
-	"\x06com.v1B\fProjectProtoP\x01Z(github.com/metal-stack/masterdata-api/v1\xa2\x02\x03VXX\xaa\x02\x02V1\xca\x02\x02V1\xe2\x02\x0eV1\\GPBMetadata\xea\x02\x02V1b\x06proto3"
+	"GetHistory\x12 .api.v1.ProjectGetHistoryRequest\x1a\x17.api.v1.ProjectResponse\x12?\n" +
+	"\x04Find\x12\x1a.api.v1.ProjectFindRequest\x1a\x1b.api.v1.ProjectListResponseB\x87\x01\n" +
+	"\n" +
+	"com.api.v1B\fProjectProtoP\x01Z2github.com/metal-stack/masterdata-api/api/v1;apiv1\xa2\x02\x03AXX\xaa\x02\x06Api.V1\xca\x02\x06Api\\V1\xe2\x02\x12Api\\V1\\GPBMetadata\xea\x02\aApi::V1b\x06proto3"
 
 var (
-	file_v1_project_proto_rawDescOnce sync.Once
-	file_v1_project_proto_rawDescData []byte
+	file_api_v1_project_proto_rawDescOnce sync.Once
+	file_api_v1_project_proto_rawDescData []byte
 )
 
-func file_v1_project_proto_rawDescGZIP() []byte {
-	file_v1_project_proto_rawDescOnce.Do(func() {
-		file_v1_project_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_v1_project_proto_rawDesc), len(file_v1_project_proto_rawDesc)))
+func file_api_v1_project_proto_rawDescGZIP() []byte {
+	file_api_v1_project_proto_rawDescOnce.Do(func() {
+		file_api_v1_project_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_project_proto_rawDesc), len(file_api_v1_project_proto_rawDesc)))
 	})
-	return file_v1_project_proto_rawDescData
-}
-
-var file_v1_project_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-var file_v1_project_proto_goTypes = []any{
-	(*Project)(nil),                  // 0: v1.Project
-	(*ProjectCreateRequest)(nil),     // 1: v1.ProjectCreateRequest
-	(*ProjectUpdateRequest)(nil),     // 2: v1.ProjectUpdateRequest
-	(*ProjectDeleteRequest)(nil),     // 3: v1.ProjectDeleteRequest
-	(*ProjectGetRequest)(nil),        // 4: v1.ProjectGetRequest
-	(*ProjectGetHistoryRequest)(nil), // 5: v1.ProjectGetHistoryRequest
-	(*ProjectFindRequest)(nil),       // 6: v1.ProjectFindRequest
-	(*ProjectResponse)(nil),          // 7: v1.ProjectResponse
-	(*ProjectListResponse)(nil),      // 8: v1.ProjectListResponse
-	nil,                              // 9: v1.ProjectFindRequest.AnnotationsEntry
-	(*Meta)(nil),                     // 10: v1.Meta
-	(*QuotaSet)(nil),                 // 11: v1.QuotaSet
+	return file_api_v1_project_proto_rawDescData
+}
+
+var file_api_v1_project_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_api_v1_project_proto_goTypes = []any{
+	(*Project)(nil),                  // 0: api.v1.Project
+	(*ProjectCreateRequest)(nil),     // 1: api.v1.ProjectCreateRequest
+	(*ProjectUpdateRequest)(nil),     // 2: api.v1.ProjectUpdateRequest
+	(*ProjectDeleteRequest)(nil),     // 3: api.v1.ProjectDeleteRequest
+	(*ProjectGetRequest)(nil),        // 4: api.v1.ProjectGetRequest
+	(*ProjectGetHistoryRequest)(nil), // 5: api.v1.ProjectGetHistoryRequest
+	(*ProjectFindRequest)(nil),       // 6: api.v1.ProjectFindRequest
+	(*ProjectResponse)(nil),          // 7: api.v1.ProjectResponse
+	(*ProjectListResponse)(nil),      // 8: api.v1.ProjectListResponse
+	nil,                              // 9: api.v1.ProjectFindRequest.AnnotationsEntry
+	(*Meta)(nil),                     // 10: api.v1.Meta
+	(*QuotaSet)(nil),                 // 11: api.v1.QuotaSet
 	(*timestamppb.Timestamp)(nil),    // 12: google.protobuf.Timestamp
 	(*wrapperspb.StringValue)(nil),   // 13: google.protobuf.StringValue
-	(*Paging)(nil),                   // 14: v1.Paging
-}
-var file_v1_project_proto_depIdxs = []int32{
-	10, // 0: v1.Project.meta:type_name -> v1.Meta
-	11, // 1: v1.Project.quotas:type_name -> v1.QuotaSet
-	0,  // 2: v1.ProjectCreateRequest.project:type_name -> v1.Project
-	0,  // 3: v1.ProjectUpdateRequest.project:type_name -> v1.Project
-	12, // 4: v1.ProjectGetHistoryRequest.at:type_name -> google.protobuf.Timestamp
-	13, // 5: v1.ProjectFindRequest.deprecated_id:type_name -> google.protobuf.StringValue
-	13, // 6: v1.ProjectFindRequest.deprecated_name:type_name -> google.protobuf.StringValue
-	13, // 7: v1.ProjectFindRequest.deprecated_description:type_name -> google.protobuf.StringValue
-	13, // 8: v1.ProjectFindRequest.deprecated_tenant_id:type_name -> google.protobuf.StringValue
-	14, // 9: v1.ProjectFindRequest.paging:type_name -> v1.Paging
-	9,  // 10: v1.ProjectFindRequest.annotations:type_name -> v1.ProjectFindRequest.AnnotationsEntry
-	0,  // 11: v1.ProjectResponse.project:type_name -> v1.Project
-	0,  // 12: v1.ProjectListResponse.projects:type_name -> v1.Project
-	1,  // 13: v1.ProjectService.Create:input_type -> v1.ProjectCreateRequest
-	2,  // 14: v1.ProjectService.Update:input_type -> v1.ProjectUpdateRequest
-	3,  // 15: v1.ProjectService.Delete:input_type -> v1.ProjectDeleteRequest
-	4,  // 16: v1.ProjectService.Get:input_type -> v1.ProjectGetRequest
-	5,  // 17: v1.ProjectService.GetHistory:input_type -> v1.ProjectGetHistoryRequest
-	6,  // 18: v1.ProjectService.Find:input_type -> v1.ProjectFindRequest
-	7,  // 19: v1.ProjectService.Create:output_type -> v1.ProjectResponse
-	7,  // 20: v1.ProjectService.Update:output_type -> v1.ProjectResponse
-	7,  // 21: v1.ProjectService.Delete:output_type -> v1.ProjectResponse
-	7,  // 22: v1.ProjectService.Get:output_type -> v1.ProjectResponse
-	7,  // 23: v1.ProjectService.GetHistory:output_type -> v1.ProjectResponse
-	8,  // 24: v1.ProjectService.Find:output_type -> v1.ProjectListResponse
+	(*Paging)(nil),                   // 14: api.v1.Paging
+}
+var file_api_v1_project_proto_depIdxs = []int32{
+	10, // 0: api.v1.Project.meta:type_name -> api.v1.Meta
+	11, // 1: api.v1.Project.quotas:type_name -> api.v1.QuotaSet
+	0,  // 2: api.v1.ProjectCreateRequest.project:type_name -> api.v1.Project
+	0,  // 3: api.v1.ProjectUpdateRequest.project:type_name -> api.v1.Project
+	12, // 4: api.v1.ProjectGetHistoryRequest.at:type_name -> google.protobuf.Timestamp
+	13, // 5: api.v1.ProjectFindRequest.deprecated_id:type_name -> google.protobuf.StringValue
+	13, // 6: api.v1.ProjectFindRequest.deprecated_name:type_name -> google.protobuf.StringValue
+	13, // 7: api.v1.ProjectFindRequest.deprecated_description:type_name -> google.protobuf.StringValue
+	13, // 8: api.v1.ProjectFindRequest.deprecated_tenant_id:type_name -> google.protobuf.StringValue
+	14, // 9: api.v1.ProjectFindRequest.paging:type_name -> api.v1.Paging
+	9,  // 10: api.v1.ProjectFindRequest.annotations:type_name -> api.v1.ProjectFindRequest.AnnotationsEntry
+	0,  // 11: api.v1.ProjectResponse.project:type_name -> api.v1.Project
+	0,  // 12: api.v1.ProjectListResponse.projects:type_name -> api.v1.Project
+	1,  // 13: api.v1.ProjectService.Create:input_type -> api.v1.ProjectCreateRequest
+	2,  // 14: api.v1.ProjectService.Update:input_type -> api.v1.ProjectUpdateRequest
+	3,  // 15: api.v1.ProjectService.Delete:input_type -> api.v1.ProjectDeleteRequest
+	4,  // 16: api.v1.ProjectService.Get:input_type -> api.v1.ProjectGetRequest
+	5,  // 17: api.v1.ProjectService.GetHistory:input_type -> api.v1.ProjectGetHistoryRequest
+	6,  // 18: api.v1.ProjectService.Find:input_type -> api.v1.ProjectFindRequest
+	7,  // 19: api.v1.ProjectService.Create:output_type -> api.v1.ProjectResponse
+	7,  // 20: api.v1.ProjectService.Update:output_type -> api.v1.ProjectResponse
+	7,  // 21: api.v1.ProjectService.Delete:output_type -> api.v1.ProjectResponse
+	7,  // 22: api.v1.ProjectService.Get:output_type -> api.v1.ProjectResponse
+	7,  // 23: api.v1.ProjectService.GetHistory:output_type -> api.v1.ProjectResponse
+	8,  // 24: api.v1.ProjectService.Find:output_type -> api.v1.ProjectListResponse
 	19, // [19:25] is the sub-list for method output_type
 	13, // [13:19] is the sub-list for method input_type
 	13, // [13:13] is the sub-list for extension type_name
@@ -683,31 +683,31 @@ var file_v1_project_proto_depIdxs = []int32{
 	0,  // [0:13] is the sub-list for field type_name
 }
 
-func init() { file_v1_project_proto_init() }
-func file_v1_project_proto_init() {
-	if File_v1_project_proto != nil {
+func init() { file_api_v1_project_proto_init() }
+func file_api_v1_project_proto_init() {
+	if File_api_v1_project_proto != nil {
 		return
 	}
-	file_v1_common_proto_init()
-	file_v1_meta_proto_init()
-	file_v1_quota_proto_init()
-	file_v1_project_proto_msgTypes[6].OneofWrappers = []any{}
-	file_v1_project_proto_msgTypes[8].OneofWrappers = []any{}
+	file_api_v1_common_proto_init()
+	file_api_v1_meta_proto_init()
+	file_api_v1_quota_proto_init()
+	file_api_v1_project_proto_msgTypes[6].OneofWrappers = []any{}
+	file_api_v1_project_proto_msgTypes[8].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_project_proto_rawDesc), len(file_v1_project_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_project_proto_rawDesc), len(file_api_v1_project_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_v1_project_proto_goTypes,
-		DependencyIndexes: file_v1_project_proto_depIdxs,
-		MessageInfos:      file_v1_project_proto_msgTypes,
+		GoTypes:           file_api_v1_project_proto_goTypes,
+		DependencyIndexes: file_api_v1_project_proto_depIdxs,
+		MessageInfos:      file_api_v1_project_proto_msgTypes,
 	}.Build()
-	File_v1_project_proto = out.File
-	file_v1_project_proto_goTypes = nil
-	file_v1_project_proto_depIdxs = nil
+	File_api_v1_project_proto = out.File
+	file_api_v1_project_proto_goTypes = nil
+	file_api_v1_project_proto_depIdxs = nil
 }
diff --git a/api/v1/project_grpc.pb.go b/api/v1/project_grpc.pb.go
deleted file mode 100644
index 8510f87..0000000
--- a/api/v1/project_grpc.pb.go
+++ /dev/null
@@ -1,309 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             (unknown)
-// source: v1/project.proto
-
-package v1
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	ProjectService_Create_FullMethodName     = "/v1.ProjectService/Create"
-	ProjectService_Update_FullMethodName     = "/v1.ProjectService/Update"
-	ProjectService_Delete_FullMethodName     = "/v1.ProjectService/Delete"
-	ProjectService_Get_FullMethodName        = "/v1.ProjectService/Get"
-	ProjectService_GetHistory_FullMethodName = "/v1.ProjectService/GetHistory"
-	ProjectService_Find_FullMethodName       = "/v1.ProjectService/Find"
-)
-
-// ProjectServiceClient is the client API for ProjectService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type ProjectServiceClient interface {
-	Create(ctx context.Context, in *ProjectCreateRequest, opts ...grpc.CallOption) (*ProjectResponse, error)
-	Update(ctx context.Context, in *ProjectUpdateRequest, opts ...grpc.CallOption) (*ProjectResponse, error)
-	Delete(ctx context.Context, in *ProjectDeleteRequest, opts ...grpc.CallOption) (*ProjectResponse, error)
-	Get(ctx context.Context, in *ProjectGetRequest, opts ...grpc.CallOption) (*ProjectResponse, error)
-	GetHistory(ctx context.Context, in *ProjectGetHistoryRequest, opts ...grpc.CallOption) (*ProjectResponse, error)
-	Find(ctx context.Context, in *ProjectFindRequest, opts ...grpc.CallOption) (*ProjectListResponse, error)
-}
-
-type projectServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewProjectServiceClient(cc grpc.ClientConnInterface) ProjectServiceClient {
-	return &projectServiceClient{cc}
-}
-
-func (c *projectServiceClient) Create(ctx context.Context, in *ProjectCreateRequest, opts ...grpc.CallOption) (*ProjectResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectResponse)
-	err := c.cc.Invoke(ctx, ProjectService_Create_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *projectServiceClient) Update(ctx context.Context, in *ProjectUpdateRequest, opts ...grpc.CallOption) (*ProjectResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectResponse)
-	err := c.cc.Invoke(ctx, ProjectService_Update_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *projectServiceClient) Delete(ctx context.Context, in *ProjectDeleteRequest, opts ...grpc.CallOption) (*ProjectResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectResponse)
-	err := c.cc.Invoke(ctx, ProjectService_Delete_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *projectServiceClient) Get(ctx context.Context, in *ProjectGetRequest, opts ...grpc.CallOption) (*ProjectResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectResponse)
-	err := c.cc.Invoke(ctx, ProjectService_Get_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *projectServiceClient) GetHistory(ctx context.Context, in *ProjectGetHistoryRequest, opts ...grpc.CallOption) (*ProjectResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectResponse)
-	err := c.cc.Invoke(ctx, ProjectService_GetHistory_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *projectServiceClient) Find(ctx context.Context, in *ProjectFindRequest, opts ...grpc.CallOption) (*ProjectListResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectListResponse)
-	err := c.cc.Invoke(ctx, ProjectService_Find_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ProjectServiceServer is the server API for ProjectService service.
-// All implementations should embed UnimplementedProjectServiceServer
-// for forward compatibility.
-type ProjectServiceServer interface {
-	Create(context.Context, *ProjectCreateRequest) (*ProjectResponse, error)
-	Update(context.Context, *ProjectUpdateRequest) (*ProjectResponse, error)
-	Delete(context.Context, *ProjectDeleteRequest) (*ProjectResponse, error)
-	Get(context.Context, *ProjectGetRequest) (*ProjectResponse, error)
-	GetHistory(context.Context, *ProjectGetHistoryRequest) (*ProjectResponse, error)
-	Find(context.Context, *ProjectFindRequest) (*ProjectListResponse, error)
-}
-
-// UnimplementedProjectServiceServer should be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedProjectServiceServer struct{}
-
-func (UnimplementedProjectServiceServer) Create(context.Context, *ProjectCreateRequest) (*ProjectResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Create not implemented")
-}
-func (UnimplementedProjectServiceServer) Update(context.Context, *ProjectUpdateRequest) (*ProjectResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Update not implemented")
-}
-func (UnimplementedProjectServiceServer) Delete(context.Context, *ProjectDeleteRequest) (*ProjectResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented")
-}
-func (UnimplementedProjectServiceServer) Get(context.Context, *ProjectGetRequest) (*ProjectResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Get not implemented")
-}
-func (UnimplementedProjectServiceServer) GetHistory(context.Context, *ProjectGetHistoryRequest) (*ProjectResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetHistory not implemented")
-}
-func (UnimplementedProjectServiceServer) Find(context.Context, *ProjectFindRequest) (*ProjectListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Find not implemented")
-}
-func (UnimplementedProjectServiceServer) testEmbeddedByValue() {}
-
-// UnsafeProjectServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to ProjectServiceServer will
-// result in compilation errors.
-type UnsafeProjectServiceServer interface {
-	mustEmbedUnimplementedProjectServiceServer()
-}
-
-func RegisterProjectServiceServer(s grpc.ServiceRegistrar, srv ProjectServiceServer) {
-	// If the following call pancis, it indicates UnimplementedProjectServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&ProjectService_ServiceDesc, srv)
-}
-
-func _ProjectService_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectCreateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectServiceServer).Create(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectService_Create_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectServiceServer).Create(ctx, req.(*ProjectCreateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ProjectService_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectUpdateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectServiceServer).Update(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectService_Update_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectServiceServer).Update(ctx, req.(*ProjectUpdateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ProjectService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectDeleteRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectServiceServer).Delete(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectService_Delete_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectServiceServer).Delete(ctx, req.(*ProjectDeleteRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ProjectService_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectGetRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectServiceServer).Get(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectService_Get_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectServiceServer).Get(ctx, req.(*ProjectGetRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ProjectService_GetHistory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectGetHistoryRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectServiceServer).GetHistory(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectService_GetHistory_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectServiceServer).GetHistory(ctx, req.(*ProjectGetHistoryRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ProjectService_Find_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectFindRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectServiceServer).Find(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectService_Find_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectServiceServer).Find(ctx, req.(*ProjectFindRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// ProjectService_ServiceDesc is the grpc.ServiceDesc for ProjectService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var ProjectService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "v1.ProjectService",
-	HandlerType: (*ProjectServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Create",
-			Handler:    _ProjectService_Create_Handler,
-		},
-		{
-			MethodName: "Update",
-			Handler:    _ProjectService_Update_Handler,
-		},
-		{
-			MethodName: "Delete",
-			Handler:    _ProjectService_Delete_Handler,
-		},
-		{
-			MethodName: "Get",
-			Handler:    _ProjectService_Get_Handler,
-		},
-		{
-			MethodName: "GetHistory",
-			Handler:    _ProjectService_GetHistory_Handler,
-		},
-		{
-			MethodName: "Find",
-			Handler:    _ProjectService_Find_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "v1/project.proto",
-}
diff --git a/api/v1/project_member.pb.go b/api/v1/project_member.pb.go
index 556b3b3..3b89e12 100644
--- a/api/v1/project_member.pb.go
+++ b/api/v1/project_member.pb.go
@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.8
+// 	protoc-gen-go v1.36.10
 // 	protoc        (unknown)
-// source: v1/project_member.proto
+// source: api/v1/project_member.proto
 
-package v1
+package apiv1
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -35,7 +35,7 @@ type ProjectMember struct {
 
 func (x *ProjectMember) Reset() {
 	*x = ProjectMember{}
-	mi := &file_v1_project_member_proto_msgTypes[0]
+	mi := &file_api_v1_project_member_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -47,7 +47,7 @@ func (x *ProjectMember) String() string {
 func (*ProjectMember) ProtoMessage() {}
 
 func (x *ProjectMember) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_member_proto_msgTypes[0]
+	mi := &file_api_v1_project_member_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -60,7 +60,7 @@ func (x *ProjectMember) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectMember.ProtoReflect.Descriptor instead.
 func (*ProjectMember) Descriptor() ([]byte, []int) {
-	return file_v1_project_member_proto_rawDescGZIP(), []int{0}
+	return file_api_v1_project_member_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *ProjectMember) GetMeta() *Meta {
@@ -100,7 +100,7 @@ type ProjectMemberCreateRequest struct {
 
 func (x *ProjectMemberCreateRequest) Reset() {
 	*x = ProjectMemberCreateRequest{}
-	mi := &file_v1_project_member_proto_msgTypes[1]
+	mi := &file_api_v1_project_member_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -112,7 +112,7 @@ func (x *ProjectMemberCreateRequest) String() string {
 func (*ProjectMemberCreateRequest) ProtoMessage() {}
 
 func (x *ProjectMemberCreateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_member_proto_msgTypes[1]
+	mi := &file_api_v1_project_member_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -125,7 +125,7 @@ func (x *ProjectMemberCreateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectMemberCreateRequest.ProtoReflect.Descriptor instead.
 func (*ProjectMemberCreateRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_member_proto_rawDescGZIP(), []int{1}
+	return file_api_v1_project_member_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *ProjectMemberCreateRequest) GetProjectMember() *ProjectMember {
@@ -144,7 +144,7 @@ type ProjectMemberUpdateRequest struct {
 
 func (x *ProjectMemberUpdateRequest) Reset() {
 	*x = ProjectMemberUpdateRequest{}
-	mi := &file_v1_project_member_proto_msgTypes[2]
+	mi := &file_api_v1_project_member_proto_msgTypes[2]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -156,7 +156,7 @@ func (x *ProjectMemberUpdateRequest) String() string {
 func (*ProjectMemberUpdateRequest) ProtoMessage() {}
 
 func (x *ProjectMemberUpdateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_member_proto_msgTypes[2]
+	mi := &file_api_v1_project_member_proto_msgTypes[2]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -169,7 +169,7 @@ func (x *ProjectMemberUpdateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectMemberUpdateRequest.ProtoReflect.Descriptor instead.
 func (*ProjectMemberUpdateRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_member_proto_rawDescGZIP(), []int{2}
+	return file_api_v1_project_member_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *ProjectMemberUpdateRequest) GetProjectMember() *ProjectMember {
@@ -188,7 +188,7 @@ type ProjectMemberDeleteRequest struct {
 
 func (x *ProjectMemberDeleteRequest) Reset() {
 	*x = ProjectMemberDeleteRequest{}
-	mi := &file_v1_project_member_proto_msgTypes[3]
+	mi := &file_api_v1_project_member_proto_msgTypes[3]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -200,7 +200,7 @@ func (x *ProjectMemberDeleteRequest) String() string {
 func (*ProjectMemberDeleteRequest) ProtoMessage() {}
 
 func (x *ProjectMemberDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_member_proto_msgTypes[3]
+	mi := &file_api_v1_project_member_proto_msgTypes[3]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -213,7 +213,7 @@ func (x *ProjectMemberDeleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectMemberDeleteRequest.ProtoReflect.Descriptor instead.
 func (*ProjectMemberDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_member_proto_rawDescGZIP(), []int{3}
+	return file_api_v1_project_member_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *ProjectMemberDeleteRequest) GetId() string {
@@ -232,7 +232,7 @@ type ProjectMemberGetRequest struct {
 
 func (x *ProjectMemberGetRequest) Reset() {
 	*x = ProjectMemberGetRequest{}
-	mi := &file_v1_project_member_proto_msgTypes[4]
+	mi := &file_api_v1_project_member_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -244,7 +244,7 @@ func (x *ProjectMemberGetRequest) String() string {
 func (*ProjectMemberGetRequest) ProtoMessage() {}
 
 func (x *ProjectMemberGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_member_proto_msgTypes[4]
+	mi := &file_api_v1_project_member_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -257,7 +257,7 @@ func (x *ProjectMemberGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectMemberGetRequest.ProtoReflect.Descriptor instead.
 func (*ProjectMemberGetRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_member_proto_rawDescGZIP(), []int{4}
+	return file_api_v1_project_member_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *ProjectMemberGetRequest) GetId() string {
@@ -279,7 +279,7 @@ type ProjectMemberFindRequest struct {
 
 func (x *ProjectMemberFindRequest) Reset() {
 	*x = ProjectMemberFindRequest{}
-	mi := &file_v1_project_member_proto_msgTypes[5]
+	mi := &file_api_v1_project_member_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -291,7 +291,7 @@ func (x *ProjectMemberFindRequest) String() string {
 func (*ProjectMemberFindRequest) ProtoMessage() {}
 
 func (x *ProjectMemberFindRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_member_proto_msgTypes[5]
+	mi := &file_api_v1_project_member_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -304,7 +304,7 @@ func (x *ProjectMemberFindRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectMemberFindRequest.ProtoReflect.Descriptor instead.
 func (*ProjectMemberFindRequest) Descriptor() ([]byte, []int) {
-	return file_v1_project_member_proto_rawDescGZIP(), []int{5}
+	return file_api_v1_project_member_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *ProjectMemberFindRequest) GetProjectId() string {
@@ -344,7 +344,7 @@ type ProjectMemberResponse struct {
 
 func (x *ProjectMemberResponse) Reset() {
 	*x = ProjectMemberResponse{}
-	mi := &file_v1_project_member_proto_msgTypes[6]
+	mi := &file_api_v1_project_member_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -356,7 +356,7 @@ func (x *ProjectMemberResponse) String() string {
 func (*ProjectMemberResponse) ProtoMessage() {}
 
 func (x *ProjectMemberResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_member_proto_msgTypes[6]
+	mi := &file_api_v1_project_member_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -369,7 +369,7 @@ func (x *ProjectMemberResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectMemberResponse.ProtoReflect.Descriptor instead.
 func (*ProjectMemberResponse) Descriptor() ([]byte, []int) {
-	return file_v1_project_member_proto_rawDescGZIP(), []int{6}
+	return file_api_v1_project_member_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *ProjectMemberResponse) GetProjectMember() *ProjectMember {
@@ -388,7 +388,7 @@ type ProjectMemberListResponse struct {
 
 func (x *ProjectMemberListResponse) Reset() {
 	*x = ProjectMemberListResponse{}
-	mi := &file_v1_project_member_proto_msgTypes[7]
+	mi := &file_api_v1_project_member_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -400,7 +400,7 @@ func (x *ProjectMemberListResponse) String() string {
 func (*ProjectMemberListResponse) ProtoMessage() {}
 
 func (x *ProjectMemberListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_project_member_proto_msgTypes[7]
+	mi := &file_api_v1_project_member_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -413,7 +413,7 @@ func (x *ProjectMemberListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectMemberListResponse.ProtoReflect.Descriptor instead.
 func (*ProjectMemberListResponse) Descriptor() ([]byte, []int) {
-	return file_v1_project_member_proto_rawDescGZIP(), []int{7}
+	return file_api_v1_project_member_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *ProjectMemberListResponse) GetProjectMembers() []*ProjectMember {
@@ -423,91 +423,92 @@ func (x *ProjectMemberListResponse) GetProjectMembers() []*ProjectMember {
 	return nil
 }
 
-var File_v1_project_member_proto protoreflect.FileDescriptor
+var File_api_v1_project_member_proto protoreflect.FileDescriptor
 
-const file_v1_project_member_proto_rawDesc = "" +
+const file_api_v1_project_member_proto_rawDesc = "" +
 	"\n" +
-	"\x17v1/project_member.proto\x12\x02v1\x1a\rv1/meta.proto\"\x87\x01\n" +
-	"\rProjectMember\x12\x1c\n" +
-	"\x04meta\x18\x01 \x01(\v2\b.v1.MetaR\x04meta\x12\x1d\n" +
+	"\x1bapi/v1/project_member.proto\x12\x06api.v1\x1a\x11api/v1/meta.proto\"\x8b\x01\n" +
+	"\rProjectMember\x12 \n" +
+	"\x04meta\x18\x01 \x01(\v2\f.api.v1.MetaR\x04meta\x12\x1d\n" +
 	"\n" +
 	"project_id\x18\x02 \x01(\tR\tprojectId\x12\x1b\n" +
 	"\ttenant_id\x18\x04 \x01(\tR\btenantId\x12\x1c\n" +
-	"\tnamespace\x18\x05 \x01(\tR\tnamespace\"V\n" +
-	"\x1aProjectMemberCreateRequest\x128\n" +
-	"\x0eproject_member\x18\x01 \x01(\v2\x11.v1.ProjectMemberR\rprojectMember\"V\n" +
-	"\x1aProjectMemberUpdateRequest\x128\n" +
-	"\x0eproject_member\x18\x01 \x01(\v2\x11.v1.ProjectMemberR\rprojectMember\",\n" +
+	"\tnamespace\x18\x05 \x01(\tR\tnamespace\"Z\n" +
+	"\x1aProjectMemberCreateRequest\x12<\n" +
+	"\x0eproject_member\x18\x01 \x01(\v2\x15.api.v1.ProjectMemberR\rprojectMember\"Z\n" +
+	"\x1aProjectMemberUpdateRequest\x12<\n" +
+	"\x0eproject_member\x18\x01 \x01(\v2\x15.api.v1.ProjectMemberR\rprojectMember\",\n" +
 	"\x1aProjectMemberDeleteRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\")\n" +
 	"\x17ProjectMemberGetRequest\x12\x0e\n" +
-	"\x02id\x18\x01 \x01(\tR\x02id\"\xac\x02\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\"\xb0\x02\n" +
 	"\x18ProjectMemberFindRequest\x12\"\n" +
 	"\n" +
 	"project_id\x18\x01 \x01(\tH\x00R\tprojectId\x88\x01\x01\x12 \n" +
-	"\ttenant_id\x18\x02 \x01(\tH\x01R\btenantId\x88\x01\x01\x12O\n" +
-	"\vannotations\x18\x06 \x03(\v2-.v1.ProjectMemberFindRequest.AnnotationsEntryR\vannotations\x12\x1c\n" +
+	"\ttenant_id\x18\x02 \x01(\tH\x01R\btenantId\x88\x01\x01\x12S\n" +
+	"\vannotations\x18\x06 \x03(\v21.api.v1.ProjectMemberFindRequest.AnnotationsEntryR\vannotations\x12\x1c\n" +
 	"\tnamespace\x18\a \x01(\tR\tnamespace\x1a>\n" +
 	"\x10AnnotationsEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
 	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\r\n" +
 	"\v_project_idB\f\n" +
 	"\n" +
-	"_tenant_id\"Q\n" +
-	"\x15ProjectMemberResponse\x128\n" +
-	"\x0eproject_member\x18\x01 \x01(\v2\x11.v1.ProjectMemberR\rprojectMember\"W\n" +
-	"\x19ProjectMemberListResponse\x12:\n" +
-	"\x0fproject_members\x18\x01 \x03(\v2\x11.v1.ProjectMemberR\x0eprojectMembers2\xe9\x02\n" +
-	"\x14ProjectMemberService\x12C\n" +
-	"\x06Create\x12\x1e.v1.ProjectMemberCreateRequest\x1a\x19.v1.ProjectMemberResponse\x12C\n" +
-	"\x06Update\x12\x1e.v1.ProjectMemberUpdateRequest\x1a\x19.v1.ProjectMemberResponse\x12C\n" +
-	"\x06Delete\x12\x1e.v1.ProjectMemberDeleteRequest\x1a\x19.v1.ProjectMemberResponse\x12=\n" +
-	"\x03Get\x12\x1b.v1.ProjectMemberGetRequest\x1a\x19.v1.ProjectMemberResponse\x12C\n" +
-	"\x04Find\x12\x1c.v1.ProjectMemberFindRequest\x1a\x1d.v1.ProjectMemberListResponseBn\n" +
-	"\x06com.v1B\x12ProjectMemberProtoP\x01Z(github.com/metal-stack/masterdata-api/v1\xa2\x02\x03VXX\xaa\x02\x02V1\xca\x02\x02V1\xe2\x02\x0eV1\\GPBMetadata\xea\x02\x02V1b\x06proto3"
+	"_tenant_id\"U\n" +
+	"\x15ProjectMemberResponse\x12<\n" +
+	"\x0eproject_member\x18\x01 \x01(\v2\x15.api.v1.ProjectMemberR\rprojectMember\"[\n" +
+	"\x19ProjectMemberListResponse\x12>\n" +
+	"\x0fproject_members\x18\x01 \x03(\v2\x15.api.v1.ProjectMemberR\x0eprojectMembers2\x91\x03\n" +
+	"\x14ProjectMemberService\x12K\n" +
+	"\x06Create\x12\".api.v1.ProjectMemberCreateRequest\x1a\x1d.api.v1.ProjectMemberResponse\x12K\n" +
+	"\x06Update\x12\".api.v1.ProjectMemberUpdateRequest\x1a\x1d.api.v1.ProjectMemberResponse\x12K\n" +
+	"\x06Delete\x12\".api.v1.ProjectMemberDeleteRequest\x1a\x1d.api.v1.ProjectMemberResponse\x12E\n" +
+	"\x03Get\x12\x1f.api.v1.ProjectMemberGetRequest\x1a\x1d.api.v1.ProjectMemberResponse\x12K\n" +
+	"\x04Find\x12 .api.v1.ProjectMemberFindRequest\x1a!.api.v1.ProjectMemberListResponseB\x8d\x01\n" +
+	"\n" +
+	"com.api.v1B\x12ProjectMemberProtoP\x01Z2github.com/metal-stack/masterdata-api/api/v1;apiv1\xa2\x02\x03AXX\xaa\x02\x06Api.V1\xca\x02\x06Api\\V1\xe2\x02\x12Api\\V1\\GPBMetadata\xea\x02\aApi::V1b\x06proto3"
 
 var (
-	file_v1_project_member_proto_rawDescOnce sync.Once
-	file_v1_project_member_proto_rawDescData []byte
+	file_api_v1_project_member_proto_rawDescOnce sync.Once
+	file_api_v1_project_member_proto_rawDescData []byte
 )
 
-func file_v1_project_member_proto_rawDescGZIP() []byte {
-	file_v1_project_member_proto_rawDescOnce.Do(func() {
-		file_v1_project_member_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_v1_project_member_proto_rawDesc), len(file_v1_project_member_proto_rawDesc)))
+func file_api_v1_project_member_proto_rawDescGZIP() []byte {
+	file_api_v1_project_member_proto_rawDescOnce.Do(func() {
+		file_api_v1_project_member_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_project_member_proto_rawDesc), len(file_api_v1_project_member_proto_rawDesc)))
 	})
-	return file_v1_project_member_proto_rawDescData
-}
-
-var file_v1_project_member_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
-var file_v1_project_member_proto_goTypes = []any{
-	(*ProjectMember)(nil),              // 0: v1.ProjectMember
-	(*ProjectMemberCreateRequest)(nil), // 1: v1.ProjectMemberCreateRequest
-	(*ProjectMemberUpdateRequest)(nil), // 2: v1.ProjectMemberUpdateRequest
-	(*ProjectMemberDeleteRequest)(nil), // 3: v1.ProjectMemberDeleteRequest
-	(*ProjectMemberGetRequest)(nil),    // 4: v1.ProjectMemberGetRequest
-	(*ProjectMemberFindRequest)(nil),   // 5: v1.ProjectMemberFindRequest
-	(*ProjectMemberResponse)(nil),      // 6: v1.ProjectMemberResponse
-	(*ProjectMemberListResponse)(nil),  // 7: v1.ProjectMemberListResponse
-	nil,                                // 8: v1.ProjectMemberFindRequest.AnnotationsEntry
-	(*Meta)(nil),                       // 9: v1.Meta
-}
-var file_v1_project_member_proto_depIdxs = []int32{
-	9,  // 0: v1.ProjectMember.meta:type_name -> v1.Meta
-	0,  // 1: v1.ProjectMemberCreateRequest.project_member:type_name -> v1.ProjectMember
-	0,  // 2: v1.ProjectMemberUpdateRequest.project_member:type_name -> v1.ProjectMember
-	8,  // 3: v1.ProjectMemberFindRequest.annotations:type_name -> v1.ProjectMemberFindRequest.AnnotationsEntry
-	0,  // 4: v1.ProjectMemberResponse.project_member:type_name -> v1.ProjectMember
-	0,  // 5: v1.ProjectMemberListResponse.project_members:type_name -> v1.ProjectMember
-	1,  // 6: v1.ProjectMemberService.Create:input_type -> v1.ProjectMemberCreateRequest
-	2,  // 7: v1.ProjectMemberService.Update:input_type -> v1.ProjectMemberUpdateRequest
-	3,  // 8: v1.ProjectMemberService.Delete:input_type -> v1.ProjectMemberDeleteRequest
-	4,  // 9: v1.ProjectMemberService.Get:input_type -> v1.ProjectMemberGetRequest
-	5,  // 10: v1.ProjectMemberService.Find:input_type -> v1.ProjectMemberFindRequest
-	6,  // 11: v1.ProjectMemberService.Create:output_type -> v1.ProjectMemberResponse
-	6,  // 12: v1.ProjectMemberService.Update:output_type -> v1.ProjectMemberResponse
-	6,  // 13: v1.ProjectMemberService.Delete:output_type -> v1.ProjectMemberResponse
-	6,  // 14: v1.ProjectMemberService.Get:output_type -> v1.ProjectMemberResponse
-	7,  // 15: v1.ProjectMemberService.Find:output_type -> v1.ProjectMemberListResponse
+	return file_api_v1_project_member_proto_rawDescData
+}
+
+var file_api_v1_project_member_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
+var file_api_v1_project_member_proto_goTypes = []any{
+	(*ProjectMember)(nil),              // 0: api.v1.ProjectMember
+	(*ProjectMemberCreateRequest)(nil), // 1: api.v1.ProjectMemberCreateRequest
+	(*ProjectMemberUpdateRequest)(nil), // 2: api.v1.ProjectMemberUpdateRequest
+	(*ProjectMemberDeleteRequest)(nil), // 3: api.v1.ProjectMemberDeleteRequest
+	(*ProjectMemberGetRequest)(nil),    // 4: api.v1.ProjectMemberGetRequest
+	(*ProjectMemberFindRequest)(nil),   // 5: api.v1.ProjectMemberFindRequest
+	(*ProjectMemberResponse)(nil),      // 6: api.v1.ProjectMemberResponse
+	(*ProjectMemberListResponse)(nil),  // 7: api.v1.ProjectMemberListResponse
+	nil,                                // 8: api.v1.ProjectMemberFindRequest.AnnotationsEntry
+	(*Meta)(nil),                       // 9: api.v1.Meta
+}
+var file_api_v1_project_member_proto_depIdxs = []int32{
+	9,  // 0: api.v1.ProjectMember.meta:type_name -> api.v1.Meta
+	0,  // 1: api.v1.ProjectMemberCreateRequest.project_member:type_name -> api.v1.ProjectMember
+	0,  // 2: api.v1.ProjectMemberUpdateRequest.project_member:type_name -> api.v1.ProjectMember
+	8,  // 3: api.v1.ProjectMemberFindRequest.annotations:type_name -> api.v1.ProjectMemberFindRequest.AnnotationsEntry
+	0,  // 4: api.v1.ProjectMemberResponse.project_member:type_name -> api.v1.ProjectMember
+	0,  // 5: api.v1.ProjectMemberListResponse.project_members:type_name -> api.v1.ProjectMember
+	1,  // 6: api.v1.ProjectMemberService.Create:input_type -> api.v1.ProjectMemberCreateRequest
+	2,  // 7: api.v1.ProjectMemberService.Update:input_type -> api.v1.ProjectMemberUpdateRequest
+	3,  // 8: api.v1.ProjectMemberService.Delete:input_type -> api.v1.ProjectMemberDeleteRequest
+	4,  // 9: api.v1.ProjectMemberService.Get:input_type -> api.v1.ProjectMemberGetRequest
+	5,  // 10: api.v1.ProjectMemberService.Find:input_type -> api.v1.ProjectMemberFindRequest
+	6,  // 11: api.v1.ProjectMemberService.Create:output_type -> api.v1.ProjectMemberResponse
+	6,  // 12: api.v1.ProjectMemberService.Update:output_type -> api.v1.ProjectMemberResponse
+	6,  // 13: api.v1.ProjectMemberService.Delete:output_type -> api.v1.ProjectMemberResponse
+	6,  // 14: api.v1.ProjectMemberService.Get:output_type -> api.v1.ProjectMemberResponse
+	7,  // 15: api.v1.ProjectMemberService.Find:output_type -> api.v1.ProjectMemberListResponse
 	11, // [11:16] is the sub-list for method output_type
 	6,  // [6:11] is the sub-list for method input_type
 	6,  // [6:6] is the sub-list for extension type_name
@@ -515,28 +516,28 @@ var file_v1_project_member_proto_depIdxs = []int32{
 	0,  // [0:6] is the sub-list for field type_name
 }
 
-func init() { file_v1_project_member_proto_init() }
-func file_v1_project_member_proto_init() {
-	if File_v1_project_member_proto != nil {
+func init() { file_api_v1_project_member_proto_init() }
+func file_api_v1_project_member_proto_init() {
+	if File_api_v1_project_member_proto != nil {
 		return
 	}
-	file_v1_meta_proto_init()
-	file_v1_project_member_proto_msgTypes[5].OneofWrappers = []any{}
+	file_api_v1_meta_proto_init()
+	file_api_v1_project_member_proto_msgTypes[5].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_project_member_proto_rawDesc), len(file_v1_project_member_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_project_member_proto_rawDesc), len(file_api_v1_project_member_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_v1_project_member_proto_goTypes,
-		DependencyIndexes: file_v1_project_member_proto_depIdxs,
-		MessageInfos:      file_v1_project_member_proto_msgTypes,
+		GoTypes:           file_api_v1_project_member_proto_goTypes,
+		DependencyIndexes: file_api_v1_project_member_proto_depIdxs,
+		MessageInfos:      file_api_v1_project_member_proto_msgTypes,
 	}.Build()
-	File_v1_project_member_proto = out.File
-	file_v1_project_member_proto_goTypes = nil
-	file_v1_project_member_proto_depIdxs = nil
+	File_api_v1_project_member_proto = out.File
+	file_api_v1_project_member_proto_goTypes = nil
+	file_api_v1_project_member_proto_depIdxs = nil
 }
diff --git a/api/v1/project_member_grpc.pb.go b/api/v1/project_member_grpc.pb.go
deleted file mode 100644
index c58d842..0000000
--- a/api/v1/project_member_grpc.pb.go
+++ /dev/null
@@ -1,271 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             (unknown)
-// source: v1/project_member.proto
-
-package v1
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	ProjectMemberService_Create_FullMethodName = "/v1.ProjectMemberService/Create"
-	ProjectMemberService_Update_FullMethodName = "/v1.ProjectMemberService/Update"
-	ProjectMemberService_Delete_FullMethodName = "/v1.ProjectMemberService/Delete"
-	ProjectMemberService_Get_FullMethodName    = "/v1.ProjectMemberService/Get"
-	ProjectMemberService_Find_FullMethodName   = "/v1.ProjectMemberService/Find"
-)
-
-// ProjectMemberServiceClient is the client API for ProjectMemberService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type ProjectMemberServiceClient interface {
-	Create(ctx context.Context, in *ProjectMemberCreateRequest, opts ...grpc.CallOption) (*ProjectMemberResponse, error)
-	Update(ctx context.Context, in *ProjectMemberUpdateRequest, opts ...grpc.CallOption) (*ProjectMemberResponse, error)
-	Delete(ctx context.Context, in *ProjectMemberDeleteRequest, opts ...grpc.CallOption) (*ProjectMemberResponse, error)
-	Get(ctx context.Context, in *ProjectMemberGetRequest, opts ...grpc.CallOption) (*ProjectMemberResponse, error)
-	Find(ctx context.Context, in *ProjectMemberFindRequest, opts ...grpc.CallOption) (*ProjectMemberListResponse, error)
-}
-
-type projectMemberServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewProjectMemberServiceClient(cc grpc.ClientConnInterface) ProjectMemberServiceClient {
-	return &projectMemberServiceClient{cc}
-}
-
-func (c *projectMemberServiceClient) Create(ctx context.Context, in *ProjectMemberCreateRequest, opts ...grpc.CallOption) (*ProjectMemberResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectMemberResponse)
-	err := c.cc.Invoke(ctx, ProjectMemberService_Create_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *projectMemberServiceClient) Update(ctx context.Context, in *ProjectMemberUpdateRequest, opts ...grpc.CallOption) (*ProjectMemberResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectMemberResponse)
-	err := c.cc.Invoke(ctx, ProjectMemberService_Update_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *projectMemberServiceClient) Delete(ctx context.Context, in *ProjectMemberDeleteRequest, opts ...grpc.CallOption) (*ProjectMemberResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectMemberResponse)
-	err := c.cc.Invoke(ctx, ProjectMemberService_Delete_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *projectMemberServiceClient) Get(ctx context.Context, in *ProjectMemberGetRequest, opts ...grpc.CallOption) (*ProjectMemberResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectMemberResponse)
-	err := c.cc.Invoke(ctx, ProjectMemberService_Get_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *projectMemberServiceClient) Find(ctx context.Context, in *ProjectMemberFindRequest, opts ...grpc.CallOption) (*ProjectMemberListResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ProjectMemberListResponse)
-	err := c.cc.Invoke(ctx, ProjectMemberService_Find_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ProjectMemberServiceServer is the server API for ProjectMemberService service.
-// All implementations should embed UnimplementedProjectMemberServiceServer
-// for forward compatibility.
-type ProjectMemberServiceServer interface {
-	Create(context.Context, *ProjectMemberCreateRequest) (*ProjectMemberResponse, error)
-	Update(context.Context, *ProjectMemberUpdateRequest) (*ProjectMemberResponse, error)
-	Delete(context.Context, *ProjectMemberDeleteRequest) (*ProjectMemberResponse, error)
-	Get(context.Context, *ProjectMemberGetRequest) (*ProjectMemberResponse, error)
-	Find(context.Context, *ProjectMemberFindRequest) (*ProjectMemberListResponse, error)
-}
-
-// UnimplementedProjectMemberServiceServer should be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedProjectMemberServiceServer struct{}
-
-func (UnimplementedProjectMemberServiceServer) Create(context.Context, *ProjectMemberCreateRequest) (*ProjectMemberResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Create not implemented")
-}
-func (UnimplementedProjectMemberServiceServer) Update(context.Context, *ProjectMemberUpdateRequest) (*ProjectMemberResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Update not implemented")
-}
-func (UnimplementedProjectMemberServiceServer) Delete(context.Context, *ProjectMemberDeleteRequest) (*ProjectMemberResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented")
-}
-func (UnimplementedProjectMemberServiceServer) Get(context.Context, *ProjectMemberGetRequest) (*ProjectMemberResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Get not implemented")
-}
-func (UnimplementedProjectMemberServiceServer) Find(context.Context, *ProjectMemberFindRequest) (*ProjectMemberListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Find not implemented")
-}
-func (UnimplementedProjectMemberServiceServer) testEmbeddedByValue() {}
-
-// UnsafeProjectMemberServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to ProjectMemberServiceServer will
-// result in compilation errors.
-type UnsafeProjectMemberServiceServer interface {
-	mustEmbedUnimplementedProjectMemberServiceServer()
-}
-
-func RegisterProjectMemberServiceServer(s grpc.ServiceRegistrar, srv ProjectMemberServiceServer) {
-	// If the following call pancis, it indicates UnimplementedProjectMemberServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&ProjectMemberService_ServiceDesc, srv)
-}
-
-func _ProjectMemberService_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectMemberCreateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectMemberServiceServer).Create(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectMemberService_Create_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectMemberServiceServer).Create(ctx, req.(*ProjectMemberCreateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ProjectMemberService_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectMemberUpdateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectMemberServiceServer).Update(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectMemberService_Update_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectMemberServiceServer).Update(ctx, req.(*ProjectMemberUpdateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ProjectMemberService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectMemberDeleteRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectMemberServiceServer).Delete(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectMemberService_Delete_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectMemberServiceServer).Delete(ctx, req.(*ProjectMemberDeleteRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ProjectMemberService_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectMemberGetRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectMemberServiceServer).Get(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectMemberService_Get_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectMemberServiceServer).Get(ctx, req.(*ProjectMemberGetRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ProjectMemberService_Find_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ProjectMemberFindRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectMemberServiceServer).Find(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ProjectMemberService_Find_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectMemberServiceServer).Find(ctx, req.(*ProjectMemberFindRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// ProjectMemberService_ServiceDesc is the grpc.ServiceDesc for ProjectMemberService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var ProjectMemberService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "v1.ProjectMemberService",
-	HandlerType: (*ProjectMemberServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Create",
-			Handler:    _ProjectMemberService_Create_Handler,
-		},
-		{
-			MethodName: "Update",
-			Handler:    _ProjectMemberService_Update_Handler,
-		},
-		{
-			MethodName: "Delete",
-			Handler:    _ProjectMemberService_Delete_Handler,
-		},
-		{
-			MethodName: "Get",
-			Handler:    _ProjectMemberService_Get_Handler,
-		},
-		{
-			MethodName: "Find",
-			Handler:    _ProjectMemberService_Find_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "v1/project_member.proto",
-}
diff --git a/api/v1/project_scnrvalr.go b/api/v1/project_scnrvalr.go
index ac0d082..464b0c3 100644
--- a/api/v1/project_scnrvalr.go
+++ b/api/v1/project_scnrvalr.go
@@ -2,7 +2,7 @@
 // DO NOT EDIT MANUALLY.
 // Regenerate with "go generate" or "make generate"
 
-package v1
+package apiv1
 
 import (
 	"database/sql/driver"
diff --git a/api/v1/projectmember.go b/api/v1/projectmember.go
index 78416a3..bb38ca2 100644
--- a/api/v1/projectmember.go
+++ b/api/v1/projectmember.go
@@ -1,6 +1,6 @@
-package v1
+package apiv1
 
-//go:generate go run ../../pkg/gen/genscanvaluer.go -package v1 -type ProjectMember
+//go:generate go run ../../pkg/gen/genscanvaluer.go -package apiv1 -type ProjectMember
 
 func (m *ProjectMember) NewProjectMemberResponse() *ProjectMemberResponse {
 	return &ProjectMemberResponse{
diff --git a/api/v1/projectmember_scnrvalr.go b/api/v1/projectmember_scnrvalr.go
index 52be0ee..6b43e21 100644
--- a/api/v1/projectmember_scnrvalr.go
+++ b/api/v1/projectmember_scnrvalr.go
@@ -2,7 +2,7 @@
 // DO NOT EDIT MANUALLY.
 // Regenerate with "go generate" or "make generate"
 
-package v1
+package apiv1
 
 import (
 	"database/sql/driver"
diff --git a/api/v1/quota.pb.go b/api/v1/quota.pb.go
index 630427c..f642ecc 100644
--- a/api/v1/quota.pb.go
+++ b/api/v1/quota.pb.go
@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.8
+// 	protoc-gen-go v1.36.10
 // 	protoc        (unknown)
-// source: v1/quota.proto
+// source: api/v1/quota.proto
 
-package v1
+package apiv1
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -42,7 +42,7 @@ type QuotaSet struct {
 
 func (x *QuotaSet) Reset() {
 	*x = QuotaSet{}
-	mi := &file_v1_quota_proto_msgTypes[0]
+	mi := &file_api_v1_quota_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -54,7 +54,7 @@ func (x *QuotaSet) String() string {
 func (*QuotaSet) ProtoMessage() {}
 
 func (x *QuotaSet) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_quota_proto_msgTypes[0]
+	mi := &file_api_v1_quota_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -67,7 +67,7 @@ func (x *QuotaSet) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use QuotaSet.ProtoReflect.Descriptor instead.
 func (*QuotaSet) Descriptor() ([]byte, []int) {
-	return file_v1_quota_proto_rawDescGZIP(), []int{0}
+	return file_api_v1_quota_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *QuotaSet) GetCluster() *Quota {
@@ -103,7 +103,7 @@ type Quota struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// TODO: remove in next release:
 	//
-	// Deprecated: Marked as deprecated in v1/quota.proto.
+	// Deprecated: Marked as deprecated in api/v1/quota.proto.
 	Quota *wrapperspb.Int32Value `protobuf:"bytes,1,opt,name=quota,proto3" json:"quota,omitempty"`
 	// max is the maximum amount for the current QuotaSet, can be nil
 	Max           *int32 `protobuf:"varint,2,opt,name=max,proto3,oneof" json:"max,omitempty"`
@@ -113,7 +113,7 @@ type Quota struct {
 
 func (x *Quota) Reset() {
 	*x = Quota{}
-	mi := &file_v1_quota_proto_msgTypes[1]
+	mi := &file_api_v1_quota_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -125,7 +125,7 @@ func (x *Quota) String() string {
 func (*Quota) ProtoMessage() {}
 
 func (x *Quota) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_quota_proto_msgTypes[1]
+	mi := &file_api_v1_quota_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -138,10 +138,10 @@ func (x *Quota) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Quota.ProtoReflect.Descriptor instead.
 func (*Quota) Descriptor() ([]byte, []int) {
-	return file_v1_quota_proto_rawDescGZIP(), []int{1}
+	return file_api_v1_quota_proto_rawDescGZIP(), []int{1}
 }
 
-// Deprecated: Marked as deprecated in v1/quota.proto.
+// Deprecated: Marked as deprecated in api/v1/quota.proto.
 func (x *Quota) GetQuota() *wrapperspb.Int32Value {
 	if x != nil {
 		return x.Quota
@@ -156,47 +156,48 @@ func (x *Quota) GetMax() int32 {
 	return 0
 }
 
-var File_v1_quota_proto protoreflect.FileDescriptor
+var File_api_v1_quota_proto protoreflect.FileDescriptor
 
-const file_v1_quota_proto_rawDesc = "" +
+const file_api_v1_quota_proto_rawDesc = "" +
 	"\n" +
-	"\x0ev1/quota.proto\x12\x02v1\x1a\x1egoogle/protobuf/wrappers.proto\"\x94\x01\n" +
-	"\bQuotaSet\x12#\n" +
-	"\acluster\x18\x01 \x01(\v2\t.v1.QuotaR\acluster\x12#\n" +
-	"\amachine\x18\x02 \x01(\v2\t.v1.QuotaR\amachine\x12\x19\n" +
-	"\x02ip\x18\x03 \x01(\v2\t.v1.QuotaR\x02ip\x12#\n" +
-	"\aproject\x18\x04 \x01(\v2\t.v1.QuotaR\aproject\"]\n" +
+	"\x12api/v1/quota.proto\x12\x06api.v1\x1a\x1egoogle/protobuf/wrappers.proto\"\xa4\x01\n" +
+	"\bQuotaSet\x12'\n" +
+	"\acluster\x18\x01 \x01(\v2\r.api.v1.QuotaR\acluster\x12'\n" +
+	"\amachine\x18\x02 \x01(\v2\r.api.v1.QuotaR\amachine\x12\x1d\n" +
+	"\x02ip\x18\x03 \x01(\v2\r.api.v1.QuotaR\x02ip\x12'\n" +
+	"\aproject\x18\x04 \x01(\v2\r.api.v1.QuotaR\aproject\"]\n" +
 	"\x05Quota\x125\n" +
 	"\x05quota\x18\x01 \x01(\v2\x1b.google.protobuf.Int32ValueB\x02\x18\x01R\x05quota\x12\x15\n" +
 	"\x03max\x18\x02 \x01(\x05H\x00R\x03max\x88\x01\x01B\x06\n" +
-	"\x04_maxBf\n" +
-	"\x06com.v1B\n" +
-	"QuotaProtoP\x01Z(github.com/metal-stack/masterdata-api/v1\xa2\x02\x03VXX\xaa\x02\x02V1\xca\x02\x02V1\xe2\x02\x0eV1\\GPBMetadata\xea\x02\x02V1b\x06proto3"
+	"\x04_maxB\x85\x01\n" +
+	"\n" +
+	"com.api.v1B\n" +
+	"QuotaProtoP\x01Z2github.com/metal-stack/masterdata-api/api/v1;apiv1\xa2\x02\x03AXX\xaa\x02\x06Api.V1\xca\x02\x06Api\\V1\xe2\x02\x12Api\\V1\\GPBMetadata\xea\x02\aApi::V1b\x06proto3"
 
 var (
-	file_v1_quota_proto_rawDescOnce sync.Once
-	file_v1_quota_proto_rawDescData []byte
+	file_api_v1_quota_proto_rawDescOnce sync.Once
+	file_api_v1_quota_proto_rawDescData []byte
 )
 
-func file_v1_quota_proto_rawDescGZIP() []byte {
-	file_v1_quota_proto_rawDescOnce.Do(func() {
-		file_v1_quota_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_v1_quota_proto_rawDesc), len(file_v1_quota_proto_rawDesc)))
+func file_api_v1_quota_proto_rawDescGZIP() []byte {
+	file_api_v1_quota_proto_rawDescOnce.Do(func() {
+		file_api_v1_quota_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_quota_proto_rawDesc), len(file_api_v1_quota_proto_rawDesc)))
 	})
-	return file_v1_quota_proto_rawDescData
+	return file_api_v1_quota_proto_rawDescData
 }
 
-var file_v1_quota_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_v1_quota_proto_goTypes = []any{
-	(*QuotaSet)(nil),              // 0: v1.QuotaSet
-	(*Quota)(nil),                 // 1: v1.Quota
+var file_api_v1_quota_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_api_v1_quota_proto_goTypes = []any{
+	(*QuotaSet)(nil),              // 0: api.v1.QuotaSet
+	(*Quota)(nil),                 // 1: api.v1.Quota
 	(*wrapperspb.Int32Value)(nil), // 2: google.protobuf.Int32Value
 }
-var file_v1_quota_proto_depIdxs = []int32{
-	1, // 0: v1.QuotaSet.cluster:type_name -> v1.Quota
-	1, // 1: v1.QuotaSet.machine:type_name -> v1.Quota
-	1, // 2: v1.QuotaSet.ip:type_name -> v1.Quota
-	1, // 3: v1.QuotaSet.project:type_name -> v1.Quota
-	2, // 4: v1.Quota.quota:type_name -> google.protobuf.Int32Value
+var file_api_v1_quota_proto_depIdxs = []int32{
+	1, // 0: api.v1.QuotaSet.cluster:type_name -> api.v1.Quota
+	1, // 1: api.v1.QuotaSet.machine:type_name -> api.v1.Quota
+	1, // 2: api.v1.QuotaSet.ip:type_name -> api.v1.Quota
+	1, // 3: api.v1.QuotaSet.project:type_name -> api.v1.Quota
+	2, // 4: api.v1.Quota.quota:type_name -> google.protobuf.Int32Value
 	5, // [5:5] is the sub-list for method output_type
 	5, // [5:5] is the sub-list for method input_type
 	5, // [5:5] is the sub-list for extension type_name
@@ -204,27 +205,27 @@ var file_v1_quota_proto_depIdxs = []int32{
 	0, // [0:5] is the sub-list for field type_name
 }
 
-func init() { file_v1_quota_proto_init() }
-func file_v1_quota_proto_init() {
-	if File_v1_quota_proto != nil {
+func init() { file_api_v1_quota_proto_init() }
+func file_api_v1_quota_proto_init() {
+	if File_api_v1_quota_proto != nil {
 		return
 	}
-	file_v1_quota_proto_msgTypes[1].OneofWrappers = []any{}
+	file_api_v1_quota_proto_msgTypes[1].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_quota_proto_rawDesc), len(file_v1_quota_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_quota_proto_rawDesc), len(file_api_v1_quota_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_v1_quota_proto_goTypes,
-		DependencyIndexes: file_v1_quota_proto_depIdxs,
-		MessageInfos:      file_v1_quota_proto_msgTypes,
+		GoTypes:           file_api_v1_quota_proto_goTypes,
+		DependencyIndexes: file_api_v1_quota_proto_depIdxs,
+		MessageInfos:      file_api_v1_quota_proto_msgTypes,
 	}.Build()
-	File_v1_quota_proto = out.File
-	file_v1_quota_proto_goTypes = nil
-	file_v1_quota_proto_depIdxs = nil
+	File_api_v1_quota_proto = out.File
+	file_api_v1_quota_proto_goTypes = nil
+	file_api_v1_quota_proto_depIdxs = nil
 }
diff --git a/api/v1/tenant.go b/api/v1/tenant.go
index f98d935..fd3cce4 100644
--- a/api/v1/tenant.go
+++ b/api/v1/tenant.go
@@ -1,6 +1,6 @@
-package v1
+package apiv1
 
-//go:generate go run ../../pkg/gen/genscanvaluer.go -package v1 -type Tenant
+//go:generate go run ../../pkg/gen/genscanvaluer.go -package apiv1 -type Tenant
 
 func (m *Tenant) NewTenantResponse() *TenantResponse {
 	return &TenantResponse{
diff --git a/api/v1/tenant.pb.go b/api/v1/tenant.pb.go
index c3907f3..1fbe64e 100644
--- a/api/v1/tenant.pb.go
+++ b/api/v1/tenant.pb.go
@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.8
+// 	protoc-gen-go v1.36.10
 // 	protoc        (unknown)
-// source: v1/tenant.proto
+// source: api/v1/tenant.proto
 
-package v1
+package apiv1
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -34,7 +34,7 @@ type FindParticipatingProjectsRequest struct {
 
 func (x *FindParticipatingProjectsRequest) Reset() {
 	*x = FindParticipatingProjectsRequest{}
-	mi := &file_v1_tenant_proto_msgTypes[0]
+	mi := &file_api_v1_tenant_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -46,7 +46,7 @@ func (x *FindParticipatingProjectsRequest) String() string {
 func (*FindParticipatingProjectsRequest) ProtoMessage() {}
 
 func (x *FindParticipatingProjectsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[0]
+	mi := &file_api_v1_tenant_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -59,7 +59,7 @@ func (x *FindParticipatingProjectsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FindParticipatingProjectsRequest.ProtoReflect.Descriptor instead.
 func (*FindParticipatingProjectsRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{0}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *FindParticipatingProjectsRequest) GetTenantId() string {
@@ -94,7 +94,7 @@ type FindParticipatingTenantsRequest struct {
 
 func (x *FindParticipatingTenantsRequest) Reset() {
 	*x = FindParticipatingTenantsRequest{}
-	mi := &file_v1_tenant_proto_msgTypes[1]
+	mi := &file_api_v1_tenant_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -106,7 +106,7 @@ func (x *FindParticipatingTenantsRequest) String() string {
 func (*FindParticipatingTenantsRequest) ProtoMessage() {}
 
 func (x *FindParticipatingTenantsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[1]
+	mi := &file_api_v1_tenant_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -119,7 +119,7 @@ func (x *FindParticipatingTenantsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FindParticipatingTenantsRequest.ProtoReflect.Descriptor instead.
 func (*FindParticipatingTenantsRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{1}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *FindParticipatingTenantsRequest) GetTenantId() string {
@@ -154,7 +154,7 @@ type ListTenantMembersRequest struct {
 
 func (x *ListTenantMembersRequest) Reset() {
 	*x = ListTenantMembersRequest{}
-	mi := &file_v1_tenant_proto_msgTypes[2]
+	mi := &file_api_v1_tenant_proto_msgTypes[2]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -166,7 +166,7 @@ func (x *ListTenantMembersRequest) String() string {
 func (*ListTenantMembersRequest) ProtoMessage() {}
 
 func (x *ListTenantMembersRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[2]
+	mi := &file_api_v1_tenant_proto_msgTypes[2]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -179,7 +179,7 @@ func (x *ListTenantMembersRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListTenantMembersRequest.ProtoReflect.Descriptor instead.
 func (*ListTenantMembersRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{2}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *ListTenantMembersRequest) GetTenantId() string {
@@ -212,7 +212,7 @@ type ListTenantMembersResponse struct {
 
 func (x *ListTenantMembersResponse) Reset() {
 	*x = ListTenantMembersResponse{}
-	mi := &file_v1_tenant_proto_msgTypes[3]
+	mi := &file_api_v1_tenant_proto_msgTypes[3]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -224,7 +224,7 @@ func (x *ListTenantMembersResponse) String() string {
 func (*ListTenantMembersResponse) ProtoMessage() {}
 
 func (x *ListTenantMembersResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[3]
+	mi := &file_api_v1_tenant_proto_msgTypes[3]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -237,7 +237,7 @@ func (x *ListTenantMembersResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListTenantMembersResponse.ProtoReflect.Descriptor instead.
 func (*ListTenantMembersResponse) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{3}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *ListTenantMembersResponse) GetTenants() []*TenantWithMembershipAnnotations {
@@ -256,7 +256,7 @@ type FindParticipatingProjectsResponse struct {
 
 func (x *FindParticipatingProjectsResponse) Reset() {
 	*x = FindParticipatingProjectsResponse{}
-	mi := &file_v1_tenant_proto_msgTypes[4]
+	mi := &file_api_v1_tenant_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -268,7 +268,7 @@ func (x *FindParticipatingProjectsResponse) String() string {
 func (*FindParticipatingProjectsResponse) ProtoMessage() {}
 
 func (x *FindParticipatingProjectsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[4]
+	mi := &file_api_v1_tenant_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -281,7 +281,7 @@ func (x *FindParticipatingProjectsResponse) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use FindParticipatingProjectsResponse.ProtoReflect.Descriptor instead.
 func (*FindParticipatingProjectsResponse) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{4}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *FindParticipatingProjectsResponse) GetProjects() []*ProjectWithMembershipAnnotations {
@@ -300,7 +300,7 @@ type FindParticipatingTenantsResponse struct {
 
 func (x *FindParticipatingTenantsResponse) Reset() {
 	*x = FindParticipatingTenantsResponse{}
-	mi := &file_v1_tenant_proto_msgTypes[5]
+	mi := &file_api_v1_tenant_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -312,7 +312,7 @@ func (x *FindParticipatingTenantsResponse) String() string {
 func (*FindParticipatingTenantsResponse) ProtoMessage() {}
 
 func (x *FindParticipatingTenantsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[5]
+	mi := &file_api_v1_tenant_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -325,7 +325,7 @@ func (x *FindParticipatingTenantsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FindParticipatingTenantsResponse.ProtoReflect.Descriptor instead.
 func (*FindParticipatingTenantsResponse) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{5}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *FindParticipatingTenantsResponse) GetTenants() []*TenantWithMembershipAnnotations {
@@ -346,7 +346,7 @@ type ProjectWithMembershipAnnotations struct {
 
 func (x *ProjectWithMembershipAnnotations) Reset() {
 	*x = ProjectWithMembershipAnnotations{}
-	mi := &file_v1_tenant_proto_msgTypes[6]
+	mi := &file_api_v1_tenant_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -358,7 +358,7 @@ func (x *ProjectWithMembershipAnnotations) String() string {
 func (*ProjectWithMembershipAnnotations) ProtoMessage() {}
 
 func (x *ProjectWithMembershipAnnotations) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[6]
+	mi := &file_api_v1_tenant_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -371,7 +371,7 @@ func (x *ProjectWithMembershipAnnotations) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProjectWithMembershipAnnotations.ProtoReflect.Descriptor instead.
 func (*ProjectWithMembershipAnnotations) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{6}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *ProjectWithMembershipAnnotations) GetProject() *Project {
@@ -408,7 +408,7 @@ type TenantWithMembershipAnnotations struct {
 
 func (x *TenantWithMembershipAnnotations) Reset() {
 	*x = TenantWithMembershipAnnotations{}
-	mi := &file_v1_tenant_proto_msgTypes[7]
+	mi := &file_api_v1_tenant_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -420,7 +420,7 @@ func (x *TenantWithMembershipAnnotations) String() string {
 func (*TenantWithMembershipAnnotations) ProtoMessage() {}
 
 func (x *TenantWithMembershipAnnotations) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[7]
+	mi := &file_api_v1_tenant_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -433,7 +433,7 @@ func (x *TenantWithMembershipAnnotations) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantWithMembershipAnnotations.ProtoReflect.Descriptor instead.
 func (*TenantWithMembershipAnnotations) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{7}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *TenantWithMembershipAnnotations) GetTenant() *Tenant {
@@ -478,7 +478,7 @@ type Tenant struct {
 
 func (x *Tenant) Reset() {
 	*x = Tenant{}
-	mi := &file_v1_tenant_proto_msgTypes[8]
+	mi := &file_api_v1_tenant_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -490,7 +490,7 @@ func (x *Tenant) String() string {
 func (*Tenant) ProtoMessage() {}
 
 func (x *Tenant) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[8]
+	mi := &file_api_v1_tenant_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -503,7 +503,7 @@ func (x *Tenant) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Tenant.ProtoReflect.Descriptor instead.
 func (*Tenant) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{8}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *Tenant) GetMeta() *Meta {
@@ -557,7 +557,7 @@ type TenantCreateRequest struct {
 
 func (x *TenantCreateRequest) Reset() {
 	*x = TenantCreateRequest{}
-	mi := &file_v1_tenant_proto_msgTypes[9]
+	mi := &file_api_v1_tenant_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -569,7 +569,7 @@ func (x *TenantCreateRequest) String() string {
 func (*TenantCreateRequest) ProtoMessage() {}
 
 func (x *TenantCreateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[9]
+	mi := &file_api_v1_tenant_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -582,7 +582,7 @@ func (x *TenantCreateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantCreateRequest.ProtoReflect.Descriptor instead.
 func (*TenantCreateRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{9}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *TenantCreateRequest) GetTenant() *Tenant {
@@ -601,7 +601,7 @@ type TenantUpdateRequest struct {
 
 func (x *TenantUpdateRequest) Reset() {
 	*x = TenantUpdateRequest{}
-	mi := &file_v1_tenant_proto_msgTypes[10]
+	mi := &file_api_v1_tenant_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -613,7 +613,7 @@ func (x *TenantUpdateRequest) String() string {
 func (*TenantUpdateRequest) ProtoMessage() {}
 
 func (x *TenantUpdateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[10]
+	mi := &file_api_v1_tenant_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -626,7 +626,7 @@ func (x *TenantUpdateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantUpdateRequest.ProtoReflect.Descriptor instead.
 func (*TenantUpdateRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{10}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *TenantUpdateRequest) GetTenant() *Tenant {
@@ -645,7 +645,7 @@ type TenantDeleteRequest struct {
 
 func (x *TenantDeleteRequest) Reset() {
 	*x = TenantDeleteRequest{}
-	mi := &file_v1_tenant_proto_msgTypes[11]
+	mi := &file_api_v1_tenant_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -657,7 +657,7 @@ func (x *TenantDeleteRequest) String() string {
 func (*TenantDeleteRequest) ProtoMessage() {}
 
 func (x *TenantDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[11]
+	mi := &file_api_v1_tenant_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -670,7 +670,7 @@ func (x *TenantDeleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantDeleteRequest.ProtoReflect.Descriptor instead.
 func (*TenantDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{11}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *TenantDeleteRequest) GetId() string {
@@ -689,7 +689,7 @@ type TenantGetRequest struct {
 
 func (x *TenantGetRequest) Reset() {
 	*x = TenantGetRequest{}
-	mi := &file_v1_tenant_proto_msgTypes[12]
+	mi := &file_api_v1_tenant_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -701,7 +701,7 @@ func (x *TenantGetRequest) String() string {
 func (*TenantGetRequest) ProtoMessage() {}
 
 func (x *TenantGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[12]
+	mi := &file_api_v1_tenant_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -714,7 +714,7 @@ func (x *TenantGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantGetRequest.ProtoReflect.Descriptor instead.
 func (*TenantGetRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{12}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *TenantGetRequest) GetId() string {
@@ -734,7 +734,7 @@ type TenantGetHistoryRequest struct {
 
 func (x *TenantGetHistoryRequest) Reset() {
 	*x = TenantGetHistoryRequest{}
-	mi := &file_v1_tenant_proto_msgTypes[13]
+	mi := &file_api_v1_tenant_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -746,7 +746,7 @@ func (x *TenantGetHistoryRequest) String() string {
 func (*TenantGetHistoryRequest) ProtoMessage() {}
 
 func (x *TenantGetHistoryRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[13]
+	mi := &file_api_v1_tenant_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -759,7 +759,7 @@ func (x *TenantGetHistoryRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantGetHistoryRequest.ProtoReflect.Descriptor instead.
 func (*TenantGetHistoryRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{13}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *TenantGetHistoryRequest) GetId() string {
@@ -780,9 +780,9 @@ type TenantFindRequest struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// TODO: remove in next release:
 	//
-	// Deprecated: Marked as deprecated in v1/tenant.proto.
+	// Deprecated: Marked as deprecated in api/v1/tenant.proto.
 	DeprecatedId *wrapperspb.StringValue `protobuf:"bytes,1,opt,name=deprecated_id,json=deprecatedId,proto3" json:"deprecated_id,omitempty"`
-	// Deprecated: Marked as deprecated in v1/tenant.proto.
+	// Deprecated: Marked as deprecated in api/v1/tenant.proto.
 	DeprecatedName *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=deprecated_name,json=deprecatedName,proto3" json:"deprecated_name,omitempty"`
 	Paging         *Paging                 `protobuf:"bytes,3,opt,name=paging,proto3" json:"paging,omitempty"`
 	Annotations    map[string]string       `protobuf:"bytes,4,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
@@ -795,7 +795,7 @@ type TenantFindRequest struct {
 
 func (x *TenantFindRequest) Reset() {
 	*x = TenantFindRequest{}
-	mi := &file_v1_tenant_proto_msgTypes[14]
+	mi := &file_api_v1_tenant_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -807,7 +807,7 @@ func (x *TenantFindRequest) String() string {
 func (*TenantFindRequest) ProtoMessage() {}
 
 func (x *TenantFindRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[14]
+	mi := &file_api_v1_tenant_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -820,10 +820,10 @@ func (x *TenantFindRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantFindRequest.ProtoReflect.Descriptor instead.
 func (*TenantFindRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{14}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{14}
 }
 
-// Deprecated: Marked as deprecated in v1/tenant.proto.
+// Deprecated: Marked as deprecated in api/v1/tenant.proto.
 func (x *TenantFindRequest) GetDeprecatedId() *wrapperspb.StringValue {
 	if x != nil {
 		return x.DeprecatedId
@@ -831,7 +831,7 @@ func (x *TenantFindRequest) GetDeprecatedId() *wrapperspb.StringValue {
 	return nil
 }
 
-// Deprecated: Marked as deprecated in v1/tenant.proto.
+// Deprecated: Marked as deprecated in api/v1/tenant.proto.
 func (x *TenantFindRequest) GetDeprecatedName() *wrapperspb.StringValue {
 	if x != nil {
 		return x.DeprecatedName
@@ -883,7 +883,7 @@ type TenantResponse struct {
 
 func (x *TenantResponse) Reset() {
 	*x = TenantResponse{}
-	mi := &file_v1_tenant_proto_msgTypes[15]
+	mi := &file_api_v1_tenant_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -895,7 +895,7 @@ func (x *TenantResponse) String() string {
 func (*TenantResponse) ProtoMessage() {}
 
 func (x *TenantResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[15]
+	mi := &file_api_v1_tenant_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -908,7 +908,7 @@ func (x *TenantResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantResponse.ProtoReflect.Descriptor instead.
 func (*TenantResponse) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{15}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *TenantResponse) GetTenant() *Tenant {
@@ -929,7 +929,7 @@ type TenantListResponse struct {
 
 func (x *TenantListResponse) Reset() {
 	*x = TenantListResponse{}
-	mi := &file_v1_tenant_proto_msgTypes[16]
+	mi := &file_api_v1_tenant_proto_msgTypes[16]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -941,7 +941,7 @@ func (x *TenantListResponse) String() string {
 func (*TenantListResponse) ProtoMessage() {}
 
 func (x *TenantListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_proto_msgTypes[16]
+	mi := &file_api_v1_tenant_proto_msgTypes[16]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -954,7 +954,7 @@ func (x *TenantListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantListResponse.ProtoReflect.Descriptor instead.
 func (*TenantListResponse) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_proto_rawDescGZIP(), []int{16}
+	return file_api_v1_tenant_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *TenantListResponse) GetTenants() []*Tenant {
@@ -971,11 +971,11 @@ func (x *TenantListResponse) GetNextPage() uint64 {
 	return 0
 }
 
-var File_v1_tenant_proto protoreflect.FileDescriptor
+var File_api_v1_tenant_proto protoreflect.FileDescriptor
 
-const file_v1_tenant_proto_rawDesc = "" +
+const file_api_v1_tenant_proto_rawDesc = "" +
 	"\n" +
-	"\x0fv1/tenant.proto\x12\x02v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a\x0fv1/common.proto\x1a\fv1/iam.proto\x1a\rv1/meta.proto\x1a\x10v1/project.proto\x1a\x0ev1/quota.proto\"\xa5\x01\n" +
+	"\x13api/v1/tenant.proto\x12\x06api.v1\x1a\x13api/v1/common.proto\x1a\x10api/v1/iam.proto\x1a\x11api/v1/meta.proto\x1a\x14api/v1/project.proto\x1a\x12api/v1/quota.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xa5\x01\n" +
 	" FindParticipatingProjectsRequest\x12\x1b\n" +
 	"\ttenant_id\x18\x01 \x01(\tR\btenantId\x120\n" +
 	"\x11include_inherited\x18\x02 \x01(\bH\x00R\x10includeInherited\x88\x01\x01\x12\x1c\n" +
@@ -990,28 +990,27 @@ const file_v1_tenant_proto_rawDesc = "" +
 	"\ttenant_id\x18\x01 \x01(\tR\btenantId\x120\n" +
 	"\x11include_inherited\x18\x02 \x01(\bH\x00R\x10includeInherited\x88\x01\x01\x12\x1c\n" +
 	"\tnamespace\x18\x03 \x01(\tR\tnamespaceB\x14\n" +
-	"\x12_include_inherited\"Z\n" +
-	"\x19ListTenantMembersResponse\x12=\n" +
-	"\atenants\x18\x01 \x03(\v2#.v1.TenantWithMembershipAnnotationsR\atenants\"e\n" +
-	"!FindParticipatingProjectsResponse\x12@\n" +
-	"\bprojects\x18\x01 \x03(\v2$.v1.ProjectWithMembershipAnnotationsR\bprojects\"a\n" +
-	" FindParticipatingTenantsResponse\x12=\n" +
-	"\atenants\x18\x01 \x03(\v2#.v1.TenantWithMembershipAnnotationsR\atenants\"\xb1\x03\n" +
-	" ProjectWithMembershipAnnotations\x12%\n" +
-	"\aproject\x18\x01 \x01(\v2\v.v1.ProjectR\aproject\x12m\n" +
-	"\x13project_annotations\x18\x02 \x03(\v2<.v1.ProjectWithMembershipAnnotations.ProjectAnnotationsEntryR\x12projectAnnotations\x12j\n" +
-	"\x12tenant_annotations\x18\x03 \x03(\v2;.v1.ProjectWithMembershipAnnotations.TenantAnnotationsEntryR\x11tenantAnnotations\x1aE\n" +
+	"\x12_include_inherited\"^\n" +
+	"\x19ListTenantMembersResponse\x12A\n" +
+	"\atenants\x18\x01 \x03(\v2'.api.v1.TenantWithMembershipAnnotationsR\atenants\"i\n" +
+	"!FindParticipatingProjectsResponse\x12D\n" +
+	"\bprojects\x18\x01 \x03(\v2(.api.v1.ProjectWithMembershipAnnotationsR\bprojects\"e\n" +
+	" FindParticipatingTenantsResponse\x12A\n" +
+	"\atenants\x18\x01 \x03(\v2'.api.v1.TenantWithMembershipAnnotationsR\atenants\"\xbd\x03\n" +
+	" ProjectWithMembershipAnnotations\x12)\n" +
+	"\aproject\x18\x01 \x01(\v2\x0f.api.v1.ProjectR\aproject\x12q\n" +
+	"\x13project_annotations\x18\x02 \x03(\v2@.api.v1.ProjectWithMembershipAnnotations.ProjectAnnotationsEntryR\x12projectAnnotations\x12n\n" +
+	"\x12tenant_annotations\x18\x03 \x03(\v2?.api.v1.ProjectWithMembershipAnnotations.TenantAnnotationsEntryR\x11tenantAnnotations\x1aE\n" +
 	"\x17ProjectAnnotationsEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
 	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\x1aD\n" +
 	"\x16TenantAnnotationsEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
-	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xcc\x03\n" +
-	"\x1fTenantWithMembershipAnnotations\x12\"\n" +
-	"\x06tenant\x18\x01 \x01(\v2\n" +
-	".v1.TenantR\x06tenant\x12l\n" +
-	"\x13project_annotations\x18\x02 \x03(\v2;.v1.TenantWithMembershipAnnotations.ProjectAnnotationsEntryR\x12projectAnnotations\x12i\n" +
-	"\x12tenant_annotations\x18\x03 \x03(\v2:.v1.TenantWithMembershipAnnotations.TenantAnnotationsEntryR\x11tenantAnnotations\x12\x1f\n" +
+	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xd8\x03\n" +
+	"\x1fTenantWithMembershipAnnotations\x12&\n" +
+	"\x06tenant\x18\x01 \x01(\v2\x0e.api.v1.TenantR\x06tenant\x12p\n" +
+	"\x13project_annotations\x18\x02 \x03(\v2?.api.v1.TenantWithMembershipAnnotations.ProjectAnnotationsEntryR\x12projectAnnotations\x12m\n" +
+	"\x12tenant_annotations\x18\x03 \x03(\v2>.api.v1.TenantWithMembershipAnnotations.TenantAnnotationsEntryR\x11tenantAnnotations\x12\x1f\n" +
 	"\vproject_ids\x18\x04 \x03(\tR\n" +
 	"projectIds\x1aE\n" +
 	"\x17ProjectAnnotationsEntry\x12\x10\n" +
@@ -1019,34 +1018,31 @@ const file_v1_tenant_proto_rawDesc = "" +
 	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\x1aD\n" +
 	"\x16TenantAnnotationsEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
-	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xe5\x01\n" +
-	"\x06Tenant\x12\x1c\n" +
-	"\x04meta\x18\x01 \x01(\v2\b.v1.MetaR\x04meta\x12\x12\n" +
+	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xf5\x01\n" +
+	"\x06Tenant\x12 \n" +
+	"\x04meta\x18\x01 \x01(\v2\f.api.v1.MetaR\x04meta\x12\x12\n" +
 	"\x04name\x18\x02 \x01(\tR\x04name\x12 \n" +
-	"\vdescription\x18\x03 \x01(\tR\vdescription\x123\n" +
-	"\x0edefault_quotas\x18\x04 \x01(\v2\f.v1.QuotaSetR\rdefaultQuotas\x12$\n" +
-	"\x06quotas\x18\x05 \x01(\v2\f.v1.QuotaSetR\x06quotas\x12,\n" +
+	"\vdescription\x18\x03 \x01(\tR\vdescription\x127\n" +
+	"\x0edefault_quotas\x18\x04 \x01(\v2\x10.api.v1.QuotaSetR\rdefaultQuotas\x12(\n" +
+	"\x06quotas\x18\x05 \x01(\v2\x10.api.v1.QuotaSetR\x06quotas\x120\n" +
 	"\n" +
-	"iam_config\x18\x06 \x01(\v2\r.v1.IAMConfigR\tiamConfig\"9\n" +
-	"\x13TenantCreateRequest\x12\"\n" +
-	"\x06tenant\x18\x01 \x01(\v2\n" +
-	".v1.TenantR\x06tenant\"9\n" +
-	"\x13TenantUpdateRequest\x12\"\n" +
-	"\x06tenant\x18\x01 \x01(\v2\n" +
-	".v1.TenantR\x06tenant\"%\n" +
+	"iam_config\x18\x06 \x01(\v2\x11.api.v1.IAMConfigR\tiamConfig\"=\n" +
+	"\x13TenantCreateRequest\x12&\n" +
+	"\x06tenant\x18\x01 \x01(\v2\x0e.api.v1.TenantR\x06tenant\"=\n" +
+	"\x13TenantUpdateRequest\x12&\n" +
+	"\x06tenant\x18\x01 \x01(\v2\x0e.api.v1.TenantR\x06tenant\"%\n" +
 	"\x13TenantDeleteRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"\"\n" +
 	"\x10TenantGetRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"U\n" +
 	"\x17TenantGetHistoryRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12*\n" +
-	"\x02at\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\x02at\"\xa9\x03\n" +
+	"\x02at\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\x02at\"\xb1\x03\n" +
 	"\x11TenantFindRequest\x12E\n" +
 	"\rdeprecated_id\x18\x01 \x01(\v2\x1c.google.protobuf.StringValueB\x02\x18\x01R\fdeprecatedId\x12I\n" +
-	"\x0fdeprecated_name\x18\x02 \x01(\v2\x1c.google.protobuf.StringValueB\x02\x18\x01R\x0edeprecatedName\x12\"\n" +
-	"\x06paging\x18\x03 \x01(\v2\n" +
-	".v1.PagingR\x06paging\x12H\n" +
-	"\vannotations\x18\x04 \x03(\v2&.v1.TenantFindRequest.AnnotationsEntryR\vannotations\x12\x13\n" +
+	"\x0fdeprecated_name\x18\x02 \x01(\v2\x1c.google.protobuf.StringValueB\x02\x18\x01R\x0edeprecatedName\x12&\n" +
+	"\x06paging\x18\x03 \x01(\v2\x0e.api.v1.PagingR\x06paging\x12L\n" +
+	"\vannotations\x18\x04 \x03(\v2*.api.v1.TenantFindRequest.AnnotationsEntryR\vannotations\x12\x13\n" +
 	"\x02id\x18\x05 \x01(\tH\x00R\x02id\x88\x01\x01\x12\x17\n" +
 	"\x04name\x18\x06 \x01(\tH\x01R\x04name\x88\x01\x01\x12\x16\n" +
 	"\x06labels\x18\a \x03(\tR\x06labels\x1a>\n" +
@@ -1054,114 +1050,113 @@ const file_v1_tenant_proto_rawDesc = "" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
 	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\x05\n" +
 	"\x03_idB\a\n" +
-	"\x05_name\"4\n" +
-	"\x0eTenantResponse\x12\"\n" +
-	"\x06tenant\x18\x01 \x01(\v2\n" +
-	".v1.TenantR\x06tenant\"j\n" +
-	"\x12TenantListResponse\x12$\n" +
-	"\atenants\x18\x01 \x03(\v2\n" +
-	".v1.TenantR\atenants\x12 \n" +
+	"\x05_name\"8\n" +
+	"\x0eTenantResponse\x12&\n" +
+	"\x06tenant\x18\x01 \x01(\v2\x0e.api.v1.TenantR\x06tenant\"n\n" +
+	"\x12TenantListResponse\x12(\n" +
+	"\atenants\x18\x01 \x03(\v2\x0e.api.v1.TenantR\atenants\x12 \n" +
 	"\tnext_page\x18\x02 \x01(\x04H\x00R\bnextPage\x88\x01\x01B\f\n" +
 	"\n" +
-	"_next_page2\xfe\x04\n" +
-	"\rTenantService\x125\n" +
-	"\x06Create\x12\x17.v1.TenantCreateRequest\x1a\x12.v1.TenantResponse\x125\n" +
-	"\x06Update\x12\x17.v1.TenantUpdateRequest\x1a\x12.v1.TenantResponse\x125\n" +
-	"\x06Delete\x12\x17.v1.TenantDeleteRequest\x1a\x12.v1.TenantResponse\x12/\n" +
-	"\x03Get\x12\x14.v1.TenantGetRequest\x1a\x12.v1.TenantResponse\x12=\n" +
+	"_next_page2\xc6\x05\n" +
+	"\rTenantService\x12=\n" +
+	"\x06Create\x12\x1b.api.v1.TenantCreateRequest\x1a\x16.api.v1.TenantResponse\x12=\n" +
+	"\x06Update\x12\x1b.api.v1.TenantUpdateRequest\x1a\x16.api.v1.TenantResponse\x12=\n" +
+	"\x06Delete\x12\x1b.api.v1.TenantDeleteRequest\x1a\x16.api.v1.TenantResponse\x127\n" +
+	"\x03Get\x12\x18.api.v1.TenantGetRequest\x1a\x16.api.v1.TenantResponse\x12E\n" +
 	"\n" +
-	"GetHistory\x12\x1b.v1.TenantGetHistoryRequest\x1a\x12.v1.TenantResponse\x125\n" +
-	"\x04Find\x12\x15.v1.TenantFindRequest\x1a\x16.v1.TenantListResponse\x12P\n" +
-	"\x11ListTenantMembers\x12\x1c.v1.ListTenantMembersRequest\x1a\x1d.v1.ListTenantMembersResponse\x12h\n" +
-	"\x19FindParticipatingProjects\x12$.v1.FindParticipatingProjectsRequest\x1a%.v1.FindParticipatingProjectsResponse\x12e\n" +
-	"\x18FindParticipatingTenants\x12#.v1.FindParticipatingTenantsRequest\x1a$.v1.FindParticipatingTenantsResponseBg\n" +
-	"\x06com.v1B\vTenantProtoP\x01Z(github.com/metal-stack/masterdata-api/v1\xa2\x02\x03VXX\xaa\x02\x02V1\xca\x02\x02V1\xe2\x02\x0eV1\\GPBMetadata\xea\x02\x02V1b\x06proto3"
+	"GetHistory\x12\x1f.api.v1.TenantGetHistoryRequest\x1a\x16.api.v1.TenantResponse\x12=\n" +
+	"\x04Find\x12\x19.api.v1.TenantFindRequest\x1a\x1a.api.v1.TenantListResponse\x12X\n" +
+	"\x11ListTenantMembers\x12 .api.v1.ListTenantMembersRequest\x1a!.api.v1.ListTenantMembersResponse\x12p\n" +
+	"\x19FindParticipatingProjects\x12(.api.v1.FindParticipatingProjectsRequest\x1a).api.v1.FindParticipatingProjectsResponse\x12m\n" +
+	"\x18FindParticipatingTenants\x12'.api.v1.FindParticipatingTenantsRequest\x1a(.api.v1.FindParticipatingTenantsResponseB\x86\x01\n" +
+	"\n" +
+	"com.api.v1B\vTenantProtoP\x01Z2github.com/metal-stack/masterdata-api/api/v1;apiv1\xa2\x02\x03AXX\xaa\x02\x06Api.V1\xca\x02\x06Api\\V1\xe2\x02\x12Api\\V1\\GPBMetadata\xea\x02\aApi::V1b\x06proto3"
 
 var (
-	file_v1_tenant_proto_rawDescOnce sync.Once
-	file_v1_tenant_proto_rawDescData []byte
+	file_api_v1_tenant_proto_rawDescOnce sync.Once
+	file_api_v1_tenant_proto_rawDescData []byte
 )
 
-func file_v1_tenant_proto_rawDescGZIP() []byte {
-	file_v1_tenant_proto_rawDescOnce.Do(func() {
-		file_v1_tenant_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_v1_tenant_proto_rawDesc), len(file_v1_tenant_proto_rawDesc)))
+func file_api_v1_tenant_proto_rawDescGZIP() []byte {
+	file_api_v1_tenant_proto_rawDescOnce.Do(func() {
+		file_api_v1_tenant_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_tenant_proto_rawDesc), len(file_api_v1_tenant_proto_rawDesc)))
 	})
-	return file_v1_tenant_proto_rawDescData
-}
-
-var file_v1_tenant_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
-var file_v1_tenant_proto_goTypes = []any{
-	(*FindParticipatingProjectsRequest)(nil),  // 0: v1.FindParticipatingProjectsRequest
-	(*FindParticipatingTenantsRequest)(nil),   // 1: v1.FindParticipatingTenantsRequest
-	(*ListTenantMembersRequest)(nil),          // 2: v1.ListTenantMembersRequest
-	(*ListTenantMembersResponse)(nil),         // 3: v1.ListTenantMembersResponse
-	(*FindParticipatingProjectsResponse)(nil), // 4: v1.FindParticipatingProjectsResponse
-	(*FindParticipatingTenantsResponse)(nil),  // 5: v1.FindParticipatingTenantsResponse
-	(*ProjectWithMembershipAnnotations)(nil),  // 6: v1.ProjectWithMembershipAnnotations
-	(*TenantWithMembershipAnnotations)(nil),   // 7: v1.TenantWithMembershipAnnotations
-	(*Tenant)(nil),                            // 8: v1.Tenant
-	(*TenantCreateRequest)(nil),               // 9: v1.TenantCreateRequest
-	(*TenantUpdateRequest)(nil),               // 10: v1.TenantUpdateRequest
-	(*TenantDeleteRequest)(nil),               // 11: v1.TenantDeleteRequest
-	(*TenantGetRequest)(nil),                  // 12: v1.TenantGetRequest
-	(*TenantGetHistoryRequest)(nil),           // 13: v1.TenantGetHistoryRequest
-	(*TenantFindRequest)(nil),                 // 14: v1.TenantFindRequest
-	(*TenantResponse)(nil),                    // 15: v1.TenantResponse
-	(*TenantListResponse)(nil),                // 16: v1.TenantListResponse
-	nil,                                       // 17: v1.ProjectWithMembershipAnnotations.ProjectAnnotationsEntry
-	nil,                                       // 18: v1.ProjectWithMembershipAnnotations.TenantAnnotationsEntry
-	nil,                                       // 19: v1.TenantWithMembershipAnnotations.ProjectAnnotationsEntry
-	nil,                                       // 20: v1.TenantWithMembershipAnnotations.TenantAnnotationsEntry
-	nil,                                       // 21: v1.TenantFindRequest.AnnotationsEntry
-	(*Project)(nil),                           // 22: v1.Project
-	(*Meta)(nil),                              // 23: v1.Meta
-	(*QuotaSet)(nil),                          // 24: v1.QuotaSet
-	(*IAMConfig)(nil),                         // 25: v1.IAMConfig
+	return file_api_v1_tenant_proto_rawDescData
+}
+
+var file_api_v1_tenant_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
+var file_api_v1_tenant_proto_goTypes = []any{
+	(*FindParticipatingProjectsRequest)(nil),  // 0: api.v1.FindParticipatingProjectsRequest
+	(*FindParticipatingTenantsRequest)(nil),   // 1: api.v1.FindParticipatingTenantsRequest
+	(*ListTenantMembersRequest)(nil),          // 2: api.v1.ListTenantMembersRequest
+	(*ListTenantMembersResponse)(nil),         // 3: api.v1.ListTenantMembersResponse
+	(*FindParticipatingProjectsResponse)(nil), // 4: api.v1.FindParticipatingProjectsResponse
+	(*FindParticipatingTenantsResponse)(nil),  // 5: api.v1.FindParticipatingTenantsResponse
+	(*ProjectWithMembershipAnnotations)(nil),  // 6: api.v1.ProjectWithMembershipAnnotations
+	(*TenantWithMembershipAnnotations)(nil),   // 7: api.v1.TenantWithMembershipAnnotations
+	(*Tenant)(nil),                            // 8: api.v1.Tenant
+	(*TenantCreateRequest)(nil),               // 9: api.v1.TenantCreateRequest
+	(*TenantUpdateRequest)(nil),               // 10: api.v1.TenantUpdateRequest
+	(*TenantDeleteRequest)(nil),               // 11: api.v1.TenantDeleteRequest
+	(*TenantGetRequest)(nil),                  // 12: api.v1.TenantGetRequest
+	(*TenantGetHistoryRequest)(nil),           // 13: api.v1.TenantGetHistoryRequest
+	(*TenantFindRequest)(nil),                 // 14: api.v1.TenantFindRequest
+	(*TenantResponse)(nil),                    // 15: api.v1.TenantResponse
+	(*TenantListResponse)(nil),                // 16: api.v1.TenantListResponse
+	nil,                                       // 17: api.v1.ProjectWithMembershipAnnotations.ProjectAnnotationsEntry
+	nil,                                       // 18: api.v1.ProjectWithMembershipAnnotations.TenantAnnotationsEntry
+	nil,                                       // 19: api.v1.TenantWithMembershipAnnotations.ProjectAnnotationsEntry
+	nil,                                       // 20: api.v1.TenantWithMembershipAnnotations.TenantAnnotationsEntry
+	nil,                                       // 21: api.v1.TenantFindRequest.AnnotationsEntry
+	(*Project)(nil),                           // 22: api.v1.Project
+	(*Meta)(nil),                              // 23: api.v1.Meta
+	(*QuotaSet)(nil),                          // 24: api.v1.QuotaSet
+	(*IAMConfig)(nil),                         // 25: api.v1.IAMConfig
 	(*timestamppb.Timestamp)(nil),             // 26: google.protobuf.Timestamp
 	(*wrapperspb.StringValue)(nil),            // 27: google.protobuf.StringValue
-	(*Paging)(nil),                            // 28: v1.Paging
-}
-var file_v1_tenant_proto_depIdxs = []int32{
-	7,  // 0: v1.ListTenantMembersResponse.tenants:type_name -> v1.TenantWithMembershipAnnotations
-	6,  // 1: v1.FindParticipatingProjectsResponse.projects:type_name -> v1.ProjectWithMembershipAnnotations
-	7,  // 2: v1.FindParticipatingTenantsResponse.tenants:type_name -> v1.TenantWithMembershipAnnotations
-	22, // 3: v1.ProjectWithMembershipAnnotations.project:type_name -> v1.Project
-	17, // 4: v1.ProjectWithMembershipAnnotations.project_annotations:type_name -> v1.ProjectWithMembershipAnnotations.ProjectAnnotationsEntry
-	18, // 5: v1.ProjectWithMembershipAnnotations.tenant_annotations:type_name -> v1.ProjectWithMembershipAnnotations.TenantAnnotationsEntry
-	8,  // 6: v1.TenantWithMembershipAnnotations.tenant:type_name -> v1.Tenant
-	19, // 7: v1.TenantWithMembershipAnnotations.project_annotations:type_name -> v1.TenantWithMembershipAnnotations.ProjectAnnotationsEntry
-	20, // 8: v1.TenantWithMembershipAnnotations.tenant_annotations:type_name -> v1.TenantWithMembershipAnnotations.TenantAnnotationsEntry
-	23, // 9: v1.Tenant.meta:type_name -> v1.Meta
-	24, // 10: v1.Tenant.default_quotas:type_name -> v1.QuotaSet
-	24, // 11: v1.Tenant.quotas:type_name -> v1.QuotaSet
-	25, // 12: v1.Tenant.iam_config:type_name -> v1.IAMConfig
-	8,  // 13: v1.TenantCreateRequest.tenant:type_name -> v1.Tenant
-	8,  // 14: v1.TenantUpdateRequest.tenant:type_name -> v1.Tenant
-	26, // 15: v1.TenantGetHistoryRequest.at:type_name -> google.protobuf.Timestamp
-	27, // 16: v1.TenantFindRequest.deprecated_id:type_name -> google.protobuf.StringValue
-	27, // 17: v1.TenantFindRequest.deprecated_name:type_name -> google.protobuf.StringValue
-	28, // 18: v1.TenantFindRequest.paging:type_name -> v1.Paging
-	21, // 19: v1.TenantFindRequest.annotations:type_name -> v1.TenantFindRequest.AnnotationsEntry
-	8,  // 20: v1.TenantResponse.tenant:type_name -> v1.Tenant
-	8,  // 21: v1.TenantListResponse.tenants:type_name -> v1.Tenant
-	9,  // 22: v1.TenantService.Create:input_type -> v1.TenantCreateRequest
-	10, // 23: v1.TenantService.Update:input_type -> v1.TenantUpdateRequest
-	11, // 24: v1.TenantService.Delete:input_type -> v1.TenantDeleteRequest
-	12, // 25: v1.TenantService.Get:input_type -> v1.TenantGetRequest
-	13, // 26: v1.TenantService.GetHistory:input_type -> v1.TenantGetHistoryRequest
-	14, // 27: v1.TenantService.Find:input_type -> v1.TenantFindRequest
-	2,  // 28: v1.TenantService.ListTenantMembers:input_type -> v1.ListTenantMembersRequest
-	0,  // 29: v1.TenantService.FindParticipatingProjects:input_type -> v1.FindParticipatingProjectsRequest
-	1,  // 30: v1.TenantService.FindParticipatingTenants:input_type -> v1.FindParticipatingTenantsRequest
-	15, // 31: v1.TenantService.Create:output_type -> v1.TenantResponse
-	15, // 32: v1.TenantService.Update:output_type -> v1.TenantResponse
-	15, // 33: v1.TenantService.Delete:output_type -> v1.TenantResponse
-	15, // 34: v1.TenantService.Get:output_type -> v1.TenantResponse
-	15, // 35: v1.TenantService.GetHistory:output_type -> v1.TenantResponse
-	16, // 36: v1.TenantService.Find:output_type -> v1.TenantListResponse
-	3,  // 37: v1.TenantService.ListTenantMembers:output_type -> v1.ListTenantMembersResponse
-	4,  // 38: v1.TenantService.FindParticipatingProjects:output_type -> v1.FindParticipatingProjectsResponse
-	5,  // 39: v1.TenantService.FindParticipatingTenants:output_type -> v1.FindParticipatingTenantsResponse
+	(*Paging)(nil),                            // 28: api.v1.Paging
+}
+var file_api_v1_tenant_proto_depIdxs = []int32{
+	7,  // 0: api.v1.ListTenantMembersResponse.tenants:type_name -> api.v1.TenantWithMembershipAnnotations
+	6,  // 1: api.v1.FindParticipatingProjectsResponse.projects:type_name -> api.v1.ProjectWithMembershipAnnotations
+	7,  // 2: api.v1.FindParticipatingTenantsResponse.tenants:type_name -> api.v1.TenantWithMembershipAnnotations
+	22, // 3: api.v1.ProjectWithMembershipAnnotations.project:type_name -> api.v1.Project
+	17, // 4: api.v1.ProjectWithMembershipAnnotations.project_annotations:type_name -> api.v1.ProjectWithMembershipAnnotations.ProjectAnnotationsEntry
+	18, // 5: api.v1.ProjectWithMembershipAnnotations.tenant_annotations:type_name -> api.v1.ProjectWithMembershipAnnotations.TenantAnnotationsEntry
+	8,  // 6: api.v1.TenantWithMembershipAnnotations.tenant:type_name -> api.v1.Tenant
+	19, // 7: api.v1.TenantWithMembershipAnnotations.project_annotations:type_name -> api.v1.TenantWithMembershipAnnotations.ProjectAnnotationsEntry
+	20, // 8: api.v1.TenantWithMembershipAnnotations.tenant_annotations:type_name -> api.v1.TenantWithMembershipAnnotations.TenantAnnotationsEntry
+	23, // 9: api.v1.Tenant.meta:type_name -> api.v1.Meta
+	24, // 10: api.v1.Tenant.default_quotas:type_name -> api.v1.QuotaSet
+	24, // 11: api.v1.Tenant.quotas:type_name -> api.v1.QuotaSet
+	25, // 12: api.v1.Tenant.iam_config:type_name -> api.v1.IAMConfig
+	8,  // 13: api.v1.TenantCreateRequest.tenant:type_name -> api.v1.Tenant
+	8,  // 14: api.v1.TenantUpdateRequest.tenant:type_name -> api.v1.Tenant
+	26, // 15: api.v1.TenantGetHistoryRequest.at:type_name -> google.protobuf.Timestamp
+	27, // 16: api.v1.TenantFindRequest.deprecated_id:type_name -> google.protobuf.StringValue
+	27, // 17: api.v1.TenantFindRequest.deprecated_name:type_name -> google.protobuf.StringValue
+	28, // 18: api.v1.TenantFindRequest.paging:type_name -> api.v1.Paging
+	21, // 19: api.v1.TenantFindRequest.annotations:type_name -> api.v1.TenantFindRequest.AnnotationsEntry
+	8,  // 20: api.v1.TenantResponse.tenant:type_name -> api.v1.Tenant
+	8,  // 21: api.v1.TenantListResponse.tenants:type_name -> api.v1.Tenant
+	9,  // 22: api.v1.TenantService.Create:input_type -> api.v1.TenantCreateRequest
+	10, // 23: api.v1.TenantService.Update:input_type -> api.v1.TenantUpdateRequest
+	11, // 24: api.v1.TenantService.Delete:input_type -> api.v1.TenantDeleteRequest
+	12, // 25: api.v1.TenantService.Get:input_type -> api.v1.TenantGetRequest
+	13, // 26: api.v1.TenantService.GetHistory:input_type -> api.v1.TenantGetHistoryRequest
+	14, // 27: api.v1.TenantService.Find:input_type -> api.v1.TenantFindRequest
+	2,  // 28: api.v1.TenantService.ListTenantMembers:input_type -> api.v1.ListTenantMembersRequest
+	0,  // 29: api.v1.TenantService.FindParticipatingProjects:input_type -> api.v1.FindParticipatingProjectsRequest
+	1,  // 30: api.v1.TenantService.FindParticipatingTenants:input_type -> api.v1.FindParticipatingTenantsRequest
+	15, // 31: api.v1.TenantService.Create:output_type -> api.v1.TenantResponse
+	15, // 32: api.v1.TenantService.Update:output_type -> api.v1.TenantResponse
+	15, // 33: api.v1.TenantService.Delete:output_type -> api.v1.TenantResponse
+	15, // 34: api.v1.TenantService.Get:output_type -> api.v1.TenantResponse
+	15, // 35: api.v1.TenantService.GetHistory:output_type -> api.v1.TenantResponse
+	16, // 36: api.v1.TenantService.Find:output_type -> api.v1.TenantListResponse
+	3,  // 37: api.v1.TenantService.ListTenantMembers:output_type -> api.v1.ListTenantMembersResponse
+	4,  // 38: api.v1.TenantService.FindParticipatingProjects:output_type -> api.v1.FindParticipatingProjectsResponse
+	5,  // 39: api.v1.TenantService.FindParticipatingTenants:output_type -> api.v1.FindParticipatingTenantsResponse
 	31, // [31:40] is the sub-list for method output_type
 	22, // [22:31] is the sub-list for method input_type
 	22, // [22:22] is the sub-list for extension type_name
@@ -1169,36 +1164,36 @@ var file_v1_tenant_proto_depIdxs = []int32{
 	0,  // [0:22] is the sub-list for field type_name
 }
 
-func init() { file_v1_tenant_proto_init() }
-func file_v1_tenant_proto_init() {
-	if File_v1_tenant_proto != nil {
+func init() { file_api_v1_tenant_proto_init() }
+func file_api_v1_tenant_proto_init() {
+	if File_api_v1_tenant_proto != nil {
 		return
 	}
-	file_v1_common_proto_init()
-	file_v1_iam_proto_init()
-	file_v1_meta_proto_init()
-	file_v1_project_proto_init()
-	file_v1_quota_proto_init()
-	file_v1_tenant_proto_msgTypes[0].OneofWrappers = []any{}
-	file_v1_tenant_proto_msgTypes[1].OneofWrappers = []any{}
-	file_v1_tenant_proto_msgTypes[2].OneofWrappers = []any{}
-	file_v1_tenant_proto_msgTypes[14].OneofWrappers = []any{}
-	file_v1_tenant_proto_msgTypes[16].OneofWrappers = []any{}
+	file_api_v1_common_proto_init()
+	file_api_v1_iam_proto_init()
+	file_api_v1_meta_proto_init()
+	file_api_v1_project_proto_init()
+	file_api_v1_quota_proto_init()
+	file_api_v1_tenant_proto_msgTypes[0].OneofWrappers = []any{}
+	file_api_v1_tenant_proto_msgTypes[1].OneofWrappers = []any{}
+	file_api_v1_tenant_proto_msgTypes[2].OneofWrappers = []any{}
+	file_api_v1_tenant_proto_msgTypes[14].OneofWrappers = []any{}
+	file_api_v1_tenant_proto_msgTypes[16].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_tenant_proto_rawDesc), len(file_v1_tenant_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_tenant_proto_rawDesc), len(file_api_v1_tenant_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   22,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_v1_tenant_proto_goTypes,
-		DependencyIndexes: file_v1_tenant_proto_depIdxs,
-		MessageInfos:      file_v1_tenant_proto_msgTypes,
+		GoTypes:           file_api_v1_tenant_proto_goTypes,
+		DependencyIndexes: file_api_v1_tenant_proto_depIdxs,
+		MessageInfos:      file_api_v1_tenant_proto_msgTypes,
 	}.Build()
-	File_v1_tenant_proto = out.File
-	file_v1_tenant_proto_goTypes = nil
-	file_v1_tenant_proto_depIdxs = nil
+	File_api_v1_tenant_proto = out.File
+	file_api_v1_tenant_proto_goTypes = nil
+	file_api_v1_tenant_proto_depIdxs = nil
 }
diff --git a/api/v1/tenant_grpc.pb.go b/api/v1/tenant_grpc.pb.go
deleted file mode 100644
index c3dc3e2..0000000
--- a/api/v1/tenant_grpc.pb.go
+++ /dev/null
@@ -1,423 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             (unknown)
-// source: v1/tenant.proto
-
-package v1
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	TenantService_Create_FullMethodName                    = "/v1.TenantService/Create"
-	TenantService_Update_FullMethodName                    = "/v1.TenantService/Update"
-	TenantService_Delete_FullMethodName                    = "/v1.TenantService/Delete"
-	TenantService_Get_FullMethodName                       = "/v1.TenantService/Get"
-	TenantService_GetHistory_FullMethodName                = "/v1.TenantService/GetHistory"
-	TenantService_Find_FullMethodName                      = "/v1.TenantService/Find"
-	TenantService_ListTenantMembers_FullMethodName         = "/v1.TenantService/ListTenantMembers"
-	TenantService_FindParticipatingProjects_FullMethodName = "/v1.TenantService/FindParticipatingProjects"
-	TenantService_FindParticipatingTenants_FullMethodName  = "/v1.TenantService/FindParticipatingTenants"
-)
-
-// TenantServiceClient is the client API for TenantService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type TenantServiceClient interface {
-	Create(ctx context.Context, in *TenantCreateRequest, opts ...grpc.CallOption) (*TenantResponse, error)
-	Update(ctx context.Context, in *TenantUpdateRequest, opts ...grpc.CallOption) (*TenantResponse, error)
-	Delete(ctx context.Context, in *TenantDeleteRequest, opts ...grpc.CallOption) (*TenantResponse, error)
-	Get(ctx context.Context, in *TenantGetRequest, opts ...grpc.CallOption) (*TenantResponse, error)
-	GetHistory(ctx context.Context, in *TenantGetHistoryRequest, opts ...grpc.CallOption) (*TenantResponse, error)
-	Find(ctx context.Context, in *TenantFindRequest, opts ...grpc.CallOption) (*TenantListResponse, error)
-	ListTenantMembers(ctx context.Context, in *ListTenantMembersRequest, opts ...grpc.CallOption) (*ListTenantMembersResponse, error)
-	FindParticipatingProjects(ctx context.Context, in *FindParticipatingProjectsRequest, opts ...grpc.CallOption) (*FindParticipatingProjectsResponse, error)
-	FindParticipatingTenants(ctx context.Context, in *FindParticipatingTenantsRequest, opts ...grpc.CallOption) (*FindParticipatingTenantsResponse, error)
-}
-
-type tenantServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewTenantServiceClient(cc grpc.ClientConnInterface) TenantServiceClient {
-	return &tenantServiceClient{cc}
-}
-
-func (c *tenantServiceClient) Create(ctx context.Context, in *TenantCreateRequest, opts ...grpc.CallOption) (*TenantResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantResponse)
-	err := c.cc.Invoke(ctx, TenantService_Create_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantServiceClient) Update(ctx context.Context, in *TenantUpdateRequest, opts ...grpc.CallOption) (*TenantResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantResponse)
-	err := c.cc.Invoke(ctx, TenantService_Update_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantServiceClient) Delete(ctx context.Context, in *TenantDeleteRequest, opts ...grpc.CallOption) (*TenantResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantResponse)
-	err := c.cc.Invoke(ctx, TenantService_Delete_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantServiceClient) Get(ctx context.Context, in *TenantGetRequest, opts ...grpc.CallOption) (*TenantResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantResponse)
-	err := c.cc.Invoke(ctx, TenantService_Get_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantServiceClient) GetHistory(ctx context.Context, in *TenantGetHistoryRequest, opts ...grpc.CallOption) (*TenantResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantResponse)
-	err := c.cc.Invoke(ctx, TenantService_GetHistory_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantServiceClient) Find(ctx context.Context, in *TenantFindRequest, opts ...grpc.CallOption) (*TenantListResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantListResponse)
-	err := c.cc.Invoke(ctx, TenantService_Find_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantServiceClient) ListTenantMembers(ctx context.Context, in *ListTenantMembersRequest, opts ...grpc.CallOption) (*ListTenantMembersResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(ListTenantMembersResponse)
-	err := c.cc.Invoke(ctx, TenantService_ListTenantMembers_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantServiceClient) FindParticipatingProjects(ctx context.Context, in *FindParticipatingProjectsRequest, opts ...grpc.CallOption) (*FindParticipatingProjectsResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(FindParticipatingProjectsResponse)
-	err := c.cc.Invoke(ctx, TenantService_FindParticipatingProjects_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantServiceClient) FindParticipatingTenants(ctx context.Context, in *FindParticipatingTenantsRequest, opts ...grpc.CallOption) (*FindParticipatingTenantsResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(FindParticipatingTenantsResponse)
-	err := c.cc.Invoke(ctx, TenantService_FindParticipatingTenants_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// TenantServiceServer is the server API for TenantService service.
-// All implementations should embed UnimplementedTenantServiceServer
-// for forward compatibility.
-type TenantServiceServer interface {
-	Create(context.Context, *TenantCreateRequest) (*TenantResponse, error)
-	Update(context.Context, *TenantUpdateRequest) (*TenantResponse, error)
-	Delete(context.Context, *TenantDeleteRequest) (*TenantResponse, error)
-	Get(context.Context, *TenantGetRequest) (*TenantResponse, error)
-	GetHistory(context.Context, *TenantGetHistoryRequest) (*TenantResponse, error)
-	Find(context.Context, *TenantFindRequest) (*TenantListResponse, error)
-	ListTenantMembers(context.Context, *ListTenantMembersRequest) (*ListTenantMembersResponse, error)
-	FindParticipatingProjects(context.Context, *FindParticipatingProjectsRequest) (*FindParticipatingProjectsResponse, error)
-	FindParticipatingTenants(context.Context, *FindParticipatingTenantsRequest) (*FindParticipatingTenantsResponse, error)
-}
-
-// UnimplementedTenantServiceServer should be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedTenantServiceServer struct{}
-
-func (UnimplementedTenantServiceServer) Create(context.Context, *TenantCreateRequest) (*TenantResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Create not implemented")
-}
-func (UnimplementedTenantServiceServer) Update(context.Context, *TenantUpdateRequest) (*TenantResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Update not implemented")
-}
-func (UnimplementedTenantServiceServer) Delete(context.Context, *TenantDeleteRequest) (*TenantResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented")
-}
-func (UnimplementedTenantServiceServer) Get(context.Context, *TenantGetRequest) (*TenantResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Get not implemented")
-}
-func (UnimplementedTenantServiceServer) GetHistory(context.Context, *TenantGetHistoryRequest) (*TenantResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetHistory not implemented")
-}
-func (UnimplementedTenantServiceServer) Find(context.Context, *TenantFindRequest) (*TenantListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Find not implemented")
-}
-func (UnimplementedTenantServiceServer) ListTenantMembers(context.Context, *ListTenantMembersRequest) (*ListTenantMembersResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ListTenantMembers not implemented")
-}
-func (UnimplementedTenantServiceServer) FindParticipatingProjects(context.Context, *FindParticipatingProjectsRequest) (*FindParticipatingProjectsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method FindParticipatingProjects not implemented")
-}
-func (UnimplementedTenantServiceServer) FindParticipatingTenants(context.Context, *FindParticipatingTenantsRequest) (*FindParticipatingTenantsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method FindParticipatingTenants not implemented")
-}
-func (UnimplementedTenantServiceServer) testEmbeddedByValue() {}
-
-// UnsafeTenantServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to TenantServiceServer will
-// result in compilation errors.
-type UnsafeTenantServiceServer interface {
-	mustEmbedUnimplementedTenantServiceServer()
-}
-
-func RegisterTenantServiceServer(s grpc.ServiceRegistrar, srv TenantServiceServer) {
-	// If the following call pancis, it indicates UnimplementedTenantServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&TenantService_ServiceDesc, srv)
-}
-
-func _TenantService_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantCreateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantServiceServer).Create(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantService_Create_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantServiceServer).Create(ctx, req.(*TenantCreateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantService_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantUpdateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantServiceServer).Update(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantService_Update_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantServiceServer).Update(ctx, req.(*TenantUpdateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantDeleteRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantServiceServer).Delete(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantService_Delete_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantServiceServer).Delete(ctx, req.(*TenantDeleteRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantService_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantGetRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantServiceServer).Get(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantService_Get_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantServiceServer).Get(ctx, req.(*TenantGetRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantService_GetHistory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantGetHistoryRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantServiceServer).GetHistory(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantService_GetHistory_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantServiceServer).GetHistory(ctx, req.(*TenantGetHistoryRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantService_Find_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantFindRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantServiceServer).Find(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantService_Find_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantServiceServer).Find(ctx, req.(*TenantFindRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantService_ListTenantMembers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListTenantMembersRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantServiceServer).ListTenantMembers(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantService_ListTenantMembers_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantServiceServer).ListTenantMembers(ctx, req.(*ListTenantMembersRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantService_FindParticipatingProjects_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(FindParticipatingProjectsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantServiceServer).FindParticipatingProjects(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantService_FindParticipatingProjects_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantServiceServer).FindParticipatingProjects(ctx, req.(*FindParticipatingProjectsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantService_FindParticipatingTenants_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(FindParticipatingTenantsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantServiceServer).FindParticipatingTenants(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantService_FindParticipatingTenants_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantServiceServer).FindParticipatingTenants(ctx, req.(*FindParticipatingTenantsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// TenantService_ServiceDesc is the grpc.ServiceDesc for TenantService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var TenantService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "v1.TenantService",
-	HandlerType: (*TenantServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Create",
-			Handler:    _TenantService_Create_Handler,
-		},
-		{
-			MethodName: "Update",
-			Handler:    _TenantService_Update_Handler,
-		},
-		{
-			MethodName: "Delete",
-			Handler:    _TenantService_Delete_Handler,
-		},
-		{
-			MethodName: "Get",
-			Handler:    _TenantService_Get_Handler,
-		},
-		{
-			MethodName: "GetHistory",
-			Handler:    _TenantService_GetHistory_Handler,
-		},
-		{
-			MethodName: "Find",
-			Handler:    _TenantService_Find_Handler,
-		},
-		{
-			MethodName: "ListTenantMembers",
-			Handler:    _TenantService_ListTenantMembers_Handler,
-		},
-		{
-			MethodName: "FindParticipatingProjects",
-			Handler:    _TenantService_FindParticipatingProjects_Handler,
-		},
-		{
-			MethodName: "FindParticipatingTenants",
-			Handler:    _TenantService_FindParticipatingTenants_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "v1/tenant.proto",
-}
diff --git a/api/v1/tenant_member.pb.go b/api/v1/tenant_member.pb.go
index bc6e8e7..c89a715 100644
--- a/api/v1/tenant_member.pb.go
+++ b/api/v1/tenant_member.pb.go
@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.8
+// 	protoc-gen-go v1.36.10
 // 	protoc        (unknown)
-// source: v1/tenant_member.proto
+// source: api/v1/tenant_member.proto
 
-package v1
+package apiv1
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -37,7 +37,7 @@ type TenantMember struct {
 
 func (x *TenantMember) Reset() {
 	*x = TenantMember{}
-	mi := &file_v1_tenant_member_proto_msgTypes[0]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -49,7 +49,7 @@ func (x *TenantMember) String() string {
 func (*TenantMember) ProtoMessage() {}
 
 func (x *TenantMember) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_member_proto_msgTypes[0]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -62,7 +62,7 @@ func (x *TenantMember) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantMember.ProtoReflect.Descriptor instead.
 func (*TenantMember) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_member_proto_rawDescGZIP(), []int{0}
+	return file_api_v1_tenant_member_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *TenantMember) GetMeta() *Meta {
@@ -102,7 +102,7 @@ type TenantMemberCreateRequest struct {
 
 func (x *TenantMemberCreateRequest) Reset() {
 	*x = TenantMemberCreateRequest{}
-	mi := &file_v1_tenant_member_proto_msgTypes[1]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -114,7 +114,7 @@ func (x *TenantMemberCreateRequest) String() string {
 func (*TenantMemberCreateRequest) ProtoMessage() {}
 
 func (x *TenantMemberCreateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_member_proto_msgTypes[1]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -127,7 +127,7 @@ func (x *TenantMemberCreateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantMemberCreateRequest.ProtoReflect.Descriptor instead.
 func (*TenantMemberCreateRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_member_proto_rawDescGZIP(), []int{1}
+	return file_api_v1_tenant_member_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *TenantMemberCreateRequest) GetTenantMember() *TenantMember {
@@ -146,7 +146,7 @@ type TenantMemberUpdateRequest struct {
 
 func (x *TenantMemberUpdateRequest) Reset() {
 	*x = TenantMemberUpdateRequest{}
-	mi := &file_v1_tenant_member_proto_msgTypes[2]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[2]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -158,7 +158,7 @@ func (x *TenantMemberUpdateRequest) String() string {
 func (*TenantMemberUpdateRequest) ProtoMessage() {}
 
 func (x *TenantMemberUpdateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_member_proto_msgTypes[2]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[2]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -171,7 +171,7 @@ func (x *TenantMemberUpdateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantMemberUpdateRequest.ProtoReflect.Descriptor instead.
 func (*TenantMemberUpdateRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_member_proto_rawDescGZIP(), []int{2}
+	return file_api_v1_tenant_member_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *TenantMemberUpdateRequest) GetTenantMember() *TenantMember {
@@ -190,7 +190,7 @@ type TenantMemberDeleteRequest struct {
 
 func (x *TenantMemberDeleteRequest) Reset() {
 	*x = TenantMemberDeleteRequest{}
-	mi := &file_v1_tenant_member_proto_msgTypes[3]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[3]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -202,7 +202,7 @@ func (x *TenantMemberDeleteRequest) String() string {
 func (*TenantMemberDeleteRequest) ProtoMessage() {}
 
 func (x *TenantMemberDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_member_proto_msgTypes[3]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[3]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -215,7 +215,7 @@ func (x *TenantMemberDeleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantMemberDeleteRequest.ProtoReflect.Descriptor instead.
 func (*TenantMemberDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_member_proto_rawDescGZIP(), []int{3}
+	return file_api_v1_tenant_member_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *TenantMemberDeleteRequest) GetId() string {
@@ -234,7 +234,7 @@ type TenantMemberGetRequest struct {
 
 func (x *TenantMemberGetRequest) Reset() {
 	*x = TenantMemberGetRequest{}
-	mi := &file_v1_tenant_member_proto_msgTypes[4]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -246,7 +246,7 @@ func (x *TenantMemberGetRequest) String() string {
 func (*TenantMemberGetRequest) ProtoMessage() {}
 
 func (x *TenantMemberGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_member_proto_msgTypes[4]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -259,7 +259,7 @@ func (x *TenantMemberGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantMemberGetRequest.ProtoReflect.Descriptor instead.
 func (*TenantMemberGetRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_member_proto_rawDescGZIP(), []int{4}
+	return file_api_v1_tenant_member_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *TenantMemberGetRequest) GetId() string {
@@ -281,7 +281,7 @@ type TenantMemberFindRequest struct {
 
 func (x *TenantMemberFindRequest) Reset() {
 	*x = TenantMemberFindRequest{}
-	mi := &file_v1_tenant_member_proto_msgTypes[5]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -293,7 +293,7 @@ func (x *TenantMemberFindRequest) String() string {
 func (*TenantMemberFindRequest) ProtoMessage() {}
 
 func (x *TenantMemberFindRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_member_proto_msgTypes[5]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -306,7 +306,7 @@ func (x *TenantMemberFindRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantMemberFindRequest.ProtoReflect.Descriptor instead.
 func (*TenantMemberFindRequest) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_member_proto_rawDescGZIP(), []int{5}
+	return file_api_v1_tenant_member_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *TenantMemberFindRequest) GetTenantId() string {
@@ -346,7 +346,7 @@ type TenantMemberResponse struct {
 
 func (x *TenantMemberResponse) Reset() {
 	*x = TenantMemberResponse{}
-	mi := &file_v1_tenant_member_proto_msgTypes[6]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -358,7 +358,7 @@ func (x *TenantMemberResponse) String() string {
 func (*TenantMemberResponse) ProtoMessage() {}
 
 func (x *TenantMemberResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_member_proto_msgTypes[6]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -371,7 +371,7 @@ func (x *TenantMemberResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantMemberResponse.ProtoReflect.Descriptor instead.
 func (*TenantMemberResponse) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_member_proto_rawDescGZIP(), []int{6}
+	return file_api_v1_tenant_member_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *TenantMemberResponse) GetTenantMember() *TenantMember {
@@ -390,7 +390,7 @@ type TenantMemberListResponse struct {
 
 func (x *TenantMemberListResponse) Reset() {
 	*x = TenantMemberListResponse{}
-	mi := &file_v1_tenant_member_proto_msgTypes[7]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -402,7 +402,7 @@ func (x *TenantMemberListResponse) String() string {
 func (*TenantMemberListResponse) ProtoMessage() {}
 
 func (x *TenantMemberListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_tenant_member_proto_msgTypes[7]
+	mi := &file_api_v1_tenant_member_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -415,7 +415,7 @@ func (x *TenantMemberListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TenantMemberListResponse.ProtoReflect.Descriptor instead.
 func (*TenantMemberListResponse) Descriptor() ([]byte, []int) {
-	return file_v1_tenant_member_proto_rawDescGZIP(), []int{7}
+	return file_api_v1_tenant_member_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *TenantMemberListResponse) GetTenantMembers() []*TenantMember {
@@ -425,28 +425,28 @@ func (x *TenantMemberListResponse) GetTenantMembers() []*TenantMember {
 	return nil
 }
 
-var File_v1_tenant_member_proto protoreflect.FileDescriptor
+var File_api_v1_tenant_member_proto protoreflect.FileDescriptor
 
-const file_v1_tenant_member_proto_rawDesc = "" +
+const file_api_v1_tenant_member_proto_rawDesc = "" +
 	"\n" +
-	"\x16v1/tenant_member.proto\x12\x02v1\x1a\rv1/meta.proto\"\x84\x01\n" +
-	"\fTenantMember\x12\x1c\n" +
-	"\x04meta\x18\x01 \x01(\v2\b.v1.MetaR\x04meta\x12\x1b\n" +
+	"\x1aapi/v1/tenant_member.proto\x12\x06api.v1\x1a\x11api/v1/meta.proto\"\x88\x01\n" +
+	"\fTenantMember\x12 \n" +
+	"\x04meta\x18\x01 \x01(\v2\f.api.v1.MetaR\x04meta\x12\x1b\n" +
 	"\ttenant_id\x18\x02 \x01(\tR\btenantId\x12\x1b\n" +
 	"\tmember_id\x18\x03 \x01(\tR\bmemberId\x12\x1c\n" +
-	"\tnamespace\x18\x04 \x01(\tR\tnamespace\"R\n" +
-	"\x19TenantMemberCreateRequest\x125\n" +
-	"\rtenant_member\x18\x01 \x01(\v2\x10.v1.TenantMemberR\ftenantMember\"R\n" +
-	"\x19TenantMemberUpdateRequest\x125\n" +
-	"\rtenant_member\x18\x01 \x01(\v2\x10.v1.TenantMemberR\ftenantMember\"+\n" +
+	"\tnamespace\x18\x04 \x01(\tR\tnamespace\"V\n" +
+	"\x19TenantMemberCreateRequest\x129\n" +
+	"\rtenant_member\x18\x01 \x01(\v2\x14.api.v1.TenantMemberR\ftenantMember\"V\n" +
+	"\x19TenantMemberUpdateRequest\x129\n" +
+	"\rtenant_member\x18\x01 \x01(\v2\x14.api.v1.TenantMemberR\ftenantMember\"+\n" +
 	"\x19TenantMemberDeleteRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"(\n" +
 	"\x16TenantMemberGetRequest\x12\x0e\n" +
-	"\x02id\x18\x01 \x01(\tR\x02id\"\xa7\x02\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\"\xab\x02\n" +
 	"\x17TenantMemberFindRequest\x12 \n" +
 	"\ttenant_id\x18\x01 \x01(\tH\x00R\btenantId\x88\x01\x01\x12 \n" +
-	"\tmember_id\x18\x02 \x01(\tH\x01R\bmemberId\x88\x01\x01\x12N\n" +
-	"\vannotations\x18\x06 \x03(\v2,.v1.TenantMemberFindRequest.AnnotationsEntryR\vannotations\x12\x1c\n" +
+	"\tmember_id\x18\x02 \x01(\tH\x01R\bmemberId\x88\x01\x01\x12R\n" +
+	"\vannotations\x18\x06 \x03(\v20.api.v1.TenantMemberFindRequest.AnnotationsEntryR\vannotations\x12\x1c\n" +
 	"\tnamespace\x18\a \x01(\tR\tnamespace\x1a>\n" +
 	"\x10AnnotationsEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
@@ -454,61 +454,62 @@ const file_v1_tenant_member_proto_rawDesc = "" +
 	"\n" +
 	"_tenant_idB\f\n" +
 	"\n" +
-	"_member_id\"M\n" +
-	"\x14TenantMemberResponse\x125\n" +
-	"\rtenant_member\x18\x01 \x01(\v2\x10.v1.TenantMemberR\ftenantMember\"S\n" +
-	"\x18TenantMemberListResponse\x127\n" +
-	"\x0etenant_members\x18\x01 \x03(\v2\x10.v1.TenantMemberR\rtenantMembers2\xde\x02\n" +
-	"\x13TenantMemberService\x12A\n" +
-	"\x06Create\x12\x1d.v1.TenantMemberCreateRequest\x1a\x18.v1.TenantMemberResponse\x12A\n" +
-	"\x06Update\x12\x1d.v1.TenantMemberUpdateRequest\x1a\x18.v1.TenantMemberResponse\x12A\n" +
-	"\x06Delete\x12\x1d.v1.TenantMemberDeleteRequest\x1a\x18.v1.TenantMemberResponse\x12;\n" +
-	"\x03Get\x12\x1a.v1.TenantMemberGetRequest\x1a\x18.v1.TenantMemberResponse\x12A\n" +
-	"\x04Find\x12\x1b.v1.TenantMemberFindRequest\x1a\x1c.v1.TenantMemberListResponseBm\n" +
-	"\x06com.v1B\x11TenantMemberProtoP\x01Z(github.com/metal-stack/masterdata-api/v1\xa2\x02\x03VXX\xaa\x02\x02V1\xca\x02\x02V1\xe2\x02\x0eV1\\GPBMetadata\xea\x02\x02V1b\x06proto3"
+	"_member_id\"Q\n" +
+	"\x14TenantMemberResponse\x129\n" +
+	"\rtenant_member\x18\x01 \x01(\v2\x14.api.v1.TenantMemberR\ftenantMember\"W\n" +
+	"\x18TenantMemberListResponse\x12;\n" +
+	"\x0etenant_members\x18\x01 \x03(\v2\x14.api.v1.TenantMemberR\rtenantMembers2\x86\x03\n" +
+	"\x13TenantMemberService\x12I\n" +
+	"\x06Create\x12!.api.v1.TenantMemberCreateRequest\x1a\x1c.api.v1.TenantMemberResponse\x12I\n" +
+	"\x06Update\x12!.api.v1.TenantMemberUpdateRequest\x1a\x1c.api.v1.TenantMemberResponse\x12I\n" +
+	"\x06Delete\x12!.api.v1.TenantMemberDeleteRequest\x1a\x1c.api.v1.TenantMemberResponse\x12C\n" +
+	"\x03Get\x12\x1e.api.v1.TenantMemberGetRequest\x1a\x1c.api.v1.TenantMemberResponse\x12I\n" +
+	"\x04Find\x12\x1f.api.v1.TenantMemberFindRequest\x1a .api.v1.TenantMemberListResponseB\x8c\x01\n" +
+	"\n" +
+	"com.api.v1B\x11TenantMemberProtoP\x01Z2github.com/metal-stack/masterdata-api/api/v1;apiv1\xa2\x02\x03AXX\xaa\x02\x06Api.V1\xca\x02\x06Api\\V1\xe2\x02\x12Api\\V1\\GPBMetadata\xea\x02\aApi::V1b\x06proto3"
 
 var (
-	file_v1_tenant_member_proto_rawDescOnce sync.Once
-	file_v1_tenant_member_proto_rawDescData []byte
+	file_api_v1_tenant_member_proto_rawDescOnce sync.Once
+	file_api_v1_tenant_member_proto_rawDescData []byte
 )
 
-func file_v1_tenant_member_proto_rawDescGZIP() []byte {
-	file_v1_tenant_member_proto_rawDescOnce.Do(func() {
-		file_v1_tenant_member_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_v1_tenant_member_proto_rawDesc), len(file_v1_tenant_member_proto_rawDesc)))
+func file_api_v1_tenant_member_proto_rawDescGZIP() []byte {
+	file_api_v1_tenant_member_proto_rawDescOnce.Do(func() {
+		file_api_v1_tenant_member_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_tenant_member_proto_rawDesc), len(file_api_v1_tenant_member_proto_rawDesc)))
 	})
-	return file_v1_tenant_member_proto_rawDescData
-}
-
-var file_v1_tenant_member_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
-var file_v1_tenant_member_proto_goTypes = []any{
-	(*TenantMember)(nil),              // 0: v1.TenantMember
-	(*TenantMemberCreateRequest)(nil), // 1: v1.TenantMemberCreateRequest
-	(*TenantMemberUpdateRequest)(nil), // 2: v1.TenantMemberUpdateRequest
-	(*TenantMemberDeleteRequest)(nil), // 3: v1.TenantMemberDeleteRequest
-	(*TenantMemberGetRequest)(nil),    // 4: v1.TenantMemberGetRequest
-	(*TenantMemberFindRequest)(nil),   // 5: v1.TenantMemberFindRequest
-	(*TenantMemberResponse)(nil),      // 6: v1.TenantMemberResponse
-	(*TenantMemberListResponse)(nil),  // 7: v1.TenantMemberListResponse
-	nil,                               // 8: v1.TenantMemberFindRequest.AnnotationsEntry
-	(*Meta)(nil),                      // 9: v1.Meta
-}
-var file_v1_tenant_member_proto_depIdxs = []int32{
-	9,  // 0: v1.TenantMember.meta:type_name -> v1.Meta
-	0,  // 1: v1.TenantMemberCreateRequest.tenant_member:type_name -> v1.TenantMember
-	0,  // 2: v1.TenantMemberUpdateRequest.tenant_member:type_name -> v1.TenantMember
-	8,  // 3: v1.TenantMemberFindRequest.annotations:type_name -> v1.TenantMemberFindRequest.AnnotationsEntry
-	0,  // 4: v1.TenantMemberResponse.tenant_member:type_name -> v1.TenantMember
-	0,  // 5: v1.TenantMemberListResponse.tenant_members:type_name -> v1.TenantMember
-	1,  // 6: v1.TenantMemberService.Create:input_type -> v1.TenantMemberCreateRequest
-	2,  // 7: v1.TenantMemberService.Update:input_type -> v1.TenantMemberUpdateRequest
-	3,  // 8: v1.TenantMemberService.Delete:input_type -> v1.TenantMemberDeleteRequest
-	4,  // 9: v1.TenantMemberService.Get:input_type -> v1.TenantMemberGetRequest
-	5,  // 10: v1.TenantMemberService.Find:input_type -> v1.TenantMemberFindRequest
-	6,  // 11: v1.TenantMemberService.Create:output_type -> v1.TenantMemberResponse
-	6,  // 12: v1.TenantMemberService.Update:output_type -> v1.TenantMemberResponse
-	6,  // 13: v1.TenantMemberService.Delete:output_type -> v1.TenantMemberResponse
-	6,  // 14: v1.TenantMemberService.Get:output_type -> v1.TenantMemberResponse
-	7,  // 15: v1.TenantMemberService.Find:output_type -> v1.TenantMemberListResponse
+	return file_api_v1_tenant_member_proto_rawDescData
+}
+
+var file_api_v1_tenant_member_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
+var file_api_v1_tenant_member_proto_goTypes = []any{
+	(*TenantMember)(nil),              // 0: api.v1.TenantMember
+	(*TenantMemberCreateRequest)(nil), // 1: api.v1.TenantMemberCreateRequest
+	(*TenantMemberUpdateRequest)(nil), // 2: api.v1.TenantMemberUpdateRequest
+	(*TenantMemberDeleteRequest)(nil), // 3: api.v1.TenantMemberDeleteRequest
+	(*TenantMemberGetRequest)(nil),    // 4: api.v1.TenantMemberGetRequest
+	(*TenantMemberFindRequest)(nil),   // 5: api.v1.TenantMemberFindRequest
+	(*TenantMemberResponse)(nil),      // 6: api.v1.TenantMemberResponse
+	(*TenantMemberListResponse)(nil),  // 7: api.v1.TenantMemberListResponse
+	nil,                               // 8: api.v1.TenantMemberFindRequest.AnnotationsEntry
+	(*Meta)(nil),                      // 9: api.v1.Meta
+}
+var file_api_v1_tenant_member_proto_depIdxs = []int32{
+	9,  // 0: api.v1.TenantMember.meta:type_name -> api.v1.Meta
+	0,  // 1: api.v1.TenantMemberCreateRequest.tenant_member:type_name -> api.v1.TenantMember
+	0,  // 2: api.v1.TenantMemberUpdateRequest.tenant_member:type_name -> api.v1.TenantMember
+	8,  // 3: api.v1.TenantMemberFindRequest.annotations:type_name -> api.v1.TenantMemberFindRequest.AnnotationsEntry
+	0,  // 4: api.v1.TenantMemberResponse.tenant_member:type_name -> api.v1.TenantMember
+	0,  // 5: api.v1.TenantMemberListResponse.tenant_members:type_name -> api.v1.TenantMember
+	1,  // 6: api.v1.TenantMemberService.Create:input_type -> api.v1.TenantMemberCreateRequest
+	2,  // 7: api.v1.TenantMemberService.Update:input_type -> api.v1.TenantMemberUpdateRequest
+	3,  // 8: api.v1.TenantMemberService.Delete:input_type -> api.v1.TenantMemberDeleteRequest
+	4,  // 9: api.v1.TenantMemberService.Get:input_type -> api.v1.TenantMemberGetRequest
+	5,  // 10: api.v1.TenantMemberService.Find:input_type -> api.v1.TenantMemberFindRequest
+	6,  // 11: api.v1.TenantMemberService.Create:output_type -> api.v1.TenantMemberResponse
+	6,  // 12: api.v1.TenantMemberService.Update:output_type -> api.v1.TenantMemberResponse
+	6,  // 13: api.v1.TenantMemberService.Delete:output_type -> api.v1.TenantMemberResponse
+	6,  // 14: api.v1.TenantMemberService.Get:output_type -> api.v1.TenantMemberResponse
+	7,  // 15: api.v1.TenantMemberService.Find:output_type -> api.v1.TenantMemberListResponse
 	11, // [11:16] is the sub-list for method output_type
 	6,  // [6:11] is the sub-list for method input_type
 	6,  // [6:6] is the sub-list for extension type_name
@@ -516,28 +517,28 @@ var file_v1_tenant_member_proto_depIdxs = []int32{
 	0,  // [0:6] is the sub-list for field type_name
 }
 
-func init() { file_v1_tenant_member_proto_init() }
-func file_v1_tenant_member_proto_init() {
-	if File_v1_tenant_member_proto != nil {
+func init() { file_api_v1_tenant_member_proto_init() }
+func file_api_v1_tenant_member_proto_init() {
+	if File_api_v1_tenant_member_proto != nil {
 		return
 	}
-	file_v1_meta_proto_init()
-	file_v1_tenant_member_proto_msgTypes[5].OneofWrappers = []any{}
+	file_api_v1_meta_proto_init()
+	file_api_v1_tenant_member_proto_msgTypes[5].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_tenant_member_proto_rawDesc), len(file_v1_tenant_member_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_tenant_member_proto_rawDesc), len(file_api_v1_tenant_member_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_v1_tenant_member_proto_goTypes,
-		DependencyIndexes: file_v1_tenant_member_proto_depIdxs,
-		MessageInfos:      file_v1_tenant_member_proto_msgTypes,
+		GoTypes:           file_api_v1_tenant_member_proto_goTypes,
+		DependencyIndexes: file_api_v1_tenant_member_proto_depIdxs,
+		MessageInfos:      file_api_v1_tenant_member_proto_msgTypes,
 	}.Build()
-	File_v1_tenant_member_proto = out.File
-	file_v1_tenant_member_proto_goTypes = nil
-	file_v1_tenant_member_proto_depIdxs = nil
+	File_api_v1_tenant_member_proto = out.File
+	file_api_v1_tenant_member_proto_goTypes = nil
+	file_api_v1_tenant_member_proto_depIdxs = nil
 }
diff --git a/api/v1/tenant_member_grpc.pb.go b/api/v1/tenant_member_grpc.pb.go
deleted file mode 100644
index aab5df1..0000000
--- a/api/v1/tenant_member_grpc.pb.go
+++ /dev/null
@@ -1,271 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             (unknown)
-// source: v1/tenant_member.proto
-
-package v1
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	TenantMemberService_Create_FullMethodName = "/v1.TenantMemberService/Create"
-	TenantMemberService_Update_FullMethodName = "/v1.TenantMemberService/Update"
-	TenantMemberService_Delete_FullMethodName = "/v1.TenantMemberService/Delete"
-	TenantMemberService_Get_FullMethodName    = "/v1.TenantMemberService/Get"
-	TenantMemberService_Find_FullMethodName   = "/v1.TenantMemberService/Find"
-)
-
-// TenantMemberServiceClient is the client API for TenantMemberService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type TenantMemberServiceClient interface {
-	Create(ctx context.Context, in *TenantMemberCreateRequest, opts ...grpc.CallOption) (*TenantMemberResponse, error)
-	Update(ctx context.Context, in *TenantMemberUpdateRequest, opts ...grpc.CallOption) (*TenantMemberResponse, error)
-	Delete(ctx context.Context, in *TenantMemberDeleteRequest, opts ...grpc.CallOption) (*TenantMemberResponse, error)
-	Get(ctx context.Context, in *TenantMemberGetRequest, opts ...grpc.CallOption) (*TenantMemberResponse, error)
-	Find(ctx context.Context, in *TenantMemberFindRequest, opts ...grpc.CallOption) (*TenantMemberListResponse, error)
-}
-
-type tenantMemberServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewTenantMemberServiceClient(cc grpc.ClientConnInterface) TenantMemberServiceClient {
-	return &tenantMemberServiceClient{cc}
-}
-
-func (c *tenantMemberServiceClient) Create(ctx context.Context, in *TenantMemberCreateRequest, opts ...grpc.CallOption) (*TenantMemberResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantMemberResponse)
-	err := c.cc.Invoke(ctx, TenantMemberService_Create_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantMemberServiceClient) Update(ctx context.Context, in *TenantMemberUpdateRequest, opts ...grpc.CallOption) (*TenantMemberResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantMemberResponse)
-	err := c.cc.Invoke(ctx, TenantMemberService_Update_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantMemberServiceClient) Delete(ctx context.Context, in *TenantMemberDeleteRequest, opts ...grpc.CallOption) (*TenantMemberResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantMemberResponse)
-	err := c.cc.Invoke(ctx, TenantMemberService_Delete_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantMemberServiceClient) Get(ctx context.Context, in *TenantMemberGetRequest, opts ...grpc.CallOption) (*TenantMemberResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantMemberResponse)
-	err := c.cc.Invoke(ctx, TenantMemberService_Get_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *tenantMemberServiceClient) Find(ctx context.Context, in *TenantMemberFindRequest, opts ...grpc.CallOption) (*TenantMemberListResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(TenantMemberListResponse)
-	err := c.cc.Invoke(ctx, TenantMemberService_Find_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// TenantMemberServiceServer is the server API for TenantMemberService service.
-// All implementations should embed UnimplementedTenantMemberServiceServer
-// for forward compatibility.
-type TenantMemberServiceServer interface {
-	Create(context.Context, *TenantMemberCreateRequest) (*TenantMemberResponse, error)
-	Update(context.Context, *TenantMemberUpdateRequest) (*TenantMemberResponse, error)
-	Delete(context.Context, *TenantMemberDeleteRequest) (*TenantMemberResponse, error)
-	Get(context.Context, *TenantMemberGetRequest) (*TenantMemberResponse, error)
-	Find(context.Context, *TenantMemberFindRequest) (*TenantMemberListResponse, error)
-}
-
-// UnimplementedTenantMemberServiceServer should be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedTenantMemberServiceServer struct{}
-
-func (UnimplementedTenantMemberServiceServer) Create(context.Context, *TenantMemberCreateRequest) (*TenantMemberResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Create not implemented")
-}
-func (UnimplementedTenantMemberServiceServer) Update(context.Context, *TenantMemberUpdateRequest) (*TenantMemberResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Update not implemented")
-}
-func (UnimplementedTenantMemberServiceServer) Delete(context.Context, *TenantMemberDeleteRequest) (*TenantMemberResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented")
-}
-func (UnimplementedTenantMemberServiceServer) Get(context.Context, *TenantMemberGetRequest) (*TenantMemberResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Get not implemented")
-}
-func (UnimplementedTenantMemberServiceServer) Find(context.Context, *TenantMemberFindRequest) (*TenantMemberListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Find not implemented")
-}
-func (UnimplementedTenantMemberServiceServer) testEmbeddedByValue() {}
-
-// UnsafeTenantMemberServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to TenantMemberServiceServer will
-// result in compilation errors.
-type UnsafeTenantMemberServiceServer interface {
-	mustEmbedUnimplementedTenantMemberServiceServer()
-}
-
-func RegisterTenantMemberServiceServer(s grpc.ServiceRegistrar, srv TenantMemberServiceServer) {
-	// If the following call pancis, it indicates UnimplementedTenantMemberServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&TenantMemberService_ServiceDesc, srv)
-}
-
-func _TenantMemberService_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantMemberCreateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantMemberServiceServer).Create(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantMemberService_Create_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantMemberServiceServer).Create(ctx, req.(*TenantMemberCreateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantMemberService_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantMemberUpdateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantMemberServiceServer).Update(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantMemberService_Update_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantMemberServiceServer).Update(ctx, req.(*TenantMemberUpdateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantMemberService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantMemberDeleteRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantMemberServiceServer).Delete(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantMemberService_Delete_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantMemberServiceServer).Delete(ctx, req.(*TenantMemberDeleteRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantMemberService_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantMemberGetRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantMemberServiceServer).Get(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantMemberService_Get_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantMemberServiceServer).Get(ctx, req.(*TenantMemberGetRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TenantMemberService_Find_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TenantMemberFindRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TenantMemberServiceServer).Find(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TenantMemberService_Find_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TenantMemberServiceServer).Find(ctx, req.(*TenantMemberFindRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// TenantMemberService_ServiceDesc is the grpc.ServiceDesc for TenantMemberService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var TenantMemberService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "v1.TenantMemberService",
-	HandlerType: (*TenantMemberServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Create",
-			Handler:    _TenantMemberService_Create_Handler,
-		},
-		{
-			MethodName: "Update",
-			Handler:    _TenantMemberService_Update_Handler,
-		},
-		{
-			MethodName: "Delete",
-			Handler:    _TenantMemberService_Delete_Handler,
-		},
-		{
-			MethodName: "Get",
-			Handler:    _TenantMemberService_Get_Handler,
-		},
-		{
-			MethodName: "Find",
-			Handler:    _TenantMemberService_Find_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "v1/tenant_member.proto",
-}
diff --git a/api/v1/tenant_scnrvalr.go b/api/v1/tenant_scnrvalr.go
index b2b9b91..8692e82 100644
--- a/api/v1/tenant_scnrvalr.go
+++ b/api/v1/tenant_scnrvalr.go
@@ -2,7 +2,7 @@
 // DO NOT EDIT MANUALLY.
 // Regenerate with "go generate" or "make generate"
 
-package v1
+package apiv1
 
 import (
 	"database/sql/driver"
diff --git a/api/v1/tenantmember.go b/api/v1/tenantmember.go
index 715c2c1..bcfedc4 100644
--- a/api/v1/tenantmember.go
+++ b/api/v1/tenantmember.go
@@ -1,6 +1,6 @@
-package v1
+package apiv1
 
-//go:generate go run ../../pkg/gen/genscanvaluer.go -package v1 -type TenantMember
+//go:generate go run ../../pkg/gen/genscanvaluer.go -package apiv1 -type TenantMember
 
 func (m *TenantMember) NewTenantMemberResponse() *TenantMemberResponse {
 	return &TenantMemberResponse{
diff --git a/api/v1/tenantmember_scnrvalr.go b/api/v1/tenantmember_scnrvalr.go
index c0fdcd2..6bcf5c3 100644
--- a/api/v1/tenantmember_scnrvalr.go
+++ b/api/v1/tenantmember_scnrvalr.go
@@ -2,7 +2,7 @@
 // DO NOT EDIT MANUALLY.
 // Regenerate with "go generate" or "make generate"
 
-package v1
+package apiv1
 
 import (
 	"database/sql/driver"
diff --git a/api/v1/version.pb.go b/api/v1/version.pb.go
index 98debff..28de1cc 100644
--- a/api/v1/version.pb.go
+++ b/api/v1/version.pb.go
@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.8
+// 	protoc-gen-go v1.36.10
 // 	protoc        (unknown)
-// source: v1/version.proto
+// source: api/v1/version.proto
 
-package v1
+package apiv1
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -29,7 +29,7 @@ type GetVersionRequest struct {
 
 func (x *GetVersionRequest) Reset() {
 	*x = GetVersionRequest{}
-	mi := &file_v1_version_proto_msgTypes[0]
+	mi := &file_api_v1_version_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -41,7 +41,7 @@ func (x *GetVersionRequest) String() string {
 func (*GetVersionRequest) ProtoMessage() {}
 
 func (x *GetVersionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_version_proto_msgTypes[0]
+	mi := &file_api_v1_version_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -54,7 +54,7 @@ func (x *GetVersionRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetVersionRequest.ProtoReflect.Descriptor instead.
 func (*GetVersionRequest) Descriptor() ([]byte, []int) {
-	return file_v1_version_proto_rawDescGZIP(), []int{0}
+	return file_api_v1_version_proto_rawDescGZIP(), []int{0}
 }
 
 type GetVersionResponse struct {
@@ -69,7 +69,7 @@ type GetVersionResponse struct {
 
 func (x *GetVersionResponse) Reset() {
 	*x = GetVersionResponse{}
-	mi := &file_v1_version_proto_msgTypes[1]
+	mi := &file_api_v1_version_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -81,7 +81,7 @@ func (x *GetVersionResponse) String() string {
 func (*GetVersionResponse) ProtoMessage() {}
 
 func (x *GetVersionResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_v1_version_proto_msgTypes[1]
+	mi := &file_api_v1_version_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -94,7 +94,7 @@ func (x *GetVersionResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetVersionResponse.ProtoReflect.Descriptor instead.
 func (*GetVersionResponse) Descriptor() ([]byte, []int) {
-	return file_v1_version_proto_rawDescGZIP(), []int{1}
+	return file_api_v1_version_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *GetVersionResponse) GetVersion() string {
@@ -125,42 +125,43 @@ func (x *GetVersionResponse) GetBuildDate() string {
 	return ""
 }
 
-var File_v1_version_proto protoreflect.FileDescriptor
+var File_api_v1_version_proto protoreflect.FileDescriptor
 
-const file_v1_version_proto_rawDesc = "" +
+const file_api_v1_version_proto_rawDesc = "" +
 	"\n" +
-	"\x10v1/version.proto\x12\x02v1\"\x13\n" +
+	"\x14api/v1/version.proto\x12\x06api.v1\"\x13\n" +
 	"\x11GetVersionRequest\"\x84\x01\n" +
 	"\x12GetVersionResponse\x12\x18\n" +
 	"\aversion\x18\x01 \x01(\tR\aversion\x12\x1a\n" +
 	"\brevision\x18\x02 \x01(\tR\brevision\x12\x19\n" +
 	"\bgit_sha1\x18\x03 \x01(\tR\agitSha1\x12\x1d\n" +
 	"\n" +
-	"build_date\x18\x04 \x01(\tR\tbuildDate2F\n" +
-	"\x0eVersionService\x124\n" +
-	"\x03Get\x12\x15.v1.GetVersionRequest\x1a\x16.v1.GetVersionResponseBh\n" +
-	"\x06com.v1B\fVersionProtoP\x01Z(github.com/metal-stack/masterdata-api/v1\xa2\x02\x03VXX\xaa\x02\x02V1\xca\x02\x02V1\xe2\x02\x0eV1\\GPBMetadata\xea\x02\x02V1b\x06proto3"
+	"build_date\x18\x04 \x01(\tR\tbuildDate2N\n" +
+	"\x0eVersionService\x12<\n" +
+	"\x03Get\x12\x19.api.v1.GetVersionRequest\x1a\x1a.api.v1.GetVersionResponseB\x87\x01\n" +
+	"\n" +
+	"com.api.v1B\fVersionProtoP\x01Z2github.com/metal-stack/masterdata-api/api/v1;apiv1\xa2\x02\x03AXX\xaa\x02\x06Api.V1\xca\x02\x06Api\\V1\xe2\x02\x12Api\\V1\\GPBMetadata\xea\x02\aApi::V1b\x06proto3"
 
 var (
-	file_v1_version_proto_rawDescOnce sync.Once
-	file_v1_version_proto_rawDescData []byte
+	file_api_v1_version_proto_rawDescOnce sync.Once
+	file_api_v1_version_proto_rawDescData []byte
 )
 
-func file_v1_version_proto_rawDescGZIP() []byte {
-	file_v1_version_proto_rawDescOnce.Do(func() {
-		file_v1_version_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_v1_version_proto_rawDesc), len(file_v1_version_proto_rawDesc)))
+func file_api_v1_version_proto_rawDescGZIP() []byte {
+	file_api_v1_version_proto_rawDescOnce.Do(func() {
+		file_api_v1_version_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_api_v1_version_proto_rawDesc), len(file_api_v1_version_proto_rawDesc)))
 	})
-	return file_v1_version_proto_rawDescData
+	return file_api_v1_version_proto_rawDescData
 }
 
-var file_v1_version_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_v1_version_proto_goTypes = []any{
-	(*GetVersionRequest)(nil),  // 0: v1.GetVersionRequest
-	(*GetVersionResponse)(nil), // 1: v1.GetVersionResponse
+var file_api_v1_version_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_api_v1_version_proto_goTypes = []any{
+	(*GetVersionRequest)(nil),  // 0: api.v1.GetVersionRequest
+	(*GetVersionResponse)(nil), // 1: api.v1.GetVersionResponse
 }
-var file_v1_version_proto_depIdxs = []int32{
-	0, // 0: v1.VersionService.Get:input_type -> v1.GetVersionRequest
-	1, // 1: v1.VersionService.Get:output_type -> v1.GetVersionResponse
+var file_api_v1_version_proto_depIdxs = []int32{
+	0, // 0: api.v1.VersionService.Get:input_type -> api.v1.GetVersionRequest
+	1, // 1: api.v1.VersionService.Get:output_type -> api.v1.GetVersionResponse
 	1, // [1:2] is the sub-list for method output_type
 	0, // [0:1] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
@@ -168,26 +169,26 @@ var file_v1_version_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for field type_name
 }
 
-func init() { file_v1_version_proto_init() }
-func file_v1_version_proto_init() {
-	if File_v1_version_proto != nil {
+func init() { file_api_v1_version_proto_init() }
+func file_api_v1_version_proto_init() {
+	if File_api_v1_version_proto != nil {
 		return
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_version_proto_rawDesc), len(file_v1_version_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_v1_version_proto_rawDesc), len(file_api_v1_version_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_v1_version_proto_goTypes,
-		DependencyIndexes: file_v1_version_proto_depIdxs,
-		MessageInfos:      file_v1_version_proto_msgTypes,
+		GoTypes:           file_api_v1_version_proto_goTypes,
+		DependencyIndexes: file_api_v1_version_proto_depIdxs,
+		MessageInfos:      file_api_v1_version_proto_msgTypes,
 	}.Build()
-	File_v1_version_proto = out.File
-	file_v1_version_proto_goTypes = nil
-	file_v1_version_proto_depIdxs = nil
+	File_api_v1_version_proto = out.File
+	file_api_v1_version_proto_goTypes = nil
+	file_api_v1_version_proto_depIdxs = nil
 }
diff --git a/api/v1/version_grpc.pb.go b/api/v1/version_grpc.pb.go
deleted file mode 100644
index fbb372d..0000000
--- a/api/v1/version_grpc.pb.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             (unknown)
-// source: v1/version.proto
-
-package v1
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	VersionService_Get_FullMethodName = "/v1.VersionService/Get"
-)
-
-// VersionServiceClient is the client API for VersionService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type VersionServiceClient interface {
-	Get(ctx context.Context, in *GetVersionRequest, opts ...grpc.CallOption) (*GetVersionResponse, error)
-}
-
-type versionServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewVersionServiceClient(cc grpc.ClientConnInterface) VersionServiceClient {
-	return &versionServiceClient{cc}
-}
-
-func (c *versionServiceClient) Get(ctx context.Context, in *GetVersionRequest, opts ...grpc.CallOption) (*GetVersionResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(GetVersionResponse)
-	err := c.cc.Invoke(ctx, VersionService_Get_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// VersionServiceServer is the server API for VersionService service.
-// All implementations should embed UnimplementedVersionServiceServer
-// for forward compatibility.
-type VersionServiceServer interface {
-	Get(context.Context, *GetVersionRequest) (*GetVersionResponse, error)
-}
-
-// UnimplementedVersionServiceServer should be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedVersionServiceServer struct{}
-
-func (UnimplementedVersionServiceServer) Get(context.Context, *GetVersionRequest) (*GetVersionResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Get not implemented")
-}
-func (UnimplementedVersionServiceServer) testEmbeddedByValue() {}
-
-// UnsafeVersionServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to VersionServiceServer will
-// result in compilation errors.
-type UnsafeVersionServiceServer interface {
-	mustEmbedUnimplementedVersionServiceServer()
-}
-
-func RegisterVersionServiceServer(s grpc.ServiceRegistrar, srv VersionServiceServer) {
-	// If the following call pancis, it indicates UnimplementedVersionServiceServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&VersionService_ServiceDesc, srv)
-}
-
-func _VersionService_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetVersionRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(VersionServiceServer).Get(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: VersionService_Get_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VersionServiceServer).Get(ctx, req.(*GetVersionRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// VersionService_ServiceDesc is the grpc.ServiceDesc for VersionService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var VersionService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "v1.VersionService",
-	HandlerType: (*VersionServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Get",
-			Handler:    _VersionService_Get_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "v1/version.proto",
-}
diff --git a/certs/ca-config.json b/certs/ca-config.json
deleted file mode 100644
index 1f16e07..0000000
--- a/certs/ca-config.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "signing": {
-        "default": {
-            "expiry": "168h"
-        },
-        "profiles": {
-            "server": {
-                "expiry": "8760h",
-                "usages": [
-                    "signing",
-                    "key encipherment",
-                    "server auth"
-                ]
-            },
-            "client": {
-                "expiry": "8760h",
-                "usages": [
-                    "signing",
-                    "key encipherment",
-                    "client auth"
-                ]
-            },
-            "client-server": {
-                "expiry": "8760h",
-                "usages": [
-                    "signing",
-                    "key encipherment",
-                    "server auth",
-                    "client auth"
-                ]
-            }
-        }
-    }
-}
-
diff --git a/certs/ca-csr.json b/certs/ca-csr.json
deleted file mode 100644
index 1a3d24b..0000000
--- a/certs/ca-csr.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "CN": "ca",
-    "key": {
-        "algo": "ecdsa",
-        "size": 256
-    },
-    "names": [
-        {
-            "C": "DE",
-            "L": "Bavaria",
-            "ST": "Munich"
-        }
-    ]
-}
diff --git a/certs/ca-key.pem b/certs/ca-key.pem
deleted file mode 100644
index 606c54e..0000000
--- a/certs/ca-key.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIN4GTYJJuKRDR7ym1lmj4P3PuGAmA16iLd4C4vmDrHoJoAoGCCqGSM49
-AwEHoUQDQgAEpImXxsye/c/QpKwh13CYSr+UJd0/cfMX03JAdR3G/h2sXEF/T1XM
-YhgzxQLDiz7N4qaWf5lqQOMKMTxxNngagw==
------END EC PRIVATE KEY-----
diff --git a/certs/ca.csr b/certs/ca.csr
deleted file mode 100644
index 4b1c28c..0000000
--- a/certs/ca.csr
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIH4MIGfAgEAMD0xCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZNdW5pY2gxEDAOBgNV
-BAcTB0JhdmFyaWExCzAJBgNVBAMTAmNhMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEpImXxsye/c/QpKwh13CYSr+UJd0/cfMX03JAdR3G/h2sXEF/T1XMYhgzxQLD
-iz7N4qaWf5lqQOMKMTxxNngag6AAMAoGCCqGSM49BAMCA0gAMEUCIQDIAbbXiJkF
-mTiIkUBfzrx1YcfynMYyi1U0RBOPNq4orQIgUd6CJ59Rw+vmqvvoXrn90KGKwaCE
-/fEtyUF0bza7Jio=
------END CERTIFICATE REQUEST-----
diff --git a/certs/ca.pem b/certs/ca.pem
deleted file mode 100644
index 83cd3ba..0000000
--- a/certs/ca.pem
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB4zCCAYigAwIBAgIUFxYna1ghzd++P9ZPECkZ2fA3+aYwCgYIKoZIzj0EAwIw
-PTELMAkGA1UEBhMCREUxDzANBgNVBAgTBk11bmljaDEQMA4GA1UEBxMHQmF2YXJp
-YTELMAkGA1UEAxMCY2EwHhcNMjQwMjA2MTY0NTAwWhcNMjkwMjA0MTY0NTAwWjA9
-MQswCQYDVQQGEwJERTEPMA0GA1UECBMGTXVuaWNoMRAwDgYDVQQHEwdCYXZhcmlh
-MQswCQYDVQQDEwJjYTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKSJl8bMnv3P
-0KSsIddwmEq/lCXdP3HzF9NyQHUdxv4drFxBf09VzGIYM8UCw4s+zeKmln+ZakDj
-CjE8cTZ4GoOjZjBkMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEC
-MB0GA1UdDgQWBBQAwjY+rgS3RJdYDU5Sqdwf2ik4ezAfBgNVHSMEGDAWgBQAwjY+
-rgS3RJdYDU5Sqdwf2ik4ezAKBggqhkjOPQQDAgNJADBGAiEA827cGYKaSgHwbMaC
-kbyNKtDUaeQV8U5I6/KBxim5iHgCIQD2LlFilUlAiIwUq6cEkdqotH/q99DooXsP
-wOPXlugYLA==
------END CERTIFICATE-----
diff --git a/certs/client-key.pem b/certs/client-key.pem
deleted file mode 100644
index 0a67f62..0000000
--- a/certs/client-key.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDUzDpGw7ageDgXKRX0Ek7c7+Xu4Wd50iD92yETMtgSyoAoGCCqGSM49
-AwEHoUQDQgAE+KuGno/NozQpZ9wAUOYg3aFvTSgMBlT0X5/1M/b2SegP3eSvNdxU
-+BeBaaLeD3azVZKJtqevrtrFg1Vu0g0jdw==
------END EC PRIVATE KEY-----
diff --git a/certs/client.csr b/certs/client.csr
deleted file mode 100644
index 360e86d..0000000
--- a/certs/client.csr
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIBGzCBwQIBADBBMQswCQYDVQQGEwJERTEPMA0GA1UECBMGTXVuaWNoMRAwDgYD
-VQQHEwdCYXZhcmlhMQ8wDQYDVQQDEwZjbGllbnQwWTATBgcqhkjOPQIBBggqhkjO
-PQMBBwNCAAT4q4aej82jNCln3ABQ5iDdoW9NKAwGVPRfn/Uz9vZJ6A/d5K813FT4
-F4Fpot4PdrNVkom2p6+u2sWDVW7SDSN3oB4wHAYJKoZIhvcNAQkOMQ8wDTALBgNV
-HREEBDACggAwCgYIKoZIzj0EAwIDSQAwRgIhAOafckME3cqXCeXeycWtP9yHBhSD
-+xBvFSXgP8JYq4HjAiEA/NWlCfsDOuS7RzZahgdyfBavd0ylRHAHZzkW6ieMLzM=
------END CERTIFICATE REQUEST-----
diff --git a/certs/client.json b/certs/client.json
deleted file mode 100644
index 109675d..0000000
--- a/certs/client.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "CN": "client",
-  "hosts": [""],
-  "key": {
-    "algo": "ecdsa",
-    "size": 256
-  },
-  "names": [
-    {
-      "C": "DE",
-      "L": "Bavaria",
-      "ST": "Munich"
-    }
-  ]
-}
diff --git a/certs/client.pem b/certs/client.pem
deleted file mode 100644
index c496def..0000000
--- a/certs/client.pem
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICAzCCAaqgAwIBAgIUDL5gilHcBInoZnkwupRpN57gMGYwCgYIKoZIzj0EAwIw
-PTELMAkGA1UEBhMCREUxDzANBgNVBAgTBk11bmljaDEQMA4GA1UEBxMHQmF2YXJp
-YTELMAkGA1UEAxMCY2EwHhcNMjQwMjA2MTY0NTAwWhcNMjUwMjA1MTY0NTAwWjBB
-MQswCQYDVQQGEwJERTEPMA0GA1UECBMGTXVuaWNoMRAwDgYDVQQHEwdCYXZhcmlh
-MQ8wDQYDVQQDEwZjbGllbnQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT4q4ae
-j82jNCln3ABQ5iDdoW9NKAwGVPRfn/Uz9vZJ6A/d5K813FT4F4Fpot4PdrNVkom2
-p6+u2sWDVW7SDSN3o4GDMIGAMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr
-BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQMvyMgGCimPRenGUGDMeRp
-lSWd3DAfBgNVHSMEGDAWgBQAwjY+rgS3RJdYDU5Sqdwf2ik4ezALBgNVHREEBDAC
-ggAwCgYIKoZIzj0EAwIDRwAwRAIgCtIjs1kyDCxigwhO2ZhocT8TOLOMVYvTg7nQ
-aUt7EJkCIHzA/BnmqjVCU2z4vnugZqw0GvRSaOsOHk3W8Msb5Le2
------END CERTIFICATE-----
diff --git a/certs/server-key.pem b/certs/server-key.pem
deleted file mode 100644
index 752c7f2..0000000
--- a/certs/server-key.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEILDuGCZl7sZhA2WSr0ul02ODmWrtB1nlr6KZiem/R86/oAoGCCqGSM49
-AwEHoUQDQgAEdpTkKTd3R7KHsRYeL9fTnNdiuNoEsbHxZnWcpvhqnqO5VdFu3swK
-W10Ymjbnj5j+6P/ISwYiKrmiFnZSf229NQ==
------END EC PRIVATE KEY-----
diff --git a/certs/server.csr b/certs/server.csr
deleted file mode 100644
index 1239753..0000000
--- a/certs/server.csr
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIBJjCBzQIBADBEMQswCQYDVQQGEwJERTEPMA0GA1UECBMGTXVuaWNoMRAwDgYD
-VQQHEwdCYXZhcmlhMRIwEAYDVQQDEwlsb2NhbGhvc3QwWTATBgcqhkjOPQIBBggq
-hkjOPQMBBwNCAAR2lOQpN3dHsoexFh4v19Oc12K42gSxsfFmdZym+Gqeo7lV0W7e
-zApbXRiaNuePmP7o/8hLBiIquaIWdlJ/bb01oCcwJQYJKoZIhvcNAQkOMRgwFjAU
-BgNVHREEDTALgglsb2NhbGhvc3QwCgYIKoZIzj0EAwIDSAAwRQIhAOmgCL0E5Xj8
-ULhUf4wuIcBC1k5aXs2wynhQUtKYR5rCAiAmu3WC+re4K1vPJJwxgjjwiJr5yF9L
-j0oolWilNYcE0w==
------END CERTIFICATE REQUEST-----
diff --git a/certs/server.json b/certs/server.json
deleted file mode 100644
index 5acf3f3..0000000
--- a/certs/server.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "CN": "localhost",
-  "hosts": [
-    "localhost"
-  ],
-  "key": {
-    "algo": "ecdsa",
-    "size": 256
-  },
-  "names": [
-    {
-      "C": "DE",
-      "L": "Bavaria",
-      "ST": "Munich"
-    }
-  ]
-}
diff --git a/certs/server.pem b/certs/server.pem
deleted file mode 100644
index 4b97cf1..0000000
--- a/certs/server.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICGjCCAcCgAwIBAgIUWa6tjanLPx+KTcj2UM9i7wA5x+swCgYIKoZIzj0EAwIw
-PTELMAkGA1UEBhMCREUxDzANBgNVBAgTBk11bmljaDEQMA4GA1UEBxMHQmF2YXJp
-YTELMAkGA1UEAxMCY2EwHhcNMjQwMjA2MTY0NTAwWhcNMjUwMjA1MTY0NTAwWjBE
-MQswCQYDVQQGEwJERTEPMA0GA1UECBMGTXVuaWNoMRAwDgYDVQQHEwdCYXZhcmlh
-MRIwEAYDVQQDEwlsb2NhbGhvc3QwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR2
-lOQpN3dHsoexFh4v19Oc12K42gSxsfFmdZym+Gqeo7lV0W7ezApbXRiaNuePmP7o
-/8hLBiIquaIWdlJ/bb01o4GWMIGTMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUKzNk
-/EcAupZIADSZfI+z8XJ4W98wHwYDVR0jBBgwFoAUAMI2Pq4Et0SXWA1OUqncH9op
-OHswFAYDVR0RBA0wC4IJbG9jYWxob3N0MAoGCCqGSM49BAMCA0gAMEUCIQCmmjM3
-z4v8btONqV+jZQjIIwOpez6vrsAJit67oKGAVQIgc+innrlfZiIISlFaWF1SBrwK
-xEishfdnkuXkBA+YgVM=
------END CERTIFICATE-----
diff --git a/client/main.go b/client/main.go
index b7cd5bb..afc4128 100644
--- a/client/main.go
+++ b/client/main.go
@@ -10,8 +10,6 @@ import (
 	"github.com/metal-stack/metal-lib/pkg/pointer"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"github.com/metal-stack/masterdata-api/pkg/auth"
-
 	v1 "github.com/metal-stack/masterdata-api/api/v1"
 	"github.com/metal-stack/masterdata-api/pkg/client"
 )
@@ -24,35 +22,13 @@ func main() {
 	logger := slog.New(jsonHandler)
 	logger.Info("Starting Client")
 
-	hmacKey := os.Getenv("HMAC_KEY")
-	if hmacKey == "" {
-		hmacKey = auth.HmacDefaultKey
-	}
-
-	c, err := client.NewClient(&client.Config{
-		Logger:    logger,
-		Hostname:  "localhost",
-		Port:      50051,
-		CertFile:  "certs/client.pem",
-		KeyFile:   "certs/client-key.pem",
-		CaFile:    "certs/ca.pem",
-		Insecure:  true,
-		HmacKey:   hmacKey,
-		Namespace: "test",
+	c := client.New(&client.Config{
+		BaseURL:   "http://localhost:9090",
+		Debug:     true,
+		UserAgent: "sample-client",
 	})
-	if err != nil {
-		logger.Error(err.Error())
-		panic(err)
-	}
 
-	defer func() {
-		err = c.Close()
-		if err != nil {
-			logger.Error(err.Error())
-			panic(err)
-		}
-	}()
-	err = projectExample(c, logger)
+	err := projectExample(c, logger)
 	if err != nil {
 		logger.Error(err.Error())
 	}
diff --git a/cmd/server/main.go b/cmd/server/main.go
new file mode 100644
index 0000000..51f8794
--- /dev/null
+++ b/cmd/server/main.go
@@ -0,0 +1,142 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"log/slog"
+	"os"
+
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+	"github.com/metal-stack/masterdata-api/pkg/datastore"
+	"github.com/metal-stack/v"
+	cli "github.com/urfave/cli/v2"
+)
+
+func main() {
+
+	app := &cli.App{
+		Name:    "masterdata server",
+		Usage:   "grpc server for masterdata",
+		Version: v.V.String(),
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "grpc-server-endpoint",
+				Value:   ":9090",
+				Usage:   "gRPC server endpoint",
+				EnvVars: []string{"MASTERDATA_GRPC_SERVER_ENDPOINT"},
+			},
+			&cli.StringFlag{
+				Name:    "metrics-endpoint",
+				Value:   ":2112",
+				Usage:   "metrics endpoint",
+				EnvVars: []string{"MASTERDATA_METRICS_ENDPOINT"},
+			},
+			&cli.StringFlag{
+				Name:    "log-level",
+				Value:   "info",
+				Usage:   "log-level can be one of error|warn|info|debug",
+				EnvVars: []string{"MASTERDATA_LOG_LEVEL"},
+			},
+		},
+		Commands: []*cli.Command{
+			{
+				Name:    "postgres",
+				Aliases: []string{"pg"},
+				Usage:   "start with postgres backend",
+				Flags: []cli.Flag{
+					&cli.StringFlag{
+						Name:    "host",
+						Value:   "localhost",
+						Usage:   "postgres db hostname",
+						EnvVars: []string{"MASTERDATA_PG_HOST"},
+					},
+					&cli.StringFlag{
+						Name:    "port",
+						Value:   "5432",
+						Usage:   "postgres db port",
+						EnvVars: []string{"MASTERDATA_PG_PORT"},
+					},
+					&cli.StringFlag{
+						Name:    "user",
+						Value:   "masterdata",
+						Usage:   "postgres db user",
+						EnvVars: []string{"MASTERDATA_PG_USER"},
+					},
+					&cli.StringFlag{
+						Name:    "password",
+						Value:   "password",
+						Usage:   "postgres db password",
+						EnvVars: []string{"MASTERDATA_PG_PASSWORD"},
+					},
+					&cli.StringFlag{
+						Name:    "dbname",
+						Value:   "masterdata",
+						Usage:   "postgres db name",
+						EnvVars: []string{"MASTERDATA_PG_DBNAME"},
+					},
+					&cli.StringFlag{
+						Name:    "sslmode",
+						Value:   "disable",
+						Usage:   "postgres sslmode, possible values: disable|require|verify-ca|verify-full",
+						EnvVars: []string{"MASTERDATA_PG_SSLMODE"},
+					},
+				},
+				Action: func(ctx *cli.Context) error {
+					c := getConfig(ctx)
+					host := ctx.String("host")
+					port := ctx.String("port")
+					user := ctx.String("user")
+					password := ctx.String("password")
+					dbname := ctx.String("dbname")
+					sslmode := ctx.String("sslmode")
+
+					ves := []datastore.Entity{
+						&apiv1.Project{},
+						&apiv1.ProjectMember{},
+						&apiv1.Tenant{},
+						&apiv1.TenantMember{},
+					}
+
+					db, err := datastore.NewPostgresDB(c.Log, host, port, user, password, dbname, sslmode, ves...)
+					if err != nil {
+						return fmt.Errorf("failed to create postgres connection: %w", err)
+					}
+					ps := datastore.New(c.Log, db, &apiv1.Project{})
+					pms := datastore.New(c.Log, db, &apiv1.ProjectMember{})
+					ts := datastore.New(c.Log, db, &apiv1.Tenant{})
+					tms := datastore.New(c.Log, db, &apiv1.TenantMember{})
+					c.ProjectDataStore = ps
+					c.ProjectMemberDataStore = pms
+					c.TenantDataStore = ts
+					c.TenantMemberDataStore = tms
+					c.DB = db
+					s := newServer(c)
+					return s.Run()
+				},
+			},
+		},
+	}
+
+	err := app.Run(os.Args)
+	if err != nil {
+		log.Fatalf("unable to start masterdata service: %v", err)
+	}
+}
+
+func getConfig(ctx *cli.Context) config {
+	opts := &slog.HandlerOptions{
+		Level: slog.LevelInfo,
+	}
+	switch ctx.String("log-level") {
+	case "debug":
+		opts.Level = slog.LevelDebug
+	case "error":
+		opts.Level = slog.LevelError
+	}
+
+	return config{
+		GrpcServerEndpoint: ctx.String("grpc-server-endpoint"),
+		MetricsEndpoint:    ctx.String("metrics-endpoint"),
+		Log:                slog.New(slog.NewJSONHandler(os.Stdout, opts)),
+	}
+}
diff --git a/cmd/server/server.go b/cmd/server/server.go
new file mode 100644
index 0000000..74403d4
--- /dev/null
+++ b/cmd/server/server.go
@@ -0,0 +1,181 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"log/slog"
+	"net/http"
+	_ "net/http/pprof" // nolint:gosec
+	"time"
+
+	"github.com/jmoiron/sqlx"
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	apiv1connect "github.com/metal-stack/masterdata-api/api/v1/apiv1connect"
+	"github.com/metal-stack/masterdata-api/pkg/datastore"
+	"github.com/metal-stack/masterdata-api/pkg/service"
+
+	"github.com/metal-stack/v"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"go.opentelemetry.io/otel/exporters/prometheus"
+	"go.opentelemetry.io/otel/sdk/metric"
+
+	"connectrpc.com/connect"
+	"connectrpc.com/grpcreflect"
+	"connectrpc.com/otelconnect"
+
+	"connectrpc.com/grpchealth"
+
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/h2c"
+)
+
+type config struct {
+	GrpcServerEndpoint     string
+	MetricsEndpoint        string
+	Log                    *slog.Logger
+	ProjectDataStore       datastore.Storage[*apiv1.Project]
+	ProjectMemberDataStore datastore.Storage[*apiv1.ProjectMember]
+	TenantDataStore        datastore.Storage[*apiv1.Tenant]
+	TenantMemberDataStore  datastore.Storage[*apiv1.TenantMember]
+	DB                     *sqlx.DB
+}
+type server struct {
+	c config
+
+	projectDataStore       datastore.Storage[*apiv1.Project]
+	projectMemberDataStore datastore.Storage[*apiv1.ProjectMember]
+	tenantDataStore        datastore.Storage[*apiv1.Tenant]
+	tenantMemberDataStore  datastore.Storage[*apiv1.TenantMember]
+}
+
+func newServer(c config) *server {
+	return &server{
+		c:                      c,
+		projectDataStore:       c.ProjectDataStore,
+		projectMemberDataStore: c.ProjectMemberDataStore,
+		tenantDataStore:        c.TenantDataStore,
+		tenantMemberDataStore:  c.TenantMemberDataStore,
+	}
+}
+func (s *server) Run() error {
+	s.c.Log.Info("starting masterdata-api", "version", v.V.String())
+
+	// The exporter embeds a default OpenTelemetry Reader and
+	// implements prometheus.Collector, allowing it to be used as
+	// both a Reader and Collector.
+	exporter, err := prometheus.New()
+	if err != nil {
+		return err
+	}
+	provider := metric.NewMeterProvider(metric.WithReader(exporter))
+
+	// Start the prometheus HTTP server and pass the exporter Collector to it
+	go func() {
+		s.c.Log.Info("serving metrics", "at", fmt.Sprintf("%s/metrics", s.c.MetricsEndpoint))
+		metricsServer := http.NewServeMux()
+		metricsServer.Handle("/metrics", promhttp.Handler())
+		ms := &http.Server{
+			Addr:              s.c.MetricsEndpoint,
+			Handler:           metricsServer,
+			ReadHeaderTimeout: time.Minute,
+		}
+		err := ms.ListenAndServe()
+		if err != nil {
+			s.c.Log.Error("unable to start metric endpoint", "error", err)
+			return
+		}
+	}()
+	go func() {
+		s.c.Log.Info("starting pprof endpoint of :2113")
+		// inspect via
+		// go tool pprof -http :8080 localhost:2113/debug/pprof/heap
+		// go tool pprof -http :8080 localhost:2113/debug/pprof/goroutine
+		server := http.Server{
+			Addr:              ":2113",
+			ReadHeaderTimeout: 1 * time.Minute,
+		}
+		err := server.ListenAndServe()
+		if err != nil {
+			s.c.Log.Error("failed to start pprof endpoint", "error", err)
+			return
+		}
+	}()
+
+	otelInterceptor, err := otelconnect.NewInterceptor(otelconnect.WithMeterProvider(provider))
+	if err != nil {
+		return err
+	}
+
+	loggingInterceptor := newLoggingInterceptor(s.c.Log)
+
+	projectService := service.NewProjectService(s.c.Log, s.c.ProjectDataStore, s.c.ProjectMemberDataStore, s.c.TenantDataStore)
+	projectMemberService := service.NewProjectMemberService(s.c.Log, s.c.ProjectDataStore, s.c.ProjectMemberDataStore, s.c.TenantDataStore)
+	// FIXME db should not be required here
+	tenantService := service.NewTenantService(s.c.DB, s.c.Log, s.c.TenantDataStore, s.c.TenantMemberDataStore)
+	tenantMemberService := service.NewTenantMemberService(s.c.Log, s.c.TenantDataStore, s.c.TenantMemberDataStore)
+	versionService := service.NewVersionService()
+
+	// healthv1.RegisterHealthServer(grpcServer, healthServer)
+	interceptors := connect.WithInterceptors(loggingInterceptor, otelInterceptor)
+
+	mux := http.NewServeMux()
+	mux.Handle(apiv1connect.NewProjectServiceHandler(projectService, interceptors))
+	mux.Handle(apiv1connect.NewProjectMemberServiceHandler(projectMemberService, interceptors))
+	mux.Handle(apiv1connect.NewTenantServiceHandler(tenantService, interceptors))
+	mux.Handle(apiv1connect.NewTenantMemberServiceHandler(tenantMemberService, interceptors))
+	mux.Handle(apiv1connect.NewVersionServiceHandler(versionService, interceptors))
+
+	allServiceNames := []string{
+		apiv1connect.ProjectServiceName,
+		apiv1connect.ProjectMemberServiceName,
+		apiv1connect.TenantServiceName,
+		apiv1connect.TenantMemberServiceName,
+		apiv1connect.VersionServiceName,
+	}
+
+	checker := grpchealth.NewStaticChecker(allServiceNames...)
+	mux.Handle(grpchealth.NewHandler(checker))
+
+	// enable remote service listing by enabling reflection
+	reflector := grpcreflect.NewStaticReflector(allServiceNames...)
+	mux.Handle(grpcreflect.NewHandlerV1(reflector))
+	mux.Handle(grpcreflect.NewHandlerV1Alpha(reflector))
+
+	server := http.Server{
+		Addr: s.c.GrpcServerEndpoint,
+		// For gRPC clients, it's convenient to support HTTP/2 without TLS. You can
+		// avoid x/net/http2 by using http.ListenAndServeTLS.
+		Handler:           h2c.NewHandler(mux, &http2.Server{}),
+		ReadHeaderTimeout: 1 * time.Minute,
+	}
+
+	s.c.Log.Info("started grpc server", "at", server.Addr)
+	err = server.ListenAndServe()
+	return err
+}
+
+func newLoggingInterceptor(log *slog.Logger) connect.UnaryInterceptorFunc {
+	interceptor := func(next connect.UnaryFunc) connect.UnaryFunc {
+		return connect.UnaryFunc(func(ctx context.Context, req connect.AnyRequest) (connect.AnyResponse, error) {
+			var (
+				procedure = req.Spec().Procedure
+				request   = req.Any()
+			)
+			if procedure == apiv1connect.VersionServiceGetProcedure {
+				return next(ctx, req)
+			}
+			log.Debug("call", "proc", procedure, "req", request)
+
+			response, err := next(ctx, req)
+			if err != nil {
+				log.Error("call", "proc", procedure, "error", err)
+			} else {
+				log.Debug("call", "proc", procedure, "req", request, "resp", response.Any())
+			}
+
+			return response, err
+		})
+	}
+	return connect.UnaryInterceptorFunc(interceptor)
+}
diff --git a/deploy/masterdata-api.yaml b/deploy/masterdata-api.yaml
index abef8a8..4f52353 100644
--- a/deploy/masterdata-api.yaml
+++ b/deploy/masterdata-api.yaml
@@ -170,7 +170,9 @@ spec:
     spec:
       containers:
       - name: masterdata-db
-        image: postgres:17-alpine
+        image: postgres:18-alpine
+        command: 
+          - postgres
         env:
         - name: POSTGRES_PASSWORD
           value: password
@@ -179,6 +181,9 @@ spec:
         - name: POSTGRES_DB
           value: masterdata
         resources:
+          requests:
+            memory: "128Mi"
+            cpu: "500m"
           limits:
             memory: "128Mi"
             cpu: "500m"
diff --git a/go.mod b/go.mod
index 7bc5fdf..9d0370e 100644
--- a/go.mod
+++ b/go.mod
@@ -3,29 +3,31 @@ module github.com/metal-stack/masterdata-api
 go 1.25
 
 require (
+	connectrpc.com/connect v1.19.1
+	connectrpc.com/grpchealth v1.4.0
+	connectrpc.com/grpcreflect v1.3.0
+	connectrpc.com/otelconnect v0.8.0
 	github.com/Masterminds/squirrel v1.5.4
 	github.com/google/go-cmp v0.7.0
 	github.com/google/uuid v1.6.0
-	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0
-	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/json-iterator/go v1.1.12
+	github.com/klauspost/connect-compress/v2 v2.0.0
 	github.com/lib/pq v1.10.9
 	github.com/lopezator/migrator v0.3.1
-	github.com/metal-stack/metal-lib v0.23.4
-	github.com/metal-stack/security v0.9.4
+	github.com/metal-stack/metal-lib v0.23.5
 	github.com/metal-stack/v v1.0.3
-	github.com/prometheus/client_golang v1.23.0
-	github.com/spf13/cobra v1.9.1
-	github.com/spf13/viper v1.20.1
+	github.com/prometheus/client_golang v1.23.2
 	github.com/stretchr/testify v1.11.1
-	github.com/testcontainers/testcontainers-go v0.38.0
-	github.com/testcontainers/testcontainers-go/modules/postgres v0.38.0
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
-	go.opentelemetry.io/otel/trace v1.38.0
-	google.golang.org/grpc v1.75.0
-	google.golang.org/protobuf v1.36.8
-	sigs.k8s.io/yaml v1.5.0
+	github.com/testcontainers/testcontainers-go v0.39.0
+	github.com/testcontainers/testcontainers-go/modules/postgres v0.39.0
+	github.com/urfave/cli/v2 v2.27.7
+	go.opentelemetry.io/otel/exporters/prometheus v0.60.0
+	go.opentelemetry.io/otel/sdk/metric v1.38.0
+	golang.org/x/net v0.46.0
+	google.golang.org/grpc v1.76.0
+	google.golang.org/protobuf v1.36.10
+	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
@@ -40,57 +42,26 @@ require (
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/coreos/go-oidc/v3 v3.15.0 // indirect
 	github.com/cpuguy83/dockercfg v0.3.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v28.3.3+incompatible // indirect
+	github.com/docker/docker v28.5.1+incompatible // indirect
 	github.com/docker/go-connections v0.6.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/ebitengine/purego v0.8.4 // indirect
+	github.com/ebitengine/purego v0.9.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/go-jose/go-jose/v4 v4.1.2 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/go-openapi/errors v0.22.2 // indirect
-	github.com/go-openapi/runtime v0.28.0 // indirect
-	github.com/go-openapi/strfmt v0.23.0 // indirect
-	github.com/go-openapi/swag v0.24.1 // indirect
-	github.com/go-openapi/swag/cmdutils v0.24.0 // indirect
-	github.com/go-openapi/swag/conv v0.24.0 // indirect
-	github.com/go-openapi/swag/fileutils v0.24.0 // indirect
-	github.com/go-openapi/swag/jsonname v0.24.0 // indirect
-	github.com/go-openapi/swag/jsonutils v0.24.0 // indirect
-	github.com/go-openapi/swag/loading v0.24.0 // indirect
-	github.com/go-openapi/swag/mangling v0.24.0 // indirect
-	github.com/go-openapi/swag/netutils v0.24.0 // indirect
-	github.com/go-openapi/swag/stringutils v0.24.0 // indirect
-	github.com/go-openapi/swag/typeutils v0.24.0 // indirect
-	github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
+	github.com/go-openapi/errors v0.22.3 // indirect
+	github.com/go-openapi/strfmt v0.24.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
-	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.4 // indirect
-	github.com/lestrrat-go/httpcc v1.0.1 // indirect
-	github.com/lestrrat-go/httprc v1.0.6 // indirect
-	github.com/lestrrat-go/iter v1.0.2 // indirect
-	github.com/lestrrat-go/jwx/v2 v2.1.6 // indirect
-	github.com/lestrrat-go/option v1.0.1 // indirect
-	github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54 // indirect
+	github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect
 	github.com/magiconair/properties v1.8.10 // indirect
-	github.com/mailru/easyjson v0.9.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/go-archive v0.1.0 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
@@ -105,41 +76,35 @@ require (
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.65.0 // indirect
+	github.com/prometheus/common v0.67.1 // indirect
+	github.com/prometheus/otlptranslator v1.0.0 // indirect
 	github.com/prometheus/procfs v0.17.0 // indirect
-	github.com/sagikazarmark/locafero v0.10.0 // indirect
-	github.com/segmentio/asm v1.2.0 // indirect
-	github.com/shirou/gopsutil/v4 v4.25.8 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/shirou/gopsutil/v4 v4.25.9 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
-	github.com/spf13/afero v1.14.0 // indirect
-	github.com/spf13/cast v1.9.2 // indirect
-	github.com/spf13/pflag v1.0.7 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/stretchr/objx v0.5.3 // indirect
 	github.com/tklauser/go-sysconf v0.3.15 // indirect
 	github.com/tklauser/numcpus v0.10.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.mongodb.org/mongo-driver v1.17.4 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
 	go.opentelemetry.io/otel v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
-	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/text v0.28.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
+	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index e995a6d..3f90b8a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,11 @@
-cloud.google.com/go/compute/metadata v0.7.0 h1:PBWF+iiAerVNe8UCHxdOt6eHLVc3ydFeOCw78U8ytSU=
-cloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo=
+connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14=
+connectrpc.com/connect v1.19.1/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=
+connectrpc.com/grpchealth v1.4.0 h1:MJC96JLelARPgZTiRF9KRfY/2N9OcoQvF2EWX07v2IE=
+connectrpc.com/grpchealth v1.4.0/go.mod h1:WhW6m1EzTmq3Ky1FE8EfkIpSDc6TfUx2M2KqZO3ts/Q=
+connectrpc.com/grpcreflect v1.3.0 h1:Y4V+ACf8/vOb1XOc251Qun7jMB75gCUNw6llvB9csXc=
+connectrpc.com/grpcreflect v1.3.0/go.mod h1:nfloOtCS8VUQOQ1+GTdFzVg2CJo4ZGaat8JIovCtDYs=
+connectrpc.com/otelconnect v0.8.0 h1:a4qrN4H8aEE2jAoCxheZYYfEjXMgVPyL9OzPQLBEFXU=
+connectrpc.com/otelconnect v0.8.0/go.mod h1:AEkVLjCPXra+ObGFCOClcJkNjS7zPaQSqvO0lCyjfZc=
 dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
 dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
@@ -30,37 +36,28 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
 github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
-github.com/coreos/go-oidc/v3 v3.15.0 h1:R6Oz8Z4bqWR7VFQ+sPSvZPQv4x8M+sJkDO5ojgwlyAg=
-github.com/coreos/go-oidc/v3 v3.15.0/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
 github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA=
 github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
-github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
+github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
-github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.5.1+incompatible h1:Bm8DchhSD2J6PsFzxC35TZo4TLGR2PdW/E69rU45NhM=
+github.com/docker/docker v28.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
 github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
-github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.9.0 h1:mh0zpKBIXDceC63hpvPuGLiJ8ZAa3DfrFTudmfi8A4k=
+github.com/ebitengine/purego v0.9.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/go-jose/go-jose/v4 v4.1.2 h1:TK/7NqRQZfgAh+Td8AlsrvtPoUyiHh0LqVvokh+1vHI=
-github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -69,58 +66,14 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU=
-github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo=
-github.com/go-openapi/errors v0.22.2 h1:rdxhzcBUazEcGccKqbY1Y7NS8FDcMyIRr0934jrYnZg=
-github.com/go-openapi/errors v0.22.2/go.mod h1:+n/5UdIqdVnLIJ6Q9Se8HNGUXYaY6CN8ImWzfi/Gzp0=
-github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
-github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
-github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
-github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
-github.com/go-openapi/loads v0.22.0 h1:ECPGd4jX1U6NApCGG1We+uEozOAvXvJSF4nnwHZ8Aco=
-github.com/go-openapi/loads v0.22.0/go.mod h1:yLsaTCS92mnSAZX5WWoxszLj0u+Ojl+Zs5Stn1oF+rs=
-github.com/go-openapi/runtime v0.28.0 h1:gpPPmWSNGo214l6n8hzdXYhPuJcGtziTOgUpvsFWGIQ=
-github.com/go-openapi/runtime v0.28.0/go.mod h1:QN7OzcS+XuYmkQLw05akXk0jRH/eZ3kb18+1KwW9gyc=
-github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
-github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
-github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c=
-github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4=
-github.com/go-openapi/swag v0.24.1 h1:DPdYTZKo6AQCRqzwr/kGkxJzHhpKxZ9i/oX0zag+MF8=
-github.com/go-openapi/swag v0.24.1/go.mod h1:sm8I3lCPlspsBBwUm1t5oZeWZS0s7m/A+Psg0ooRU0A=
-github.com/go-openapi/swag/cmdutils v0.24.0 h1:KlRCffHwXFI6E5MV9n8o8zBRElpY4uK4yWyAMWETo9I=
-github.com/go-openapi/swag/cmdutils v0.24.0/go.mod h1:uxib2FAeQMByyHomTlsP8h1TtPd54Msu2ZDU/H5Vuf8=
-github.com/go-openapi/swag/conv v0.24.0 h1:ejB9+7yogkWly6pnruRX45D1/6J+ZxRu92YFivx54ik=
-github.com/go-openapi/swag/conv v0.24.0/go.mod h1:jbn140mZd7EW2g8a8Y5bwm8/Wy1slLySQQ0ND6DPc2c=
-github.com/go-openapi/swag/fileutils v0.24.0 h1:U9pCpqp4RUytnD689Ek/N1d2N/a//XCeqoH508H5oak=
-github.com/go-openapi/swag/fileutils v0.24.0/go.mod h1:3SCrCSBHyP1/N+3oErQ1gP+OX1GV2QYFSnrTbzwli90=
-github.com/go-openapi/swag/jsonname v0.24.0 h1:2wKS9bgRV/xB8c62Qg16w4AUiIrqqiniJFtZGi3dg5k=
-github.com/go-openapi/swag/jsonname v0.24.0/go.mod h1:GXqrPzGJe611P7LG4QB9JKPtUZ7flE4DOVechNaDd7Q=
-github.com/go-openapi/swag/jsonutils v0.24.0 h1:F1vE1q4pg1xtO3HTyJYRmEuJ4jmIp2iZ30bzW5XgZts=
-github.com/go-openapi/swag/jsonutils v0.24.0/go.mod h1:vBowZtF5Z4DDApIoxcIVfR8v0l9oq5PpYRUuteVu6f0=
-github.com/go-openapi/swag/loading v0.24.0 h1:ln/fWTwJp2Zkj5DdaX4JPiddFC5CHQpvaBKycOlceYc=
-github.com/go-openapi/swag/loading v0.24.0/go.mod h1:gShCN4woKZYIxPxbfbyHgjXAhO61m88tmjy0lp/LkJk=
-github.com/go-openapi/swag/mangling v0.24.0 h1:PGOQpViCOUroIeak/Uj/sjGAq9LADS3mOyjznmHy2pk=
-github.com/go-openapi/swag/mangling v0.24.0/go.mod h1:Jm5Go9LHkycsz0wfoaBDkdc4CkpuSnIEf62brzyCbhc=
-github.com/go-openapi/swag/netutils v0.24.0 h1:Bz02HRjYv8046Ycg/w80q3g9QCWeIqTvlyOjQPDjD8w=
-github.com/go-openapi/swag/netutils v0.24.0/go.mod h1:WRgiHcYTnx+IqfMCtu0hy9oOaPR0HnPbmArSRN1SkZM=
-github.com/go-openapi/swag/stringutils v0.24.0 h1:i4Z/Jawf9EvXOLUbT97O0HbPUja18VdBxeadyAqS1FM=
-github.com/go-openapi/swag/stringutils v0.24.0/go.mod h1:5nUXB4xA0kw2df5PRipZDslPJgJut+NjL7D25zPZ/4w=
-github.com/go-openapi/swag/typeutils v0.24.0 h1:d3szEGzGDf4L2y1gYOSSLeK6h46F+zibnEas2Jm/wIw=
-github.com/go-openapi/swag/typeutils v0.24.0/go.mod h1:q8C3Kmk/vh2VhpCLaoR2MVWOGP8y7Jc8l82qCTd1DYI=
-github.com/go-openapi/swag/yamlutils v0.24.0 h1:bhw4894A7Iw6ne+639hsBNRHg9iZg/ISrOVr+sJGp4c=
-github.com/go-openapi/swag/yamlutils v0.24.0/go.mod h1:DpKv5aYuaGm/sULePoeiG8uwMpZSfReo1HR3Ik0yaG8=
-github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58=
-github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ=
+github.com/go-openapi/errors v0.22.3 h1:k6Hxa5Jg1TUyZnOwV2Lh81j8ayNw5VVYLvKrp4zFKFs=
+github.com/go-openapi/errors v0.22.3/go.mod h1:+WvbaBBULWCOna//9B9TbLNGSFOfF8lY9dw4hGiEiKQ=
+github.com/go-openapi/strfmt v0.24.0 h1:dDsopqbI3wrrlIzeXRbqMihRNnjzGC+ez4NQaAAJLuc=
+github.com/go-openapi/strfmt v0.24.0/go.mod h1:Lnn1Bk9rZjXxU9VMADbEEOo7D7CDyKGLsSKekhFr7s4=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
-github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
-github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
-github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -128,18 +81,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
-github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o=
-github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 h1:sGm2vDRFUrQJO/Veii4h4zG2vvqG6uWNkBHSTqXOZk0=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2/go.mod h1:wd1YpapPLivG6nQgbf7ZkG1hhSOXDhhn4MLTknx2aAc=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs=
-github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0 h1:nHoRIX8iXob3Y2kdt9KsjyIb7iApSvb3vgsd93xb5Ow=
-github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0/go.mod h1:c1tRKs5Tx7E2+uHGSyyncziFjvGpgv4H2HrqXeUQ/Uk=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
 github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/pgconn v1.11.0 h1:HiHArx4yFbwl91X3qqIHtUFoiIfLNJXCQRsnzkiwwaQ=
@@ -162,14 +105,12 @@ github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/connect-compress/v2 v2.0.0 h1:L7TVsLa6Oo9Hkkb6r3DwSrhBbcWlXjneqBj7fCRXviU=
+github.com/klauspost/connect-compress/v2 v2.0.0/go.mod h1:604CD9JSAjGqtVzCM4SRgM/9TFTkWBcp+2wlQfGyJ6c=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -180,40 +121,22 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq
 github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
 github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk=
 github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
-github.com/lestrrat-go/blackmagic v1.0.4 h1:IwQibdnf8l2KoO+qC3uT4OaTWsW7tuRQXy9TRN9QanA=
-github.com/lestrrat-go/blackmagic v1.0.4/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw=
-github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
-github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
-github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k=
-github.com/lestrrat-go/httprc v1.0.6/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
-github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=
-github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
-github.com/lestrrat-go/jwx/v2 v2.1.6 h1:hxM1gfDILk/l5ylers6BX/Eq1m/pnxe9NBwW6lVfecA=
-github.com/lestrrat-go/jwx/v2 v2.1.6/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU=
-github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
-github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lopezator/migrator v0.3.1 h1:ZFPT6aC7+nGWkqhleynABZ6ftycSf6hmHHLOaryq1Og=
 github.com/lopezator/migrator v0.3.1/go.mod h1:X+lHDMZ9Ci3/KdbypJcQYFFwipVrJsX4fRCQ4QLauYk=
-github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54 h1:mFWunSatvkQQDhpdyuFAYwyAan3hzCuma+Pz8sqvOfg=
-github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
+github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 h1:PwQumkgq4/acIiZhtifTV5OUqqiP82UAl0h87xj/l9k=
+github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
 github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE=
 github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
-github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mdelapenya/tlscert v0.2.0 h1:7H81W6Z/4weDvZBNOfQte5GpIMo0lGYEeWbkGp5LJHI=
 github.com/mdelapenya/tlscert v0.2.0/go.mod h1:O4njj3ELLnJjGdkN7M/vIVCpZ+Cf0L6muqOG4tLSl8o=
-github.com/metal-stack/metal-lib v0.23.4 h1:/xvCpgfvkGM8kdF0C3+mP7WGl0wiwU33MKG2UGIDXA8=
-github.com/metal-stack/metal-lib v0.23.4/go.mod h1:Q0GXBtKJ5ycqtwGYtWI7NFKdGo0+q7TLGnstgfUwBCQ=
-github.com/metal-stack/security v0.9.4 h1:qgB4Yx48Wgi57a/ePWE1gdUn4RjilVySQAFRVIoPKBU=
-github.com/metal-stack/security v0.9.4/go.mod h1:Qya3sKnaZ+1VmayGcMGgCBsVhzBvWYYx9hcvinfXB1Q=
+github.com/metal-stack/metal-lib v0.23.5 h1:ozrkB3DNr3Cqn8nkBvmzc/KKpYqC1j1mv2OVOj8i7Ac=
+github.com/metal-stack/metal-lib v0.23.5/go.mod h1:7uyHIrE19dkLwCZyeh2jmd7IEq5pEpzrzUGLoMN1eqY=
 github.com/metal-stack/v v1.0.3 h1:Sh2oBlnxrCUD+mVpzfC8HiqL045YWkxs0gpTvkjppqs=
 github.com/metal-stack/v v1.0.3/go.mod h1:YTahEu7/ishwpYKnp/VaW/7nf8+PInogkfGwLcGPdXg=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
@@ -245,8 +168,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
-github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
-github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -254,68 +175,50 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
-github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
+github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
+github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
-github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
+github.com/prometheus/common v0.67.1 h1:OTSON1P4DNxzTg4hmKCc37o4ZAZDv0cfXLkOt0oEowI=
+github.com/prometheus/common v0.67.1/go.mod h1:RpmT9v35q2Y+lsieQsdOh5sXZ6ajUGC8NjZAmr8vb0Q=
+github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos=
+github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM=
 github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
 github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sagikazarmark/locafero v0.10.0 h1:FM8Cv6j2KqIhM2ZK7HZjm4mpj9NBktLgowT1aN9q5Cc=
-github.com/sagikazarmark/locafero v0.10.0/go.mod h1:Ieo3EUsjifvQu4NZwV5sPd4dwvu0OCgEQV7vjc9yDjw=
-github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
-github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
-github.com/shirou/gopsutil/v4 v4.25.8 h1:NnAsw9lN7587WHxjJA9ryDnqhJpFH6A+wagYWTOH970=
-github.com/shirou/gopsutil/v4 v4.25.8/go.mod h1:q9QdMmfAOVIw7a+eF86P7ISEU6ka+NLgkUxlopV4RwI=
+github.com/shirou/gopsutil/v4 v4.25.9 h1:JImNpf6gCVhKgZhtaAHJ0serfFGtlfIlSC08eaKdTrU=
+github.com/shirou/gopsutil/v4 v4.25.9/go.mod h1:gxIxoC+7nQRwUl/xNhutXlD8lq+jxTgpIkEf3rADHL8=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
-github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U=
-github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
-github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo=
-github.com/spf13/cast v1.9.2 h1:SsGfm7M8QOFtEzumm7UZrZdLLquNdzFYfIbEXntcFbE=
-github.com/spf13/cast v1.9.2/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
-github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
-github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4=
-github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
+github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
-github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/testcontainers/testcontainers-go v0.38.0 h1:d7uEapLcv2P8AvH8ahLqDMMxda2W9gQN1nRbHS28HBw=
-github.com/testcontainers/testcontainers-go v0.38.0/go.mod h1:C52c9MoHpWO+C4aqmgSU+hxlR5jlEayWtgYrb8Pzz1w=
-github.com/testcontainers/testcontainers-go/modules/postgres v0.38.0 h1:KFdx9A0yF94K70T6ibSuvgkQQeX1xKlZVF3hEagXEtY=
-github.com/testcontainers/testcontainers-go/modules/postgres v0.38.0/go.mod h1:T/QRECND6N6tAKMxF1Za+G2tpwnGEHcODzHRsgIpw9M=
+github.com/testcontainers/testcontainers-go v0.39.0 h1:uCUJ5tA+fcxbFAB0uP3pIK3EJ2IjjDUHFSZ1H1UxAts=
+github.com/testcontainers/testcontainers-go v0.39.0/go.mod h1:qmHpkG7H5uPf/EvOORKvS6EuDkBUPE3zpVGaH9NL7f8=
+github.com/testcontainers/testcontainers-go/modules/postgres v0.39.0 h1:REJz+XwNpGC/dCgTfYvM4SKqobNqDBfvhq74s2oHTUM=
+github.com/testcontainers/testcontainers-go/modules/postgres v0.39.0/go.mod h1:4K2OhtHEeT+JSIFX4V8DkGKsyLa96Y2vLdd3xsxD5HE=
 github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
 github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
 github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
 github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
+github.com/urfave/cli/v2 v2.27.7/go.mod h1:CyNAG/xg+iAOg0N4MPGZqVmv2rCoP267496AOXUZjA4=
+github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 h1:FnBeRrxr7OU4VvAzt5X7s6266i6cSVkkFPS0TuXWbIg=
+github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
 go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
 go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
@@ -324,6 +227,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZF
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 h1:aTL7F04bJHUlztTsNGJ2l+6he8c+y/b//eR0jjjemT4=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4=
+go.opentelemetry.io/otel/exporters/prometheus v0.60.0 h1:cGtQxGvZbnrWdC2GyjZi0PDKVSLWP/Jocix3QWfXtbo=
+go.opentelemetry.io/otel/exporters/prometheus v0.60.0/go.mod h1:hkd1EekxNo69PTV4OWFGZcKQiIqg0RfuWExcPKFvepk=
 go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
 go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
 go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
@@ -336,66 +241,39 @@ go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOV
 go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
-go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
+go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
-golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
-golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
-golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
+golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
 golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:BIRfGDEjiHRrk0QKZe3Xv2ieMhtgRGeLcZQ0mIVn4EY=
 google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 h1:pmJpJEvT846VzausCQ5d7KreSROcDqmO388w5YbnltA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1/go.mod h1:GmFNa4BdJZ2a8G+wCe9Bg3wwThLrJun751XstdJt5Og=
-google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
-google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
-google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
-google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f h1:1FTH6cpXFsENbPR5Bu8NQddPSaUUE6NA2XdZdDSAJK4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
+google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -406,5 +284,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
 gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
-sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
-sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
+sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
+sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
diff --git a/pkg/auth/hmacauther.go b/pkg/auth/hmacauther.go
deleted file mode 100644
index 59cee79..0000000
--- a/pkg/auth/hmacauther.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package auth
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata"
-	"github.com/metal-stack/security"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-type contextKey string
-
-const (
-	// HmacDefaultKey is a exported constant for convenience
-	// FIXME where is this used ?
-	HmacDefaultKey = "4Rahs0WnJ4rJE8ZiwiLec62z" //nolint:gosec
-
-	// hmacMethod fictive non-rest-method used for HMAC-Token
-	hmacMethod = "GRPC"
-
-	// hmacAuthtype reflects the application for that the hmac is used (tenant masterdata-management)
-	hmacAuthtype = "tmdm"
-
-	// lifetime of the hmac token
-	hmacLifetime = 15 * time.Second
-
-	contextKeyUser = contextKey("user")
-)
-
-// HMACAuther provides means for generation/encoding and decoding/validation for grpc.
-// This code is potentially re-usable for all grpc-based clients/services
-// that want to use hmac-Authentication.
-type HMACAuther struct {
-	hmacAuth *security.HMACAuth
-}
-
-// NewHMACAuther creates a new HMACAuther with the given hmac-pre-shared-key and user.
-func NewHMACAuther(hmacKey string, user security.User) (*HMACAuther, error) {
-
-	var hmacAuth *security.HMACAuth
-	if hmacKey != "" {
-		auth := security.NewHMACAuth(hmacAuthtype, []byte(hmacKey), security.WithLifetime(hmacLifetime), security.WithUser(user))
-		hmacAuth = &auth
-
-		a := &HMACAuther{
-			hmacAuth: hmacAuth,
-		}
-
-		return a, nil
-	}
-
-	return nil, fmt.Errorf("error creating auther - no hmacKey specified")
-}
-
-// Auth returns a new Context with the authenticated "user" from the current request.
-// If there is no authentication info in the request, or the verification of the HMAC
-// fails an Status-Error is returned with Code Unauthenticated.
-//
-//	see GetUser()
-//
-// Used on the service/server-side.
-func (a *HMACAuther) Auth(ctx context.Context) (context.Context, error) {
-
-	rqd := security.RequestData{
-		Method:          hmacMethod,
-		AuthzHeader:     metadata.ExtractIncoming(ctx).Get(security.AuthzHeaderKey),
-		TimestampHeader: metadata.ExtractIncoming(ctx).Get(security.TsHeaderKey),
-		SaltHeader:      metadata.ExtractIncoming(ctx).Get(security.SaltHeaderKey),
-	}
-
-	user, err := a.hmacAuth.UserFromRequestData(rqd)
-	if err != nil {
-		return nil, status.Errorf(codes.Unauthenticated, "invalid auth token: %v", err)
-	}
-
-	newCtx := context.WithValue(ctx, contextKeyUser, user)
-	return newCtx, nil
-}
-
-// GetUser gets the authenticated user from the given context.
-// Note that it is necessary to call Auth() in an interceptor to put the user in the context.
-//
-// May return nil if no user is authenticated or not of the correct type.
-//
-// Used on the service/server-side.
-func GetUser(ctx context.Context) *security.User {
-	user := ctx.Value(contextKeyUser)
-	if user == nil {
-		return nil
-	}
-	u, _ := user.(*security.User)
-	return u
-}
-
-// GetRequestMetadata gets the current request metadata, refreshing
-// tokens if required. This should be called by the transport layer on
-// each request, and the data should be populated in headers or other
-// context.
-//
-// Used on the client-side.
-func (a *HMACAuther) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
-
-	headers := a.hmacAuth.AuthHeaders(hmacMethod, time.Now())
-	return headers, nil
-}
-
-// RequireTransportSecurity indicates whether the credentials requires
-// transport security.
-//
-// Used on the client-side.
-func (a *HMACAuther) RequireTransportSecurity() bool {
-	return true
-}
diff --git a/pkg/auth/users.go b/pkg/auth/users.go
deleted file mode 100644
index 480d502..0000000
--- a/pkg/auth/users.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package auth
-
-import "github.com/metal-stack/security"
-import "github.com/metal-stack/metal-lib/jwt/sec"
-
-var (
-	// Edit Groupname
-	EditGroups = []security.ResourceAccess{
-		security.ResourceAccess("tmdm-all-all-edit"),
-	}
-
-	EditAccess = sec.MergeResourceAccess(EditGroups)
-
-	// Edit User
-	EditUser = security.User{
-		EMail:  "tmdm@metal-stack.io",
-		Name:   "tmdm",
-		Groups: sec.MergeResourceAccess(EditGroups),
-		Tenant: "tmdm",
-	}
-)
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 5353082..bb79d24 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -2,230 +2,116 @@ package client
 
 import (
 	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"log/slog"
-	"os"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	grpcinsecure "google.golang.org/grpc/credentials/insecure"
 
+	"connectrpc.com/connect"
+	compress "github.com/klauspost/connect-compress/v2"
 	v1 "github.com/metal-stack/masterdata-api/api/v1"
-	"github.com/metal-stack/masterdata-api/pkg/auth"
+	"github.com/metal-stack/masterdata-api/api/v1/apiv1connect"
 )
 
 // Client defines the client API
-type Client interface {
-	Project() v1.ProjectServiceClient
-	ProjectMember() v1.ProjectMemberServiceClient
-	Tenant() v1.TenantServiceClient
-	TenantMember() v1.TenantMemberServiceClient
-	Version() v1.VersionServiceClient
-	Close() error
-}
-
-// GRPCClient is a Client implementation with grpc transport.
-type GRPCClient struct {
-	conn    *grpc.ClientConn
-	log     *slog.Logger
-	hmacKey string
-}
-
-type Config struct {
-	Logger *slog.Logger
-
-	Hostname string
-	Port     uint
-
-	CertFile string
-	KeyFile  string
-	CaFile   string
-	Insecure bool
-
-	HmacKey string
-
-	// Namespace if set adds this namespace to namespaced requests such that it does not need to be passed all the time
-	Namespace string
-}
-
-func (c *Config) validate() error {
-	if c == nil {
-		return fmt.Errorf("config must not be nil")
-	}
-
-	if c.Hostname == "" {
-		return fmt.Errorf("hostname must be specified")
-	}
-
-	if c.KeyFile != "" || c.CertFile != "" {
-		if c.KeyFile == "" || c.CertFile == "" {
-			return fmt.Errorf("either both key and cert file must be specified or none of them")
-		}
-	}
-
-	return nil
-}
-
-// NewClient creates a new client for the services for the given address, with the certificate and hmac.
-func NewClient(config *Config) (Client, error) {
-	if err := config.validate(); err != nil {
-		return nil, err
-	}
-
-	if config.Logger == nil {
-		config.Logger = slog.Default()
-	}
-
-	address := fmt.Sprintf("%s:%d", config.Hostname, config.Port)
-
-	certPool, err := x509.SystemCertPool()
-	if err != nil {
-		return nil, fmt.Errorf("failed to load system credentials: %w", err)
-	}
-
-	if caFile := config.CaFile; caFile != "" {
-		ca, err := os.ReadFile(caFile)
-		if err != nil {
-			return nil, fmt.Errorf("could not read ca certificate: %w", err)
-		}
-
-		ok := certPool.AppendCertsFromPEM(ca)
-		if !ok {
-			return nil, fmt.Errorf("failed to append ca certs: %s", caFile)
-		}
-	}
-
-	var (
-		certificates []tls.Certificate
-		opts         []grpc.DialOption
-	)
-
-	if config.CertFile != "" && config.KeyFile != "" {
-		clientCertificate, err := tls.LoadX509KeyPair(config.CertFile, config.KeyFile)
-		if err != nil {
-			return nil, fmt.Errorf("could not load client key pair: %w", err)
-		}
-
-		certificates = append(certificates, clientCertificate)
-
-		creds := credentials.NewTLS(&tls.Config{
-			ServerName:         config.Hostname,
-			Certificates:       certificates,
-			RootCAs:            certPool,
-			MinVersion:         tls.VersionTLS12,
-			InsecureSkipVerify: config.Insecure, // nolint:gosec
-		})
-
-		opts = append(opts,
-			// oauth.NewOauthAccess requires the configuration of transport
-			// credentials.
-			grpc.WithTransportCredentials(creds),
-		)
-	} else {
-		opts = append(opts,
-			grpc.WithTransportCredentials(grpcinsecure.NewCredentials()),
-		)
-	}
-
-	client := GRPCClient{
-		log: config.Logger,
-	}
-
-	if config.HmacKey != "" {
-		client.hmacKey = config.HmacKey
-
-		// Set up the credentials for the connection.
-		perRPCHMACAuthenticator, err := auth.NewHMACAuther(config.HmacKey, auth.EditUser)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create hmac-authenticator: %w", err)
-		}
-
-		opts = append(opts,
-			// In addition to the following grpc.DialOption, callers may also use
-			// the grpc.CallOption grpc.PerRPCCredentials with the RPC invocation
-			// itself.
-			// See: https://godoc.org/google.golang.org/grpc#PerRPCCredentials
-			grpc.WithPerRPCCredentials(perRPCHMACAuthenticator))
+type (
+	Client interface {
+		Project() apiv1connect.ProjectServiceClient
+		ProjectMember() apiv1connect.ProjectMemberServiceClient
+		Tenant() apiv1connect.TenantServiceClient
+		TenantMember() apiv1connect.TenantMemberServiceClient
+		Version() apiv1connect.VersionServiceClient
 	}
 
-	if config.Namespace != "" {
-		opts = append(opts, NamespaceInterceptor(config.Namespace))
+	client struct {
+		config *Config
 	}
+)
 
-	// Set up a connection to the server.
-	conn, err := grpc.NewClient(address, opts...)
-	if err != nil {
-		return nil, err
+// GRPCClient is a Client implementation with grpc transport.
+func New(config *Config) Client {
+	return &client{
+		config: config,
 	}
-
-	client.conn = conn
-
-	return client, nil
-}
-
-func NamespaceInterceptor(namespace string) grpc.DialOption {
-	return grpc.WithChainUnaryInterceptor(func(ctx context.Context, method string, req, reply any, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
-		switch r := req.(type) {
-		case *v1.TenantMemberCreateRequest:
-			if r.TenantMember.Namespace == "" {
-				r.TenantMember.Namespace = namespace
-			}
-		case *v1.ProjectMemberCreateRequest:
-			if r.ProjectMember.Namespace == "" {
-				r.ProjectMember.Namespace = namespace
-			}
-		case *v1.TenantMemberFindRequest:
-			if r.Namespace == "" {
-				r.Namespace = namespace
-			}
-		case *v1.ProjectMemberFindRequest:
-			if r.Namespace == "" {
-				r.Namespace = namespace
-			}
-		case *v1.FindParticipatingProjectsRequest:
-			if r.Namespace == "" {
-				r.Namespace = namespace
-			}
-		case *v1.FindParticipatingTenantsRequest:
-			if r.Namespace == "" {
-				r.Namespace = namespace
-			}
-		case *v1.ListTenantMembersRequest:
-			if r.Namespace == "" {
-				r.Namespace = namespace
-			}
-		}
-		return invoker(ctx, method, req, reply, cc, opts...)
-	})
-}
-
-// Close the underlying connection
-func (c GRPCClient) Close() error {
-	return c.conn.Close()
 }
 
 // Project is the root accessor for project related functions
-func (c GRPCClient) Project() v1.ProjectServiceClient {
-	return v1.NewProjectServiceClient(c.conn)
+func (c client) Project() apiv1connect.ProjectServiceClient {
+	return apiv1connect.NewProjectServiceClient(
+		c.config.HttpClient(),
+		c.config.BaseURL,
+		compress.WithAll(compress.LevelBalanced),
+	)
 }
 
 // ProjectMember is the root accessor for project member related functions
-func (c GRPCClient) ProjectMember() v1.ProjectMemberServiceClient {
-	return v1.NewProjectMemberServiceClient(c.conn)
+func (c client) ProjectMember() apiv1connect.ProjectMemberServiceClient {
+	return apiv1connect.NewProjectMemberServiceClient(
+		c.config.HttpClient(),
+		c.config.BaseURL,
+		compress.WithAll(compress.LevelBalanced),
+		connect.WithInterceptors(NamespaceInterceptor(c.config.Namespace)),
+	)
 }
 
 // Tenant is the root accessor for tenant related functions
-func (c GRPCClient) Tenant() v1.TenantServiceClient {
-	return v1.NewTenantServiceClient(c.conn)
+func (c client) Tenant() apiv1connect.TenantServiceClient {
+	return apiv1connect.NewTenantServiceClient(
+		c.config.HttpClient(),
+		c.config.BaseURL,
+		compress.WithAll(compress.LevelBalanced),
+		connect.WithInterceptors(NamespaceInterceptor(c.config.Namespace)),
+	)
 }
 
 // Tenant is the root accessor for tenant related functions
-func (c GRPCClient) TenantMember() v1.TenantMemberServiceClient {
-	return v1.NewTenantMemberServiceClient(c.conn)
+func (c client) TenantMember() apiv1connect.TenantMemberServiceClient {
+	return apiv1connect.NewTenantMemberServiceClient(
+		c.config.HttpClient(),
+		c.config.BaseURL,
+		compress.WithAll(compress.LevelBalanced),
+		connect.WithInterceptors(NamespaceInterceptor(c.config.Namespace)),
+	)
 }
 
-func (c GRPCClient) Version() v1.VersionServiceClient {
-	return v1.NewVersionServiceClient(c.conn)
+func (c client) Version() apiv1connect.VersionServiceClient {
+	return apiv1connect.NewVersionServiceClient(
+		c.config.HttpClient(),
+		c.config.BaseURL,
+		compress.WithAll(compress.LevelBalanced),
+	)
+}
+
+func NamespaceInterceptor(namespace string) connect.UnaryInterceptorFunc {
+	return func(uf connect.UnaryFunc) connect.UnaryFunc {
+		return func(ctx context.Context, ar connect.AnyRequest) (connect.AnyResponse, error) {
+			switch r := ar.Any().(type) {
+			case *v1.TenantMemberCreateRequest:
+				if r.TenantMember.Namespace == "" {
+					r.TenantMember.Namespace = namespace
+				}
+			case *v1.ProjectMemberCreateRequest:
+				if r.ProjectMember.Namespace == "" {
+					r.ProjectMember.Namespace = namespace
+				}
+			case *v1.TenantMemberFindRequest:
+				if r.Namespace == "" {
+					r.Namespace = namespace
+				}
+			case *v1.ProjectMemberFindRequest:
+				if r.Namespace == "" {
+					r.Namespace = namespace
+				}
+			case *v1.FindParticipatingProjectsRequest:
+				if r.Namespace == "" {
+					r.Namespace = namespace
+				}
+			case *v1.FindParticipatingTenantsRequest:
+				if r.Namespace == "" {
+					r.Namespace = namespace
+				}
+			case *v1.ListTenantMembersRequest:
+				if r.Namespace == "" {
+					r.Namespace = namespace
+				}
+			}
+			return uf(ctx, ar)
+		}
+	}
 }
diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
index 4eece9c..d2a5418 100644
--- a/pkg/client/client_test.go
+++ b/pkg/client/client_test.go
@@ -2,16 +2,19 @@ package client
 
 import (
 	"context"
-	"log/slog"
+	"fmt"
 	"net"
-	"strconv"
+	"net/http"
 	"testing"
+	"time"
 
+	"connectrpc.com/connect"
 	v1 "github.com/metal-stack/masterdata-api/api/v1"
+	"github.com/metal-stack/masterdata-api/api/v1/apiv1connect"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/reflection"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/h2c"
 )
 
 func Test_Client(t *testing.T) {
@@ -20,54 +23,59 @@ func Test_Client(t *testing.T) {
 	)
 
 	var (
-		log                 = slog.Default()
-		grpcServer          = grpc.NewServer()
-		projectMemberServer = &projectMemberServer{}
-		tenantMemberServer  = &tenantMemberServer{}
-	)
+		// log                  = slog.Default()
+		projectMemberService = &projectMemberService{}
+		tenantMemberService  = &tenantMemberService{}
 
-	v1.RegisterProjectMemberServiceServer(grpcServer, projectMemberServer)
-	v1.RegisterTenantMemberServiceServer(grpcServer, tenantMemberServer)
+		interceptors = connect.WithInterceptors()
+	)
 
-	reflection.Register(grpcServer)
+	mux := http.NewServeMux()
+	mux.Handle(apiv1connect.NewProjectMemberServiceHandler(projectMemberService, interceptors))
+	mux.Handle(apiv1connect.NewTenantMemberServiceHandler(tenantMemberService, interceptors))
 
 	lis, err := net.Listen("tcp", "")
 	require.NoError(t, err)
 
+	_, portString, err := net.SplitHostPort(lis.Addr().String())
+	require.NoError(t, err)
+
+	server := http.Server{
+		Addr: lis.Addr().String(),
+		// For gRPC clients, it's convenient to support HTTP/2 without TLS. You can
+		// avoid x/net/http2 by using http.ListenAndServeTLS.
+		Handler:           h2c.NewHandler(mux, &http2.Server{}),
+		ReadHeaderTimeout: 1 * time.Minute,
+	}
+
 	go func() {
-		err = grpcServer.Serve(lis)
-		require.NoError(t, err)
+		_ = server.Serve(lis)
 	}()
 	defer func() {
-		grpcServer.Stop()
+		err := server.Close()
+		require.NoError(t, err)
 	}()
 
-	_, portString, err := net.SplitHostPort(lis.Addr().String())
-	require.NoError(t, err)
-
-	port, err := strconv.Atoi(portString)
-	require.NoError(t, err)
-
-	client, err := NewClient(&Config{
-		Hostname:  "localhost",
-		Port:      uint(port),
-		Insecure:  true,
-		Logger:    log,
+	client := New(&Config{
+		BaseURL:   fmt.Sprintf("http://localhost:%s", portString),
+		Debug:     true,
+		UserAgent: "sample-client",
 		Namespace: namespace,
 	})
 	require.NoError(t, err)
 
 	t.Run("check namespace interceptor sets missing namespace", func(t *testing.T) {
 		t.Run("project member", func(t *testing.T) {
-			projectMemberServer.create = func(ctx context.Context, pmcr *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error) {
+			projectMemberService.create = func(_ context.Context, pmcr *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error) {
 				assert.Equal(t, "project-a", pmcr.ProjectMember.ProjectId)
 				assert.Equal(t, "tenant-a", pmcr.ProjectMember.TenantId)
 				assert.Equal(t, namespace, pmcr.ProjectMember.Namespace)
 				return &v1.ProjectMemberResponse{}, nil
 			}
-			projectMemberServer.find = func(ctx context.Context, pmfr *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error) {
+			projectMemberService.find = func(_ context.Context, pmfr *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error) {
 				assert.Equal(t, namespace, pmfr.Namespace)
 				return &v1.ProjectMemberListResponse{}, nil
+
 			}
 
 			_, err = client.ProjectMember().Create(t.Context(), &v1.ProjectMemberCreateRequest{
@@ -83,12 +91,12 @@ func Test_Client(t *testing.T) {
 		})
 
 		t.Run("tenant member", func(t *testing.T) {
-			tenantMemberServer.create = func(ctx context.Context, tmcr *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error) {
+			tenantMemberService.create = func(_ context.Context, tmcr *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error) {
 				assert.Equal(t, "tenant-a", tmcr.TenantMember.TenantId)
 				assert.Equal(t, namespace, tmcr.TenantMember.Namespace)
 				return &v1.TenantMemberResponse{}, nil
 			}
-			tenantMemberServer.find = func(ctx context.Context, tmfr *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error) {
+			tenantMemberService.find = func(ctx context.Context, tmfr *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error) {
 				assert.Equal(t, namespace, tmfr.Namespace)
 				return &v1.TenantMemberListResponse{}, nil
 			}
@@ -107,13 +115,13 @@ func Test_Client(t *testing.T) {
 
 	t.Run("check explicit namespace can be set anyway", func(t *testing.T) {
 		t.Run("project member", func(t *testing.T) {
-			projectMemberServer.create = func(ctx context.Context, pmcr *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error) {
+			projectMemberService.create = func(_ context.Context, pmcr *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error) {
 				assert.Equal(t, "project-a", pmcr.ProjectMember.ProjectId)
 				assert.Equal(t, "tenant-a", pmcr.ProjectMember.TenantId)
 				assert.Equal(t, "b", pmcr.ProjectMember.Namespace)
 				return &v1.ProjectMemberResponse{}, nil
 			}
-			projectMemberServer.find = func(ctx context.Context, pmfr *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error) {
+			projectMemberService.find = func(_ context.Context, pmfr *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error) {
 				assert.Equal(t, "b", pmfr.Namespace)
 				return &v1.ProjectMemberListResponse{}, nil
 			}
@@ -127,19 +135,17 @@ func Test_Client(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			_, err = client.ProjectMember().Find(t.Context(), &v1.ProjectMemberFindRequest{
-				Namespace: "b",
-			})
+			_, err = client.ProjectMember().Find(t.Context(), &v1.ProjectMemberFindRequest{Namespace: "b"})
 			require.NoError(t, err)
 		})
 
 		t.Run("tenant member", func(t *testing.T) {
-			tenantMemberServer.create = func(ctx context.Context, tmcr *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error) {
+			tenantMemberService.create = func(_ context.Context, tmcr *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error) {
 				assert.Equal(t, "tenant-a", tmcr.TenantMember.TenantId)
 				assert.Equal(t, "b", tmcr.TenantMember.Namespace)
 				return &v1.TenantMemberResponse{}, nil
 			}
-			tenantMemberServer.find = func(ctx context.Context, tmfr *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error) {
+			tenantMemberService.find = func(ctx context.Context, tmfr *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error) {
 				assert.Equal(t, "b", tmfr.Namespace)
 				return &v1.TenantMemberListResponse{}, nil
 			}
@@ -152,60 +158,58 @@ func Test_Client(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			_, err = client.TenantMember().Find(t.Context(), &v1.TenantMemberFindRequest{
-				Namespace: "b",
-			})
+			_, err = client.TenantMember().Find(t.Context(), &v1.TenantMemberFindRequest{Namespace: "b"})
 			require.NoError(t, err)
 		})
 	})
 }
 
-type projectMemberServer struct {
+type projectMemberService struct {
 	create func(context.Context, *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error)
 	find   func(context.Context, *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error)
 }
 
-func (t *projectMemberServer) Create(ctx context.Context, r *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error) {
-	return t.create(ctx, r)
+func (p *projectMemberService) Create(ctx context.Context, r *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error) {
+	return p.create(ctx, r)
 }
 
-func (t *projectMemberServer) Delete(context.Context, *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error) {
+func (p *projectMemberService) Delete(context.Context, *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error) {
 	panic("unimplemented")
 }
 
-func (t *projectMemberServer) Find(ctx context.Context, r *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error) {
-	return t.find(ctx, r)
+func (p *projectMemberService) Find(ctx context.Context, r *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error) {
+	return p.find(ctx, r)
 }
 
-func (t *projectMemberServer) Get(context.Context, *v1.ProjectMemberGetRequest) (*v1.ProjectMemberResponse, error) {
+func (p *projectMemberService) Get(context.Context, *v1.ProjectMemberGetRequest) (*v1.ProjectMemberResponse, error) {
 	panic("unimplemented")
 }
 
-func (t *projectMemberServer) Update(context.Context, *v1.ProjectMemberUpdateRequest) (*v1.ProjectMemberResponse, error) {
+func (p *projectMemberService) Update(context.Context, *v1.ProjectMemberUpdateRequest) (*v1.ProjectMemberResponse, error) {
 	panic("unimplemented")
 }
 
-type tenantMemberServer struct {
+type tenantMemberService struct {
 	create func(context.Context, *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error)
 	find   func(context.Context, *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error)
 }
 
-func (t *tenantMemberServer) Create(ctx context.Context, r *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error) {
+func (t *tenantMemberService) Create(ctx context.Context, r *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error) {
 	return t.create(ctx, r)
 }
 
-func (t *tenantMemberServer) Delete(context.Context, *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error) {
+func (t *tenantMemberService) Delete(context.Context, *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error) {
 	panic("unimplemented")
 }
 
-func (t *tenantMemberServer) Find(ctx context.Context, r *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error) {
+func (t *tenantMemberService) Find(ctx context.Context, r *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error) {
 	return t.find(ctx, r)
 }
 
-func (t *tenantMemberServer) Get(context.Context, *v1.TenantMemberGetRequest) (*v1.TenantMemberResponse, error) {
+func (t *tenantMemberService) Get(context.Context, *v1.TenantMemberGetRequest) (*v1.TenantMemberResponse, error) {
 	panic("unimplemented")
 }
 
-func (t *tenantMemberServer) Update(context.Context, *v1.TenantMemberUpdateRequest) (*v1.TenantMemberResponse, error) {
+func (t *tenantMemberService) Update(context.Context, *v1.TenantMemberUpdateRequest) (*v1.TenantMemberResponse, error) {
 	panic("unimplemented")
 }
diff --git a/pkg/client/conn.go b/pkg/client/conn.go
new file mode 100644
index 0000000..fa8d308
--- /dev/null
+++ b/pkg/client/conn.go
@@ -0,0 +1,62 @@
+package client
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httputil"
+)
+
+// Config is the configuration to create a api-server connection
+type Config struct {
+	BaseURL string
+	Token   string
+	Debug   bool
+
+	UserAgent string
+
+	// Namespace if set adds this namespace to namespaced requests such that it does not need to be passed all the time
+	Namespace string
+}
+
+func (d *Config) HttpClient() *http.Client {
+	return &http.Client{
+		Transport: &AddHeaderTransport{
+			debug: d.Debug,
+			T:     http.DefaultTransport,
+			Token: d.Token,
+		},
+	}
+}
+
+type AddHeaderTransport struct {
+	debug bool
+
+	Token string
+	T     http.RoundTripper
+}
+
+func (a *AddHeaderTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	req.Header.Add("Authorization", "Bearer "+a.Token)
+
+	if a.debug {
+		reqDump, err := httputil.DumpRequestOut(req, true)
+		if err != nil {
+			fmt.Printf("DEBUG ERROR: %s\n", err)
+		} else {
+			fmt.Printf("DEBUG REQUEST:\n%s\n", string(reqDump))
+		}
+	}
+
+	resp, err := a.T.RoundTrip(req)
+
+	if a.debug && resp != nil {
+		respDump, err := httputil.DumpResponse(resp, true)
+		if err != nil {
+			fmt.Printf("DEBUG ERROR: %s\n", err)
+		} else {
+			fmt.Printf("DEBUG RESPONSE:\n%s\n", string(respDump))
+		}
+	}
+
+	return resp, err
+}
diff --git a/pkg/client/mock.go b/pkg/client/mock.go
index 17a2768..a6d9fbb 100644
--- a/pkg/client/mock.go
+++ b/pkg/client/mock.go
@@ -1,18 +1,18 @@
 package client
 
 import (
-	v1 "github.com/metal-stack/masterdata-api/api/v1"
+	"github.com/metal-stack/masterdata-api/api/v1/apiv1connect"
 )
 
 type MockClient struct {
-	psc  v1.ProjectServiceClient
-	tsc  v1.TenantServiceClient
-	pmsc v1.ProjectMemberServiceClient
-	tmsc v1.TenantMemberServiceClient
-	vsc  v1.VersionServiceClient
+	psc  apiv1connect.ProjectServiceClient
+	tsc  apiv1connect.TenantServiceClient
+	pmsc apiv1connect.ProjectMemberServiceClient
+	tmsc apiv1connect.TenantMemberServiceClient
+	vsc  apiv1connect.VersionServiceClient
 }
 
-func NewMock(psc v1.ProjectServiceClient, tsc v1.TenantServiceClient, pmsc v1.ProjectMemberServiceClient, tmsc v1.TenantMemberServiceClient, vsc v1.VersionServiceClient) *MockClient {
+func NewMock(psc apiv1connect.ProjectServiceClient, tsc apiv1connect.TenantServiceClient, pmsc apiv1connect.ProjectMemberServiceClient, tmsc apiv1connect.TenantMemberServiceClient, vsc apiv1connect.VersionServiceClient) *MockClient {
 	return &MockClient{
 		psc:  psc,
 		tsc:  tsc,
@@ -25,19 +25,19 @@ func NewMock(psc v1.ProjectServiceClient, tsc v1.TenantServiceClient, pmsc v1.Pr
 func (c *MockClient) Close() error {
 	return nil
 }
-func (c *MockClient) Project() v1.ProjectServiceClient {
+func (c *MockClient) Project() apiv1connect.ProjectServiceClient {
 	return c.psc
 }
-func (c *MockClient) ProjectMember() v1.ProjectMemberServiceClient {
+func (c *MockClient) ProjectMember() apiv1connect.ProjectMemberServiceClient {
 	return c.pmsc
 }
 
-func (c *MockClient) Tenant() v1.TenantServiceClient {
+func (c *MockClient) Tenant() apiv1connect.TenantServiceClient {
 	return c.tsc
 }
-func (c *MockClient) TenantMember() v1.TenantMemberServiceClient {
+func (c *MockClient) TenantMember() apiv1connect.TenantMemberServiceClient {
 	return c.tmsc
 }
-func (c *MockClient) Version() v1.VersionServiceClient {
+func (c *MockClient) Version() apiv1connect.VersionServiceClient {
 	return c.vsc
 }
diff --git a/pkg/datastore/mocks/Entity.go b/pkg/datastore/mocks/Entity.go
new file mode 100644
index 0000000..9ff6a16
--- /dev/null
+++ b/pkg/datastore/mocks/Entity.go
@@ -0,0 +1,138 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// Entity is an autogenerated mock type for the Entity type
+type Entity struct {
+	mock.Mock
+}
+
+// APIVersion provides a mock function with no fields
+func (_m *Entity) APIVersion() string {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for APIVersion")
+	}
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
+// GetMeta provides a mock function with no fields
+func (_m *Entity) GetMeta() *apiv1.Meta {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetMeta")
+	}
+
+	var r0 *apiv1.Meta
+	if rf, ok := ret.Get(0).(func() *apiv1.Meta); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*apiv1.Meta)
+		}
+	}
+
+	return r0
+}
+
+// JSONField provides a mock function with no fields
+func (_m *Entity) JSONField() string {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for JSONField")
+	}
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
+// Kind provides a mock function with no fields
+func (_m *Entity) Kind() string {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Kind")
+	}
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
+// Schema provides a mock function with no fields
+func (_m *Entity) Schema() string {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Schema")
+	}
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
+// TableName provides a mock function with no fields
+func (_m *Entity) TableName() string {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for TableName")
+	}
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
+// NewEntity creates a new instance of Entity. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewEntity(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *Entity {
+	mock := &Entity{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/datastore/mocks/Storage.go b/pkg/datastore/mocks/Storage.go
new file mode 100644
index 0000000..6d5336b
--- /dev/null
+++ b/pkg/datastore/mocks/Storage.go
@@ -0,0 +1,218 @@
+// Code generated by mockery v2.53.3. DO NOT EDIT.
+
+package mocks
+
+import (
+	context "context"
+
+	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
+
+	datastore "github.com/metal-stack/masterdata-api/pkg/datastore"
+
+	mock "github.com/stretchr/testify/mock"
+
+	time "time"
+)
+
+// Storage is an autogenerated mock type for the Storage type
+type Storage[E datastore.Entity] struct {
+	mock.Mock
+}
+
+// Create provides a mock function with given fields: ctx, ve
+func (_m *Storage[E]) Create(ctx context.Context, ve E) error {
+	ret := _m.Called(ctx, ve)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, E) error); ok {
+		r0 = rf(ctx, ve)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// Delete provides a mock function with given fields: ctx, id
+func (_m *Storage[E]) Delete(ctx context.Context, id string) error {
+	ret := _m.Called(ctx, id)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) error); ok {
+		r0 = rf(ctx, id)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// DeleteAll provides a mock function with given fields: ctx, ids
+func (_m *Storage[E]) DeleteAll(ctx context.Context, ids ...string) error {
+	_va := make([]interface{}, len(ids))
+	for _i := range ids {
+		_va[_i] = ids[_i]
+	}
+	var _ca []interface{}
+	_ca = append(_ca, ctx)
+	_ca = append(_ca, _va...)
+	ret := _m.Called(_ca...)
+
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteAll")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, ...string) error); ok {
+		r0 = rf(ctx, ids...)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// Find provides a mock function with given fields: ctx, filter, paging
+func (_m *Storage[E]) Find(ctx context.Context, filter map[string]interface{}, paging *apiv1.Paging) ([]E, *uint64, error) {
+	ret := _m.Called(ctx, filter, paging)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 []E
+	var r1 *uint64
+	var r2 error
+	if rf, ok := ret.Get(0).(func(context.Context, map[string]interface{}, *apiv1.Paging) ([]E, *uint64, error)); ok {
+		return rf(ctx, filter, paging)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, map[string]interface{}, *apiv1.Paging) []E); ok {
+		r0 = rf(ctx, filter, paging)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]E)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, map[string]interface{}, *apiv1.Paging) *uint64); ok {
+		r1 = rf(ctx, filter, paging)
+	} else {
+		if ret.Get(1) != nil {
+			r1 = ret.Get(1).(*uint64)
+		}
+	}
+
+	if rf, ok := ret.Get(2).(func(context.Context, map[string]interface{}, *apiv1.Paging) error); ok {
+		r2 = rf(ctx, filter, paging)
+	} else {
+		r2 = ret.Error(2)
+	}
+
+	return r0, r1, r2
+}
+
+// Get provides a mock function with given fields: ctx, id
+func (_m *Storage[E]) Get(ctx context.Context, id string) (E, error) {
+	ret := _m.Called(ctx, id)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 E
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (E, error)); ok {
+		return rf(ctx, id)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) E); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(E)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetHistory provides a mock function with given fields: ctx, id, at, ve
+func (_m *Storage[E]) GetHistory(ctx context.Context, id string, at time.Time, ve E) error {
+	ret := _m.Called(ctx, id, at, ve)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetHistory")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, time.Time, E) error); ok {
+		r0 = rf(ctx, id, at, ve)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// GetHistoryCreated provides a mock function with given fields: ctx, id, ve
+func (_m *Storage[E]) GetHistoryCreated(ctx context.Context, id string, ve E) error {
+	ret := _m.Called(ctx, id, ve)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetHistoryCreated")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, E) error); ok {
+		r0 = rf(ctx, id, ve)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// Update provides a mock function with given fields: ctx, ve
+func (_m *Storage[E]) Update(ctx context.Context, ve E) error {
+	ret := _m.Called(ctx, ve)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, E) error); ok {
+		r0 = rf(ctx, ve)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewStorage creates a new instance of Storage. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewStorage[E datastore.Entity](t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *Storage[E] {
+	mock := &Storage[E]{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/datastore/postgres_test.go b/pkg/datastore/postgres_test.go
index 1240b44..8df6c73 100644
--- a/pkg/datastore/postgres_test.go
+++ b/pkg/datastore/postgres_test.go
@@ -788,7 +788,7 @@ func createPostgresConnection() (testcontainers.Container, *sqlx.DB, error) {
 	ctx := context.Background()
 
 	postgres, err := postgres.Run(ctx,
-		"postgres:17-alpine",
+		"postgres:18-alpine",
 		postgres.WithPassword("password"),
 		testcontainers.WithWaitStrategy(
 			wait.ForLog("database system is ready to accept connections").
diff --git a/pkg/gen/genscanvaluer.go b/pkg/gen/genscanvaluer.go
index 4dfb674..2903703 100644
--- a/pkg/gen/genscanvaluer.go
+++ b/pkg/gen/genscanvaluer.go
@@ -98,6 +98,7 @@ func (g *Generator) generate(packageName, typeName string) error {
 
 	info := map[string]string{
 		"packageName":   packageName,
+		"apiversion":    "v1", // THIS is kept to v1 to stay compatible with existing database entries
 		"typeName":      typeName,
 		"typeVariable":  strings.ToLower(string(typeName[0])),
 		"typeNameLower": strings.ToLower(typeName),
@@ -180,7 +181,7 @@ func ({{ .typeVariable }} *{{ .typeName }}) Kind() string {
 }
 
 func ({{ .typeVariable }} *{{ .typeName }}) APIVersion() string {
-	return "{{ .packageName }}"
+	return "{{ .apiversion }}"
 }
 
 // Value make the {{ .typeName }} struct implement the driver.Valuer interface. This method
diff --git a/pkg/interceptors/grpc_internalerror/StatusInternalErrorInterceptor.go b/pkg/interceptors/grpc_internalerror/StatusInternalErrorInterceptor.go
deleted file mode 100644
index 0fd76c7..0000000
--- a/pkg/interceptors/grpc_internalerror/StatusInternalErrorInterceptor.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package grpc_internalerror
-
-import (
-	"context"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-/*
-	Every response with an "plain" error will be converted to an status-error with codes.Internal.
-*/
-
-// UnaryServerInterceptor returns a new unary server interceptor for panic recovery.
-func UnaryServerInterceptor() grpc.UnaryServerInterceptor {
-
-	return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (_ any, err error) {
-
-		result, err := handler(ctx, req)
-		_, ok := status.FromError(err)
-		if !ok {
-			err = status.Error(codes.Internal, err.Error())
-		}
-
-		return result, err
-	}
-}
-
-// StreamServerInterceptor returns a new streaming server interceptor for panic recovery.
-func StreamServerInterceptor() grpc.StreamServerInterceptor {
-
-	return func(srv any, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) (err error) {
-
-		err = handler(srv, stream)
-		_, ok := status.FromError(err)
-		if !ok {
-			err = status.Error(codes.Internal, err.Error())
-		}
-
-		return err
-	}
-}
diff --git a/pkg/service/common_test.go b/pkg/service/common_test.go
index 9ac40c1..0216fad 100644
--- a/pkg/service/common_test.go
+++ b/pkg/service/common_test.go
@@ -18,7 +18,7 @@ func StartPostgres(ctx context.Context, ves ...datastore.Entity) (testcontainers
 	var err error
 	pgContainer, err = testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
-			Image:        "postgres:17-alpine",
+			Image:        "postgres:18-alpine",
 			ExposedPorts: []string{"5432/tcp"},
 			Env:          map[string]string{"POSTGRES_PASSWORD": "password"},
 			WaitingFor: wait.ForAll(
diff --git a/pkg/service/project_test.go b/pkg/service/project_test.go
index 77acde1..da0a769 100644
--- a/pkg/service/project_test.go
+++ b/pkg/service/project_test.go
@@ -53,8 +53,8 @@ func TestCreateProject(t *testing.T) {
 	resp, err := ts.Create(ctx, tcr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetProject())
-	assert.Equal(t, tcr.Project.GetName(), resp.GetProject().GetName())
+	assert.NotNil(t, resp.Project)
+	assert.Equal(t, tcr.Project.GetName(), resp.Project.GetName())
 }
 
 func TestCreateProjectWithQuotaCheck(t *testing.T) {
@@ -87,13 +87,13 @@ func TestCreateProjectWithQuotaCheck(t *testing.T) {
 	var projects []*v1.Project
 	// see: https://github.com/stretchr/testify/blob/master/mock/mock.go#L149-L162
 	tenantStorageMock.On("Get", ctx, p1.GetTenantId()).Return(t1, nil)
-	storageMock.On("Find", ctx, mock.AnythingOfType("*v1.Paging"), []any{filter}).Return(projects, nil, nil)
+	storageMock.On("Find", ctx, mock.Anything, []any{filter}).Return(projects, nil, nil)
 	storageMock.On("Create", ctx, p1).Return(nil)
 	resp, err := ts.Create(ctx, tcr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetProject())
-	assert.Equal(t, tcr.Project.GetName(), resp.GetProject().GetName())
+	assert.NotNil(t, resp.Project)
+	assert.Equal(t, tcr.Project.GetName(), resp.Project.GetName())
 }
 
 func TestUpdateProject(t *testing.T) {
@@ -125,8 +125,8 @@ func TestUpdateProject(t *testing.T) {
 	resp, err := ts.Update(ctx, tur)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetProject())
-	assert.Equal(t, tur.GetProject().GetName(), resp.GetProject().GetName())
+	assert.NotNil(t, resp.Project)
+	assert.Equal(t, tur.GetProject().GetName(), resp.Project.GetName())
 }
 
 func TestDeleteProject(t *testing.T) {
@@ -159,8 +159,8 @@ func TestDeleteProject(t *testing.T) {
 	resp, err := ps.Delete(ctx, pdr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetProject())
-	assert.Equal(t, pdr.Id, resp.GetProject().GetMeta().GetId())
+	assert.NotNil(t, resp.Project)
+	assert.Equal(t, pdr.Id, resp.Project.GetMeta().GetId())
 }
 
 func TestGetProject(t *testing.T) {
@@ -183,8 +183,8 @@ func TestGetProject(t *testing.T) {
 	resp, err := ts.Get(ctx, tgr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetProject())
-	assert.Equal(t, tgr.Id, resp.GetProject().GetMeta().GetId())
+	assert.NotNil(t, resp.Project)
+	assert.Equal(t, tgr.Id, resp.Project.GetMeta().GetId())
 }
 
 func TestFindProject(t *testing.T) {
diff --git a/pkg/service/projectmember.go b/pkg/service/projectmember.go
index e3acf11..4445e9a 100644
--- a/pkg/service/projectmember.go
+++ b/pkg/service/projectmember.go
@@ -79,7 +79,9 @@ func (s *projectMemberService) Update(ctx context.Context, req *v1.ProjectMember
 
 func (s *projectMemberService) Delete(ctx context.Context, req *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error) {
 	projectMember := req.NewProjectMember()
+
 	err := s.projectMemberStore.Delete(ctx, projectMember.Meta.Id)
+
 	return projectMember.NewProjectMemberResponse(), err
 }
 
@@ -88,6 +90,7 @@ func (s *projectMemberService) Get(ctx context.Context, req *v1.ProjectMemberGet
 	if err != nil {
 		return nil, err
 	}
+
 	return projectMember.NewProjectMemberResponse(), nil
 }
 
diff --git a/pkg/service/projectmember_test.go b/pkg/service/projectmember_test.go
index 5765820..a39c690 100644
--- a/pkg/service/projectmember_test.go
+++ b/pkg/service/projectmember_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/runtime/protoimpl"
 
 	"testing"
 
@@ -49,8 +48,8 @@ func TestCreateProjectMember(t *testing.T) {
 	resp, err := ts.Create(ctx, pmcr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetProjectMember())
-	assert.Equal(t, pmcr.ProjectMember.ProjectId, resp.GetProjectMember().GetProjectId())
+	assert.NotNil(t, resp.ProjectMember)
+	assert.Equal(t, pmcr.ProjectMember.ProjectId, resp.ProjectMember.GetProjectId())
 }
 
 func TestDeleteProjectMember(t *testing.T) {
@@ -75,8 +74,8 @@ func TestDeleteProjectMember(t *testing.T) {
 	resp, err := ts.Delete(ctx, tdr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetProjectMember())
-	assert.Equal(t, tdr.Id, resp.GetProjectMember().GetMeta().GetId())
+	assert.NotNil(t, resp.ProjectMember)
+	assert.Equal(t, tdr.Id, resp.ProjectMember.GetMeta().GetId())
 }
 
 func TestGetProjectMember(t *testing.T) {
@@ -101,8 +100,8 @@ func TestGetProjectMember(t *testing.T) {
 	resp, err := ts.Get(ctx, tgr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetProjectMember())
-	assert.Equal(t, tgr.Id, resp.GetProjectMember().GetMeta().GetId())
+	assert.NotNil(t, resp.ProjectMember)
+	assert.Equal(t, tgr.Id, resp.ProjectMember.GetMeta().GetId())
 }
 
 func TestFindProjectMember(t *testing.T) {
@@ -367,7 +366,7 @@ func TestFindProjectMember(t *testing.T) {
 				}
 			})
 
-			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreTypes(protoimpl.MessageState{}), cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime"), testcommon.IgnoreUnexported()); diff != "" {
+			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime"), testcommon.IgnoreUnexported()); diff != "" {
 				t.Errorf("(-want +got):\n%s", diff)
 			}
 		})
@@ -568,7 +567,7 @@ func TestUpdateProjectMember(t *testing.T) {
 				assert.NotNil(t, got.ProjectMember.Meta.UpdatedTime)
 			}
 
-			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreTypes(protoimpl.MessageState{}), cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime", "UpdatedTime"), testcommon.IgnoreUnexported()); diff != "" {
+			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime", "UpdatedTime"), testcommon.IgnoreUnexported()); diff != "" {
 				t.Errorf("(-want +got):\n%s", diff)
 			}
 		})
diff --git a/pkg/service/tenant_test.go b/pkg/service/tenant_test.go
index daedfea..c73f103 100644
--- a/pkg/service/tenant_test.go
+++ b/pkg/service/tenant_test.go
@@ -59,8 +59,8 @@ func TestCreateTenant(t *testing.T) {
 	resp, err := ts.Create(ctx, tcr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetTenant())
-	assert.Equal(t, tcr.Tenant.GetName(), resp.GetTenant().GetName())
+	assert.NotNil(t, resp.Tenant)
+	assert.Equal(t, tcr.Tenant.GetName(), resp.Tenant.GetName())
 }
 
 func TestUpdateTenant(t *testing.T) {
@@ -83,8 +83,8 @@ func TestUpdateTenant(t *testing.T) {
 	resp, err := ts.Update(ctx, tur)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetTenant())
-	assert.Equal(t, tur.Tenant.GetName(), resp.GetTenant().GetName())
+	assert.NotNil(t, resp.Tenant)
+	assert.Equal(t, tur.Tenant.GetName(), resp.Tenant.GetName())
 }
 
 func TestDeleteTenant(t *testing.T) {
@@ -133,8 +133,8 @@ func TestDeleteTenant(t *testing.T) {
 	resp, err := ts.Delete(ctx, tdr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetTenant())
-	assert.Equal(t, tdr.Id, resp.GetTenant().GetMeta().GetId())
+	assert.NotNil(t, resp.Tenant)
+	assert.Equal(t, tdr.Id, resp.Tenant.GetMeta().GetId())
 }
 
 func TestGetTenant(t *testing.T) {
@@ -155,8 +155,8 @@ func TestGetTenant(t *testing.T) {
 	resp, err := ts.Get(ctx, tgr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetTenant())
-	assert.Equal(t, tgr.Id, resp.GetTenant().GetMeta().GetId())
+	assert.NotNil(t, resp.Tenant)
+	assert.Equal(t, tgr.Id, resp.Tenant.GetMeta().GetId())
 }
 
 func TestFindTenant(t *testing.T) {
@@ -981,6 +981,7 @@ func Test_tenantService_FindParticipatingTenants(t *testing.T) {
 					return 1
 				}
 			})
+
 			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreTypes(protoimpl.MessageState{}), cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime"), testcommon.IgnoreUnexported()); diff != "" {
 				t.Errorf("(-want +got):\n%s", diff)
 			}
@@ -1259,7 +1260,7 @@ func Test_tenantService_ListTenantMembers(t *testing.T) {
 				}
 			})
 
-			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreTypes(protoimpl.MessageState{}), cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime"), testcommon.IgnoreUnexported()); diff != "" {
+			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime"), testcommon.IgnoreUnexported()); diff != "" {
 				t.Errorf("(-want +got):\n%s", diff)
 			}
 		})
diff --git a/pkg/service/tenantmember.go b/pkg/service/tenantmember.go
index 3a0a019..e3ad4a7 100644
--- a/pkg/service/tenantmember.go
+++ b/pkg/service/tenantmember.go
@@ -36,19 +36,13 @@ func (s *tenantMemberService) Create(ctx context.Context, req *v1.TenantMemberCr
 		return nil, err
 	}
 
-	_, err = s.tenantStore.Get(ctx, tenantMember.GetMemberId())
-	if err != nil && v1.IsNotFound(err) {
-		return nil, status.Error(codes.NotFound, fmt.Sprintf("unable to find member:%s for tenantMember", tenantMember.GetMemberId()))
-	}
-	if err != nil {
-		return nil, err
-	}
-
 	// allow create without sending Meta
 	if tenantMember.Meta == nil {
 		tenantMember.Meta = &v1.Meta{}
 	}
+
 	err = s.tenantMemberStore.Create(ctx, tenantMember)
+
 	return tenantMember.NewTenantMemberResponse(), err
 }
 
@@ -77,7 +71,9 @@ func (s *tenantMemberService) Update(ctx context.Context, req *v1.TenantMemberUp
 
 func (s *tenantMemberService) Delete(ctx context.Context, req *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error) {
 	tenantMember := req.NewTenantMember()
+
 	err := s.tenantMemberStore.Delete(ctx, tenantMember.Meta.Id)
+
 	return tenantMember.NewTenantMemberResponse(), err
 }
 
diff --git a/pkg/service/tenantmember_test.go b/pkg/service/tenantmember_test.go
index ebd5207..895d45d 100644
--- a/pkg/service/tenantmember_test.go
+++ b/pkg/service/tenantmember_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/runtime/protoimpl"
 
 	"testing"
 
@@ -33,7 +32,6 @@ func TestCreateTenantMember(t *testing.T) {
 	ctx := context.Background()
 
 	t1 := &v1.Tenant{}
-	m1 := &v1.Tenant{}
 	pm1 := &v1.TenantMember{
 		TenantId: "t1",
 		MemberId: "m1",
@@ -42,13 +40,12 @@ func TestCreateTenantMember(t *testing.T) {
 		TenantMember: pm1,
 	}
 	tenantStorageMock.On("Get", ctx, pm1.GetTenantId()).Return(t1, nil)
-	tenantStorageMock.On("Get", ctx, pm1.GetMemberId()).Return(m1, nil)
 	storageMock.On("Create", ctx, pm1).Return(nil)
 	resp, err := ts.Create(ctx, pmcr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetTenantMember())
-	assert.Equal(t, pmcr.TenantMember.TenantId, resp.GetTenantMember().GetTenantId())
+	assert.NotNil(t, resp.TenantMember)
+	assert.Equal(t, pmcr.TenantMember.TenantId, resp.TenantMember.GetTenantId())
 }
 
 func TestDeleteTenantMember(t *testing.T) {
@@ -71,8 +68,8 @@ func TestDeleteTenantMember(t *testing.T) {
 	resp, err := ts.Delete(ctx, tdr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetTenantMember())
-	assert.Equal(t, tdr.Id, resp.GetTenantMember().GetMeta().GetId())
+	assert.NotNil(t, resp.TenantMember)
+	assert.Equal(t, tdr.Id, resp.TenantMember.GetMeta().GetId())
 }
 
 func TestGetTenantMember(t *testing.T) {
@@ -95,8 +92,8 @@ func TestGetTenantMember(t *testing.T) {
 	resp, err := ts.Get(ctx, tgr)
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
-	assert.NotNil(t, resp.GetTenantMember())
-	assert.Equal(t, tgr.Id, resp.GetTenantMember().GetMeta().GetId())
+	assert.NotNil(t, resp.TenantMember)
+	assert.Equal(t, tgr.Id, resp.TenantMember.GetMeta().GetId())
 }
 
 func TestFindTenantMember(t *testing.T) {
@@ -341,7 +338,7 @@ func TestFindTenantMember(t *testing.T) {
 				}
 			})
 
-			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreTypes(protoimpl.MessageState{}), cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime"), testcommon.IgnoreUnexported()); diff != "" {
+			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime"), testcommon.IgnoreUnexported()); diff != "" {
 				t.Errorf("(-want +got):\n%s", diff)
 			}
 		})
@@ -538,7 +535,7 @@ func TestUpdateTenantMember(t *testing.T) {
 				assert.NotNil(t, got.TenantMember.Meta.UpdatedTime)
 			}
 
-			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreTypes(protoimpl.MessageState{}), cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime", "UpdatedTime"), testcommon.IgnoreUnexported()); diff != "" {
+			if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreFields(v1.Meta{}, "CreatedTime", "UpdatedTime"), testcommon.IgnoreUnexported()); diff != "" {
 				t.Errorf("(-want +got):\n%s", diff)
 			}
 		})
diff --git a/pkg/service/version.go b/pkg/service/version.go
index 93d99a7..ae899cd 100644
--- a/pkg/service/version.go
+++ b/pkg/service/version.go
@@ -13,7 +13,7 @@ type versionService struct {
 func NewVersionService() *versionService {
 	return &versionService{}
 }
-func (vs *versionService) Get(ctx context.Context, request *v1.GetVersionRequest) (*v1.GetVersionResponse, error) {
-	res := v1.GetVersionResponse{Version: v.Version, Revision: v.Revision, BuildDate: v.BuildDate, GitSha1: v.GitSHA1}
-	return &res, nil
+func (vs *versionService) Get(context.Context, *v1.GetVersionRequest) (*v1.GetVersionResponse, error) {
+	res := &v1.GetVersionResponse{Version: v.Version, Revision: v.Revision, BuildDate: v.BuildDate, GitSha1: v.GitSHA1}
+	return res, nil
 }
diff --git a/pkg/test/mocks/Entity.go b/pkg/test/mocks/Entity.go
index 4d06bf9..3f1674a 100644
--- a/pkg/test/mocks/Entity.go
+++ b/pkg/test/mocks/Entity.go
@@ -81,19 +81,19 @@ func (_c *MockEntity_APIVersion_Call) RunAndReturn(run func() string) *MockEntit
 }
 
 // GetMeta provides a mock function for the type MockEntity
-func (_mock *MockEntity) GetMeta() *v1.Meta {
+func (_mock *MockEntity) GetMeta() *apiv1.Meta {
 	ret := _mock.Called()
 
 	if len(ret) == 0 {
 		panic("no return value specified for GetMeta")
 	}
 
-	var r0 *v1.Meta
-	if returnFunc, ok := ret.Get(0).(func() *v1.Meta); ok {
+	var r0 *apiv1.Meta
+	if returnFunc, ok := ret.Get(0).(func() *apiv1.Meta); ok {
 		r0 = returnFunc()
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.Meta)
+			r0 = ret.Get(0).(*apiv1.Meta)
 		}
 	}
 	return r0
@@ -116,12 +116,12 @@ func (_c *MockEntity_GetMeta_Call) Run(run func()) *MockEntity_GetMeta_Call {
 	return _c
 }
 
-func (_c *MockEntity_GetMeta_Call) Return(meta *v1.Meta) *MockEntity_GetMeta_Call {
+func (_c *MockEntity_GetMeta_Call) Return(meta *apiv1.Meta) *MockEntity_GetMeta_Call {
 	_c.Call.Return(meta)
 	return _c
 }
 
-func (_c *MockEntity_GetMeta_Call) RunAndReturn(run func() *v1.Meta) *MockEntity_GetMeta_Call {
+func (_c *MockEntity_GetMeta_Call) RunAndReturn(run func() *apiv1.Meta) *MockEntity_GetMeta_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/test/mocks/ProjectMemberServiceClient.go b/pkg/test/mocks/ProjectMemberServiceClient.go
index c708350..5620576 100644
--- a/pkg/test/mocks/ProjectMemberServiceClient.go
+++ b/pkg/test/mocks/ProjectMemberServiceClient.go
@@ -7,9 +7,9 @@ package mocks
 import (
 	"context"
 
+	"connectrpc.com/connect"
 	"github.com/metal-stack/masterdata-api/api/v1"
 	mock "github.com/stretchr/testify/mock"
-	"google.golang.org/grpc"
 )
 
 // NewMockProjectMemberServiceClient creates a new instance of MockProjectMemberServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
@@ -40,33 +40,27 @@ func (_m *MockProjectMemberServiceClient) EXPECT() *MockProjectMemberServiceClie
 }
 
 // Create provides a mock function for the type MockProjectMemberServiceClient
-func (_mock *MockProjectMemberServiceClient) Create(ctx context.Context, in *v1.ProjectMemberCreateRequest, opts ...grpc.CallOption) (*v1.ProjectMemberResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectMemberServiceClient) Create(context1 context.Context, request *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Create")
 	}
 
-	var r0 *v1.ProjectMemberResponse
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberCreateRequest, ...grpc.CallOption) (*v1.ProjectMemberResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberCreateRequest, ...grpc.CallOption) *v1.ProjectMemberResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberCreateRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -79,77 +73,62 @@ type MockProjectMemberServiceClient_Create_Call struct {
 }
 
 // Create is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectMemberCreateRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectMemberServiceClient_Expecter) Create(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectMemberServiceClient_Create_Call {
-	return &MockProjectMemberServiceClient_Create_Call{Call: _e.mock.On("Create",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberCreateRequest]
+func (_e *MockProjectMemberServiceClient_Expecter) Create(context1 interface{}, request interface{}) *MockProjectMemberServiceClient_Create_Call {
+	return &MockProjectMemberServiceClient_Create_Call{Call: _e.mock.On("Create", context1, request)}
 }
 
-func (_c *MockProjectMemberServiceClient_Create_Call) Run(run func(ctx context.Context, in *v1.ProjectMemberCreateRequest, opts ...grpc.CallOption)) *MockProjectMemberServiceClient_Create_Call {
+func (_c *MockProjectMemberServiceClient_Create_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberCreateRequest])) *MockProjectMemberServiceClient_Create_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectMemberCreateRequest
+		var arg1 *connect.Request[apiv1.ProjectMemberCreateRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberCreateRequest)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberCreateRequest])
 		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
-		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Create_Call) Return(projectMemberResponse *v1.ProjectMemberResponse, err error) *MockProjectMemberServiceClient_Create_Call {
-	_c.Call.Return(projectMemberResponse, err)
+func (_c *MockProjectMemberServiceClient_Create_Call) Return(response *connect.Response[apiv1.ProjectMemberResponse], err error) *MockProjectMemberServiceClient_Create_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Create_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectMemberCreateRequest, opts ...grpc.CallOption) (*v1.ProjectMemberResponse, error)) *MockProjectMemberServiceClient_Create_Call {
+func (_c *MockProjectMemberServiceClient_Create_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)) *MockProjectMemberServiceClient_Create_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Delete provides a mock function for the type MockProjectMemberServiceClient
-func (_mock *MockProjectMemberServiceClient) Delete(ctx context.Context, in *v1.ProjectMemberDeleteRequest, opts ...grpc.CallOption) (*v1.ProjectMemberResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectMemberServiceClient) Delete(context1 context.Context, request *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Delete")
 	}
 
-	var r0 *v1.ProjectMemberResponse
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberDeleteRequest, ...grpc.CallOption) (*v1.ProjectMemberResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberDeleteRequest, ...grpc.CallOption) *v1.ProjectMemberResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberDeleteRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -162,77 +141,62 @@ type MockProjectMemberServiceClient_Delete_Call struct {
 }
 
 // Delete is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectMemberDeleteRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectMemberServiceClient_Expecter) Delete(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectMemberServiceClient_Delete_Call {
-	return &MockProjectMemberServiceClient_Delete_Call{Call: _e.mock.On("Delete",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberDeleteRequest]
+func (_e *MockProjectMemberServiceClient_Expecter) Delete(context1 interface{}, request interface{}) *MockProjectMemberServiceClient_Delete_Call {
+	return &MockProjectMemberServiceClient_Delete_Call{Call: _e.mock.On("Delete", context1, request)}
 }
 
-func (_c *MockProjectMemberServiceClient_Delete_Call) Run(run func(ctx context.Context, in *v1.ProjectMemberDeleteRequest, opts ...grpc.CallOption)) *MockProjectMemberServiceClient_Delete_Call {
+func (_c *MockProjectMemberServiceClient_Delete_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberDeleteRequest])) *MockProjectMemberServiceClient_Delete_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectMemberDeleteRequest
+		var arg1 *connect.Request[apiv1.ProjectMemberDeleteRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberDeleteRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberDeleteRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Delete_Call) Return(projectMemberResponse *v1.ProjectMemberResponse, err error) *MockProjectMemberServiceClient_Delete_Call {
-	_c.Call.Return(projectMemberResponse, err)
+func (_c *MockProjectMemberServiceClient_Delete_Call) Return(response *connect.Response[apiv1.ProjectMemberResponse], err error) *MockProjectMemberServiceClient_Delete_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Delete_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectMemberDeleteRequest, opts ...grpc.CallOption) (*v1.ProjectMemberResponse, error)) *MockProjectMemberServiceClient_Delete_Call {
+func (_c *MockProjectMemberServiceClient_Delete_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)) *MockProjectMemberServiceClient_Delete_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Find provides a mock function for the type MockProjectMemberServiceClient
-func (_mock *MockProjectMemberServiceClient) Find(ctx context.Context, in *v1.ProjectMemberFindRequest, opts ...grpc.CallOption) (*v1.ProjectMemberListResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectMemberServiceClient) Find(context1 context.Context, request *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Find")
 	}
 
-	var r0 *v1.ProjectMemberListResponse
+	var r0 *connect.Response[apiv1.ProjectMemberListResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberFindRequest, ...grpc.CallOption) (*v1.ProjectMemberListResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberFindRequest, ...grpc.CallOption) *v1.ProjectMemberListResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) *connect.Response[apiv1.ProjectMemberListResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberListResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberListResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberFindRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -245,77 +209,62 @@ type MockProjectMemberServiceClient_Find_Call struct {
 }
 
 // Find is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectMemberFindRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectMemberServiceClient_Expecter) Find(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectMemberServiceClient_Find_Call {
-	return &MockProjectMemberServiceClient_Find_Call{Call: _e.mock.On("Find",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberFindRequest]
+func (_e *MockProjectMemberServiceClient_Expecter) Find(context1 interface{}, request interface{}) *MockProjectMemberServiceClient_Find_Call {
+	return &MockProjectMemberServiceClient_Find_Call{Call: _e.mock.On("Find", context1, request)}
 }
 
-func (_c *MockProjectMemberServiceClient_Find_Call) Run(run func(ctx context.Context, in *v1.ProjectMemberFindRequest, opts ...grpc.CallOption)) *MockProjectMemberServiceClient_Find_Call {
+func (_c *MockProjectMemberServiceClient_Find_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberFindRequest])) *MockProjectMemberServiceClient_Find_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectMemberFindRequest
+		var arg1 *connect.Request[apiv1.ProjectMemberFindRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberFindRequest)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberFindRequest])
 		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
-		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Find_Call) Return(projectMemberListResponse *v1.ProjectMemberListResponse, err error) *MockProjectMemberServiceClient_Find_Call {
-	_c.Call.Return(projectMemberListResponse, err)
+func (_c *MockProjectMemberServiceClient_Find_Call) Return(response *connect.Response[apiv1.ProjectMemberListResponse], err error) *MockProjectMemberServiceClient_Find_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Find_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectMemberFindRequest, opts ...grpc.CallOption) (*v1.ProjectMemberListResponse, error)) *MockProjectMemberServiceClient_Find_Call {
+func (_c *MockProjectMemberServiceClient_Find_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error)) *MockProjectMemberServiceClient_Find_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Get provides a mock function for the type MockProjectMemberServiceClient
-func (_mock *MockProjectMemberServiceClient) Get(ctx context.Context, in *v1.ProjectMemberGetRequest, opts ...grpc.CallOption) (*v1.ProjectMemberResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectMemberServiceClient) Get(context1 context.Context, request *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Get")
 	}
 
-	var r0 *v1.ProjectMemberResponse
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberGetRequest, ...grpc.CallOption) (*v1.ProjectMemberResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberGetRequest, ...grpc.CallOption) *v1.ProjectMemberResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberGetRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -328,77 +277,62 @@ type MockProjectMemberServiceClient_Get_Call struct {
 }
 
 // Get is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectMemberGetRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectMemberServiceClient_Expecter) Get(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectMemberServiceClient_Get_Call {
-	return &MockProjectMemberServiceClient_Get_Call{Call: _e.mock.On("Get",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberGetRequest]
+func (_e *MockProjectMemberServiceClient_Expecter) Get(context1 interface{}, request interface{}) *MockProjectMemberServiceClient_Get_Call {
+	return &MockProjectMemberServiceClient_Get_Call{Call: _e.mock.On("Get", context1, request)}
 }
 
-func (_c *MockProjectMemberServiceClient_Get_Call) Run(run func(ctx context.Context, in *v1.ProjectMemberGetRequest, opts ...grpc.CallOption)) *MockProjectMemberServiceClient_Get_Call {
+func (_c *MockProjectMemberServiceClient_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberGetRequest])) *MockProjectMemberServiceClient_Get_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectMemberGetRequest
+		var arg1 *connect.Request[apiv1.ProjectMemberGetRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberGetRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberGetRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Get_Call) Return(projectMemberResponse *v1.ProjectMemberResponse, err error) *MockProjectMemberServiceClient_Get_Call {
-	_c.Call.Return(projectMemberResponse, err)
+func (_c *MockProjectMemberServiceClient_Get_Call) Return(response *connect.Response[apiv1.ProjectMemberResponse], err error) *MockProjectMemberServiceClient_Get_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Get_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectMemberGetRequest, opts ...grpc.CallOption) (*v1.ProjectMemberResponse, error)) *MockProjectMemberServiceClient_Get_Call {
+func (_c *MockProjectMemberServiceClient_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)) *MockProjectMemberServiceClient_Get_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Update provides a mock function for the type MockProjectMemberServiceClient
-func (_mock *MockProjectMemberServiceClient) Update(ctx context.Context, in *v1.ProjectMemberUpdateRequest, opts ...grpc.CallOption) (*v1.ProjectMemberResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectMemberServiceClient) Update(context1 context.Context, request *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Update")
 	}
 
-	var r0 *v1.ProjectMemberResponse
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberUpdateRequest, ...grpc.CallOption) (*v1.ProjectMemberResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberUpdateRequest, ...grpc.CallOption) *v1.ProjectMemberResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberUpdateRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -411,45 +345,36 @@ type MockProjectMemberServiceClient_Update_Call struct {
 }
 
 // Update is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectMemberUpdateRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectMemberServiceClient_Expecter) Update(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectMemberServiceClient_Update_Call {
-	return &MockProjectMemberServiceClient_Update_Call{Call: _e.mock.On("Update",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberUpdateRequest]
+func (_e *MockProjectMemberServiceClient_Expecter) Update(context1 interface{}, request interface{}) *MockProjectMemberServiceClient_Update_Call {
+	return &MockProjectMemberServiceClient_Update_Call{Call: _e.mock.On("Update", context1, request)}
 }
 
-func (_c *MockProjectMemberServiceClient_Update_Call) Run(run func(ctx context.Context, in *v1.ProjectMemberUpdateRequest, opts ...grpc.CallOption)) *MockProjectMemberServiceClient_Update_Call {
+func (_c *MockProjectMemberServiceClient_Update_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberUpdateRequest])) *MockProjectMemberServiceClient_Update_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectMemberUpdateRequest
+		var arg1 *connect.Request[apiv1.ProjectMemberUpdateRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberUpdateRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberUpdateRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Update_Call) Return(projectMemberResponse *v1.ProjectMemberResponse, err error) *MockProjectMemberServiceClient_Update_Call {
-	_c.Call.Return(projectMemberResponse, err)
+func (_c *MockProjectMemberServiceClient_Update_Call) Return(response *connect.Response[apiv1.ProjectMemberResponse], err error) *MockProjectMemberServiceClient_Update_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectMemberServiceClient_Update_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectMemberUpdateRequest, opts ...grpc.CallOption) (*v1.ProjectMemberResponse, error)) *MockProjectMemberServiceClient_Update_Call {
+func (_c *MockProjectMemberServiceClient_Update_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)) *MockProjectMemberServiceClient_Update_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/test/mocks/ProjectMemberServiceHandler.go b/pkg/test/mocks/ProjectMemberServiceHandler.go
new file mode 100644
index 0000000..115a744
--- /dev/null
+++ b/pkg/test/mocks/ProjectMemberServiceHandler.go
@@ -0,0 +1,380 @@
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
+
+package mocks
+
+import (
+	"context"
+
+	"connectrpc.com/connect"
+	"github.com/metal-stack/masterdata-api/api/v1"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// NewMockProjectMemberServiceHandler creates a new instance of MockProjectMemberServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockProjectMemberServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockProjectMemberServiceHandler {
+	mock := &MockProjectMemberServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
+// MockProjectMemberServiceHandler is an autogenerated mock type for the ProjectMemberServiceHandler type
+type MockProjectMemberServiceHandler struct {
+	mock.Mock
+}
+
+type MockProjectMemberServiceHandler_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *MockProjectMemberServiceHandler) EXPECT() *MockProjectMemberServiceHandler_Expecter {
+	return &MockProjectMemberServiceHandler_Expecter{mock: &_m.Mock}
+}
+
+// Create provides a mock function for the type MockProjectMemberServiceHandler
+func (_mock *MockProjectMemberServiceHandler) Create(context1 context.Context, request *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberCreateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectMemberServiceHandler_Create_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Create'
+type MockProjectMemberServiceHandler_Create_Call struct {
+	*mock.Call
+}
+
+// Create is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberCreateRequest]
+func (_e *MockProjectMemberServiceHandler_Expecter) Create(context1 interface{}, request interface{}) *MockProjectMemberServiceHandler_Create_Call {
+	return &MockProjectMemberServiceHandler_Create_Call{Call: _e.mock.On("Create", context1, request)}
+}
+
+func (_c *MockProjectMemberServiceHandler_Create_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberCreateRequest])) *MockProjectMemberServiceHandler_Create_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectMemberCreateRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberCreateRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Create_Call) Return(response *connect.Response[apiv1.ProjectMemberResponse], err error) *MockProjectMemberServiceHandler_Create_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Create_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberCreateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)) *MockProjectMemberServiceHandler_Create_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Delete provides a mock function for the type MockProjectMemberServiceHandler
+func (_mock *MockProjectMemberServiceHandler) Delete(context1 context.Context, request *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberDeleteRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectMemberServiceHandler_Delete_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Delete'
+type MockProjectMemberServiceHandler_Delete_Call struct {
+	*mock.Call
+}
+
+// Delete is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberDeleteRequest]
+func (_e *MockProjectMemberServiceHandler_Expecter) Delete(context1 interface{}, request interface{}) *MockProjectMemberServiceHandler_Delete_Call {
+	return &MockProjectMemberServiceHandler_Delete_Call{Call: _e.mock.On("Delete", context1, request)}
+}
+
+func (_c *MockProjectMemberServiceHandler_Delete_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberDeleteRequest])) *MockProjectMemberServiceHandler_Delete_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectMemberDeleteRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberDeleteRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Delete_Call) Return(response *connect.Response[apiv1.ProjectMemberResponse], err error) *MockProjectMemberServiceHandler_Delete_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Delete_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberDeleteRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)) *MockProjectMemberServiceHandler_Delete_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Find provides a mock function for the type MockProjectMemberServiceHandler
+func (_mock *MockProjectMemberServiceHandler) Find(context1 context.Context, request *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberListResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) *connect.Response[apiv1.ProjectMemberListResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberListResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberFindRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectMemberServiceHandler_Find_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Find'
+type MockProjectMemberServiceHandler_Find_Call struct {
+	*mock.Call
+}
+
+// Find is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberFindRequest]
+func (_e *MockProjectMemberServiceHandler_Expecter) Find(context1 interface{}, request interface{}) *MockProjectMemberServiceHandler_Find_Call {
+	return &MockProjectMemberServiceHandler_Find_Call{Call: _e.mock.On("Find", context1, request)}
+}
+
+func (_c *MockProjectMemberServiceHandler_Find_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberFindRequest])) *MockProjectMemberServiceHandler_Find_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectMemberFindRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberFindRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Find_Call) Return(response *connect.Response[apiv1.ProjectMemberListResponse], err error) *MockProjectMemberServiceHandler_Find_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Find_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberFindRequest]) (*connect.Response[apiv1.ProjectMemberListResponse], error)) *MockProjectMemberServiceHandler_Find_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Get provides a mock function for the type MockProjectMemberServiceHandler
+func (_mock *MockProjectMemberServiceHandler) Get(context1 context.Context, request *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberGetRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectMemberServiceHandler_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
+type MockProjectMemberServiceHandler_Get_Call struct {
+	*mock.Call
+}
+
+// Get is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberGetRequest]
+func (_e *MockProjectMemberServiceHandler_Expecter) Get(context1 interface{}, request interface{}) *MockProjectMemberServiceHandler_Get_Call {
+	return &MockProjectMemberServiceHandler_Get_Call{Call: _e.mock.On("Get", context1, request)}
+}
+
+func (_c *MockProjectMemberServiceHandler_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberGetRequest])) *MockProjectMemberServiceHandler_Get_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectMemberGetRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberGetRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Get_Call) Return(response *connect.Response[apiv1.ProjectMemberResponse], err error) *MockProjectMemberServiceHandler_Get_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberGetRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)) *MockProjectMemberServiceHandler_Get_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Update provides a mock function for the type MockProjectMemberServiceHandler
+func (_mock *MockProjectMemberServiceHandler) Update(context1 context.Context, request *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectMemberResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) *connect.Response[apiv1.ProjectMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectMemberResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectMemberUpdateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectMemberServiceHandler_Update_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Update'
+type MockProjectMemberServiceHandler_Update_Call struct {
+	*mock.Call
+}
+
+// Update is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectMemberUpdateRequest]
+func (_e *MockProjectMemberServiceHandler_Expecter) Update(context1 interface{}, request interface{}) *MockProjectMemberServiceHandler_Update_Call {
+	return &MockProjectMemberServiceHandler_Update_Call{Call: _e.mock.On("Update", context1, request)}
+}
+
+func (_c *MockProjectMemberServiceHandler_Update_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberUpdateRequest])) *MockProjectMemberServiceHandler_Update_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectMemberUpdateRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectMemberUpdateRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Update_Call) Return(response *connect.Response[apiv1.ProjectMemberResponse], err error) *MockProjectMemberServiceHandler_Update_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectMemberServiceHandler_Update_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectMemberUpdateRequest]) (*connect.Response[apiv1.ProjectMemberResponse], error)) *MockProjectMemberServiceHandler_Update_Call {
+	_c.Call.Return(run)
+	return _c
+}
diff --git a/pkg/test/mocks/ProjectMemberServiceServer.go b/pkg/test/mocks/ProjectMemberServiceServer.go
deleted file mode 100644
index b9b24e7..0000000
--- a/pkg/test/mocks/ProjectMemberServiceServer.go
+++ /dev/null
@@ -1,379 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	"context"
-
-	"github.com/metal-stack/masterdata-api/api/v1"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockProjectMemberServiceServer creates a new instance of MockProjectMemberServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockProjectMemberServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockProjectMemberServiceServer {
-	mock := &MockProjectMemberServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockProjectMemberServiceServer is an autogenerated mock type for the ProjectMemberServiceServer type
-type MockProjectMemberServiceServer struct {
-	mock.Mock
-}
-
-type MockProjectMemberServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockProjectMemberServiceServer) EXPECT() *MockProjectMemberServiceServer_Expecter {
-	return &MockProjectMemberServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// Create provides a mock function for the type MockProjectMemberServiceServer
-func (_mock *MockProjectMemberServiceServer) Create(context1 context.Context, projectMemberCreateRequest *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error) {
-	ret := _mock.Called(context1, projectMemberCreateRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Create")
-	}
-
-	var r0 *v1.ProjectMemberResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error)); ok {
-		return returnFunc(context1, projectMemberCreateRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberCreateRequest) *v1.ProjectMemberResponse); ok {
-		r0 = returnFunc(context1, projectMemberCreateRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberCreateRequest) error); ok {
-		r1 = returnFunc(context1, projectMemberCreateRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectMemberServiceServer_Create_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Create'
-type MockProjectMemberServiceServer_Create_Call struct {
-	*mock.Call
-}
-
-// Create is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectMemberCreateRequest *v1.ProjectMemberCreateRequest
-func (_e *MockProjectMemberServiceServer_Expecter) Create(context1 interface{}, projectMemberCreateRequest interface{}) *MockProjectMemberServiceServer_Create_Call {
-	return &MockProjectMemberServiceServer_Create_Call{Call: _e.mock.On("Create", context1, projectMemberCreateRequest)}
-}
-
-func (_c *MockProjectMemberServiceServer_Create_Call) Run(run func(context1 context.Context, projectMemberCreateRequest *v1.ProjectMemberCreateRequest)) *MockProjectMemberServiceServer_Create_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectMemberCreateRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberCreateRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Create_Call) Return(projectMemberResponse *v1.ProjectMemberResponse, err error) *MockProjectMemberServiceServer_Create_Call {
-	_c.Call.Return(projectMemberResponse, err)
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Create_Call) RunAndReturn(run func(context1 context.Context, projectMemberCreateRequest *v1.ProjectMemberCreateRequest) (*v1.ProjectMemberResponse, error)) *MockProjectMemberServiceServer_Create_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Delete provides a mock function for the type MockProjectMemberServiceServer
-func (_mock *MockProjectMemberServiceServer) Delete(context1 context.Context, projectMemberDeleteRequest *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error) {
-	ret := _mock.Called(context1, projectMemberDeleteRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Delete")
-	}
-
-	var r0 *v1.ProjectMemberResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error)); ok {
-		return returnFunc(context1, projectMemberDeleteRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberDeleteRequest) *v1.ProjectMemberResponse); ok {
-		r0 = returnFunc(context1, projectMemberDeleteRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberDeleteRequest) error); ok {
-		r1 = returnFunc(context1, projectMemberDeleteRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectMemberServiceServer_Delete_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Delete'
-type MockProjectMemberServiceServer_Delete_Call struct {
-	*mock.Call
-}
-
-// Delete is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectMemberDeleteRequest *v1.ProjectMemberDeleteRequest
-func (_e *MockProjectMemberServiceServer_Expecter) Delete(context1 interface{}, projectMemberDeleteRequest interface{}) *MockProjectMemberServiceServer_Delete_Call {
-	return &MockProjectMemberServiceServer_Delete_Call{Call: _e.mock.On("Delete", context1, projectMemberDeleteRequest)}
-}
-
-func (_c *MockProjectMemberServiceServer_Delete_Call) Run(run func(context1 context.Context, projectMemberDeleteRequest *v1.ProjectMemberDeleteRequest)) *MockProjectMemberServiceServer_Delete_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectMemberDeleteRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberDeleteRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Delete_Call) Return(projectMemberResponse *v1.ProjectMemberResponse, err error) *MockProjectMemberServiceServer_Delete_Call {
-	_c.Call.Return(projectMemberResponse, err)
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Delete_Call) RunAndReturn(run func(context1 context.Context, projectMemberDeleteRequest *v1.ProjectMemberDeleteRequest) (*v1.ProjectMemberResponse, error)) *MockProjectMemberServiceServer_Delete_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Find provides a mock function for the type MockProjectMemberServiceServer
-func (_mock *MockProjectMemberServiceServer) Find(context1 context.Context, projectMemberFindRequest *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error) {
-	ret := _mock.Called(context1, projectMemberFindRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Find")
-	}
-
-	var r0 *v1.ProjectMemberListResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error)); ok {
-		return returnFunc(context1, projectMemberFindRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberFindRequest) *v1.ProjectMemberListResponse); ok {
-		r0 = returnFunc(context1, projectMemberFindRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberListResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberFindRequest) error); ok {
-		r1 = returnFunc(context1, projectMemberFindRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectMemberServiceServer_Find_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Find'
-type MockProjectMemberServiceServer_Find_Call struct {
-	*mock.Call
-}
-
-// Find is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectMemberFindRequest *v1.ProjectMemberFindRequest
-func (_e *MockProjectMemberServiceServer_Expecter) Find(context1 interface{}, projectMemberFindRequest interface{}) *MockProjectMemberServiceServer_Find_Call {
-	return &MockProjectMemberServiceServer_Find_Call{Call: _e.mock.On("Find", context1, projectMemberFindRequest)}
-}
-
-func (_c *MockProjectMemberServiceServer_Find_Call) Run(run func(context1 context.Context, projectMemberFindRequest *v1.ProjectMemberFindRequest)) *MockProjectMemberServiceServer_Find_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectMemberFindRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberFindRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Find_Call) Return(projectMemberListResponse *v1.ProjectMemberListResponse, err error) *MockProjectMemberServiceServer_Find_Call {
-	_c.Call.Return(projectMemberListResponse, err)
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Find_Call) RunAndReturn(run func(context1 context.Context, projectMemberFindRequest *v1.ProjectMemberFindRequest) (*v1.ProjectMemberListResponse, error)) *MockProjectMemberServiceServer_Find_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Get provides a mock function for the type MockProjectMemberServiceServer
-func (_mock *MockProjectMemberServiceServer) Get(context1 context.Context, projectMemberGetRequest *v1.ProjectMemberGetRequest) (*v1.ProjectMemberResponse, error) {
-	ret := _mock.Called(context1, projectMemberGetRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Get")
-	}
-
-	var r0 *v1.ProjectMemberResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberGetRequest) (*v1.ProjectMemberResponse, error)); ok {
-		return returnFunc(context1, projectMemberGetRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberGetRequest) *v1.ProjectMemberResponse); ok {
-		r0 = returnFunc(context1, projectMemberGetRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberGetRequest) error); ok {
-		r1 = returnFunc(context1, projectMemberGetRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectMemberServiceServer_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
-type MockProjectMemberServiceServer_Get_Call struct {
-	*mock.Call
-}
-
-// Get is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectMemberGetRequest *v1.ProjectMemberGetRequest
-func (_e *MockProjectMemberServiceServer_Expecter) Get(context1 interface{}, projectMemberGetRequest interface{}) *MockProjectMemberServiceServer_Get_Call {
-	return &MockProjectMemberServiceServer_Get_Call{Call: _e.mock.On("Get", context1, projectMemberGetRequest)}
-}
-
-func (_c *MockProjectMemberServiceServer_Get_Call) Run(run func(context1 context.Context, projectMemberGetRequest *v1.ProjectMemberGetRequest)) *MockProjectMemberServiceServer_Get_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectMemberGetRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberGetRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Get_Call) Return(projectMemberResponse *v1.ProjectMemberResponse, err error) *MockProjectMemberServiceServer_Get_Call {
-	_c.Call.Return(projectMemberResponse, err)
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Get_Call) RunAndReturn(run func(context1 context.Context, projectMemberGetRequest *v1.ProjectMemberGetRequest) (*v1.ProjectMemberResponse, error)) *MockProjectMemberServiceServer_Get_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Update provides a mock function for the type MockProjectMemberServiceServer
-func (_mock *MockProjectMemberServiceServer) Update(context1 context.Context, projectMemberUpdateRequest *v1.ProjectMemberUpdateRequest) (*v1.ProjectMemberResponse, error) {
-	ret := _mock.Called(context1, projectMemberUpdateRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Update")
-	}
-
-	var r0 *v1.ProjectMemberResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberUpdateRequest) (*v1.ProjectMemberResponse, error)); ok {
-		return returnFunc(context1, projectMemberUpdateRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectMemberUpdateRequest) *v1.ProjectMemberResponse); ok {
-		r0 = returnFunc(context1, projectMemberUpdateRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectMemberResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectMemberUpdateRequest) error); ok {
-		r1 = returnFunc(context1, projectMemberUpdateRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectMemberServiceServer_Update_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Update'
-type MockProjectMemberServiceServer_Update_Call struct {
-	*mock.Call
-}
-
-// Update is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectMemberUpdateRequest *v1.ProjectMemberUpdateRequest
-func (_e *MockProjectMemberServiceServer_Expecter) Update(context1 interface{}, projectMemberUpdateRequest interface{}) *MockProjectMemberServiceServer_Update_Call {
-	return &MockProjectMemberServiceServer_Update_Call{Call: _e.mock.On("Update", context1, projectMemberUpdateRequest)}
-}
-
-func (_c *MockProjectMemberServiceServer_Update_Call) Run(run func(context1 context.Context, projectMemberUpdateRequest *v1.ProjectMemberUpdateRequest)) *MockProjectMemberServiceServer_Update_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectMemberUpdateRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectMemberUpdateRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Update_Call) Return(projectMemberResponse *v1.ProjectMemberResponse, err error) *MockProjectMemberServiceServer_Update_Call {
-	_c.Call.Return(projectMemberResponse, err)
-	return _c
-}
-
-func (_c *MockProjectMemberServiceServer_Update_Call) RunAndReturn(run func(context1 context.Context, projectMemberUpdateRequest *v1.ProjectMemberUpdateRequest) (*v1.ProjectMemberResponse, error)) *MockProjectMemberServiceServer_Update_Call {
-	_c.Call.Return(run)
-	return _c
-}
diff --git a/pkg/test/mocks/ProjectServiceClient.go b/pkg/test/mocks/ProjectServiceClient.go
index 8c4d1d5..513825b 100644
--- a/pkg/test/mocks/ProjectServiceClient.go
+++ b/pkg/test/mocks/ProjectServiceClient.go
@@ -7,9 +7,9 @@ package mocks
 import (
 	"context"
 
+	"connectrpc.com/connect"
 	"github.com/metal-stack/masterdata-api/api/v1"
 	mock "github.com/stretchr/testify/mock"
-	"google.golang.org/grpc"
 )
 
 // NewMockProjectServiceClient creates a new instance of MockProjectServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
@@ -40,33 +40,27 @@ func (_m *MockProjectServiceClient) EXPECT() *MockProjectServiceClient_Expecter
 }
 
 // Create provides a mock function for the type MockProjectServiceClient
-func (_mock *MockProjectServiceClient) Create(ctx context.Context, in *v1.ProjectCreateRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectServiceClient) Create(context1 context.Context, request *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Create")
 	}
 
-	var r0 *v1.ProjectResponse
+	var r0 *connect.Response[apiv1.ProjectResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectCreateRequest, ...grpc.CallOption) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectCreateRequest, ...grpc.CallOption) *v1.ProjectResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectCreateRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -79,77 +73,62 @@ type MockProjectServiceClient_Create_Call struct {
 }
 
 // Create is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectCreateRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectServiceClient_Expecter) Create(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectServiceClient_Create_Call {
-	return &MockProjectServiceClient_Create_Call{Call: _e.mock.On("Create",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectCreateRequest]
+func (_e *MockProjectServiceClient_Expecter) Create(context1 interface{}, request interface{}) *MockProjectServiceClient_Create_Call {
+	return &MockProjectServiceClient_Create_Call{Call: _e.mock.On("Create", context1, request)}
 }
 
-func (_c *MockProjectServiceClient_Create_Call) Run(run func(ctx context.Context, in *v1.ProjectCreateRequest, opts ...grpc.CallOption)) *MockProjectServiceClient_Create_Call {
+func (_c *MockProjectServiceClient_Create_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectCreateRequest])) *MockProjectServiceClient_Create_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectCreateRequest
+		var arg1 *connect.Request[apiv1.ProjectCreateRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectCreateRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectCreateRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Create_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceClient_Create_Call {
-	_c.Call.Return(projectResponse, err)
+func (_c *MockProjectServiceClient_Create_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceClient_Create_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Create_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectCreateRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error)) *MockProjectServiceClient_Create_Call {
+func (_c *MockProjectServiceClient_Create_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceClient_Create_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Delete provides a mock function for the type MockProjectServiceClient
-func (_mock *MockProjectServiceClient) Delete(ctx context.Context, in *v1.ProjectDeleteRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectServiceClient) Delete(context1 context.Context, request *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Delete")
 	}
 
-	var r0 *v1.ProjectResponse
+	var r0 *connect.Response[apiv1.ProjectResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectDeleteRequest, ...grpc.CallOption) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectDeleteRequest, ...grpc.CallOption) *v1.ProjectResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectDeleteRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -162,77 +141,62 @@ type MockProjectServiceClient_Delete_Call struct {
 }
 
 // Delete is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectDeleteRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectServiceClient_Expecter) Delete(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectServiceClient_Delete_Call {
-	return &MockProjectServiceClient_Delete_Call{Call: _e.mock.On("Delete",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectDeleteRequest]
+func (_e *MockProjectServiceClient_Expecter) Delete(context1 interface{}, request interface{}) *MockProjectServiceClient_Delete_Call {
+	return &MockProjectServiceClient_Delete_Call{Call: _e.mock.On("Delete", context1, request)}
 }
 
-func (_c *MockProjectServiceClient_Delete_Call) Run(run func(ctx context.Context, in *v1.ProjectDeleteRequest, opts ...grpc.CallOption)) *MockProjectServiceClient_Delete_Call {
+func (_c *MockProjectServiceClient_Delete_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectDeleteRequest])) *MockProjectServiceClient_Delete_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectDeleteRequest
+		var arg1 *connect.Request[apiv1.ProjectDeleteRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectDeleteRequest)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectDeleteRequest])
 		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
-		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Delete_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceClient_Delete_Call {
-	_c.Call.Return(projectResponse, err)
+func (_c *MockProjectServiceClient_Delete_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceClient_Delete_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Delete_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectDeleteRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error)) *MockProjectServiceClient_Delete_Call {
+func (_c *MockProjectServiceClient_Delete_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceClient_Delete_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Find provides a mock function for the type MockProjectServiceClient
-func (_mock *MockProjectServiceClient) Find(ctx context.Context, in *v1.ProjectFindRequest, opts ...grpc.CallOption) (*v1.ProjectListResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectServiceClient) Find(context1 context.Context, request *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Find")
 	}
 
-	var r0 *v1.ProjectListResponse
+	var r0 *connect.Response[apiv1.ProjectListResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectFindRequest, ...grpc.CallOption) (*v1.ProjectListResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectFindRequest, ...grpc.CallOption) *v1.ProjectListResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) *connect.Response[apiv1.ProjectListResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectListResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectListResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectFindRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -245,77 +209,62 @@ type MockProjectServiceClient_Find_Call struct {
 }
 
 // Find is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectFindRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectServiceClient_Expecter) Find(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectServiceClient_Find_Call {
-	return &MockProjectServiceClient_Find_Call{Call: _e.mock.On("Find",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectFindRequest]
+func (_e *MockProjectServiceClient_Expecter) Find(context1 interface{}, request interface{}) *MockProjectServiceClient_Find_Call {
+	return &MockProjectServiceClient_Find_Call{Call: _e.mock.On("Find", context1, request)}
 }
 
-func (_c *MockProjectServiceClient_Find_Call) Run(run func(ctx context.Context, in *v1.ProjectFindRequest, opts ...grpc.CallOption)) *MockProjectServiceClient_Find_Call {
+func (_c *MockProjectServiceClient_Find_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectFindRequest])) *MockProjectServiceClient_Find_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectFindRequest
+		var arg1 *connect.Request[apiv1.ProjectFindRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectFindRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectFindRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Find_Call) Return(projectListResponse *v1.ProjectListResponse, err error) *MockProjectServiceClient_Find_Call {
-	_c.Call.Return(projectListResponse, err)
+func (_c *MockProjectServiceClient_Find_Call) Return(response *connect.Response[apiv1.ProjectListResponse], err error) *MockProjectServiceClient_Find_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Find_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectFindRequest, opts ...grpc.CallOption) (*v1.ProjectListResponse, error)) *MockProjectServiceClient_Find_Call {
+func (_c *MockProjectServiceClient_Find_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error)) *MockProjectServiceClient_Find_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Get provides a mock function for the type MockProjectServiceClient
-func (_mock *MockProjectServiceClient) Get(ctx context.Context, in *v1.ProjectGetRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectServiceClient) Get(context1 context.Context, request *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Get")
 	}
 
-	var r0 *v1.ProjectResponse
+	var r0 *connect.Response[apiv1.ProjectResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectGetRequest, ...grpc.CallOption) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectGetRequest, ...grpc.CallOption) *v1.ProjectResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectGetRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -328,77 +277,62 @@ type MockProjectServiceClient_Get_Call struct {
 }
 
 // Get is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectGetRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectServiceClient_Expecter) Get(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectServiceClient_Get_Call {
-	return &MockProjectServiceClient_Get_Call{Call: _e.mock.On("Get",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectGetRequest]
+func (_e *MockProjectServiceClient_Expecter) Get(context1 interface{}, request interface{}) *MockProjectServiceClient_Get_Call {
+	return &MockProjectServiceClient_Get_Call{Call: _e.mock.On("Get", context1, request)}
 }
 
-func (_c *MockProjectServiceClient_Get_Call) Run(run func(ctx context.Context, in *v1.ProjectGetRequest, opts ...grpc.CallOption)) *MockProjectServiceClient_Get_Call {
+func (_c *MockProjectServiceClient_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectGetRequest])) *MockProjectServiceClient_Get_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectGetRequest
+		var arg1 *connect.Request[apiv1.ProjectGetRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectGetRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectGetRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Get_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceClient_Get_Call {
-	_c.Call.Return(projectResponse, err)
+func (_c *MockProjectServiceClient_Get_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceClient_Get_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Get_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectGetRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error)) *MockProjectServiceClient_Get_Call {
+func (_c *MockProjectServiceClient_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceClient_Get_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // GetHistory provides a mock function for the type MockProjectServiceClient
-func (_mock *MockProjectServiceClient) GetHistory(ctx context.Context, in *v1.ProjectGetHistoryRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectServiceClient) GetHistory(context1 context.Context, request *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for GetHistory")
 	}
 
-	var r0 *v1.ProjectResponse
+	var r0 *connect.Response[apiv1.ProjectResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectGetHistoryRequest, ...grpc.CallOption) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectGetHistoryRequest, ...grpc.CallOption) *v1.ProjectResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectGetHistoryRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -411,77 +345,62 @@ type MockProjectServiceClient_GetHistory_Call struct {
 }
 
 // GetHistory is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectGetHistoryRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectServiceClient_Expecter) GetHistory(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectServiceClient_GetHistory_Call {
-	return &MockProjectServiceClient_GetHistory_Call{Call: _e.mock.On("GetHistory",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectGetHistoryRequest]
+func (_e *MockProjectServiceClient_Expecter) GetHistory(context1 interface{}, request interface{}) *MockProjectServiceClient_GetHistory_Call {
+	return &MockProjectServiceClient_GetHistory_Call{Call: _e.mock.On("GetHistory", context1, request)}
 }
 
-func (_c *MockProjectServiceClient_GetHistory_Call) Run(run func(ctx context.Context, in *v1.ProjectGetHistoryRequest, opts ...grpc.CallOption)) *MockProjectServiceClient_GetHistory_Call {
+func (_c *MockProjectServiceClient_GetHistory_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectGetHistoryRequest])) *MockProjectServiceClient_GetHistory_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectGetHistoryRequest
+		var arg1 *connect.Request[apiv1.ProjectGetHistoryRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectGetHistoryRequest)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectGetHistoryRequest])
 		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
-		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectServiceClient_GetHistory_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceClient_GetHistory_Call {
-	_c.Call.Return(projectResponse, err)
+func (_c *MockProjectServiceClient_GetHistory_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceClient_GetHistory_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectServiceClient_GetHistory_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectGetHistoryRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error)) *MockProjectServiceClient_GetHistory_Call {
+func (_c *MockProjectServiceClient_GetHistory_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceClient_GetHistory_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Update provides a mock function for the type MockProjectServiceClient
-func (_mock *MockProjectServiceClient) Update(ctx context.Context, in *v1.ProjectUpdateRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockProjectServiceClient) Update(context1 context.Context, request *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Update")
 	}
 
-	var r0 *v1.ProjectResponse
+	var r0 *connect.Response[apiv1.ProjectResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectUpdateRequest, ...grpc.CallOption) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectUpdateRequest, ...grpc.CallOption) *v1.ProjectResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectUpdateRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -494,45 +413,36 @@ type MockProjectServiceClient_Update_Call struct {
 }
 
 // Update is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ProjectUpdateRequest
-//   - opts ...grpc.CallOption
-func (_e *MockProjectServiceClient_Expecter) Update(ctx interface{}, in interface{}, opts ...interface{}) *MockProjectServiceClient_Update_Call {
-	return &MockProjectServiceClient_Update_Call{Call: _e.mock.On("Update",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectUpdateRequest]
+func (_e *MockProjectServiceClient_Expecter) Update(context1 interface{}, request interface{}) *MockProjectServiceClient_Update_Call {
+	return &MockProjectServiceClient_Update_Call{Call: _e.mock.On("Update", context1, request)}
 }
 
-func (_c *MockProjectServiceClient_Update_Call) Run(run func(ctx context.Context, in *v1.ProjectUpdateRequest, opts ...grpc.CallOption)) *MockProjectServiceClient_Update_Call {
+func (_c *MockProjectServiceClient_Update_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectUpdateRequest])) *MockProjectServiceClient_Update_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ProjectUpdateRequest
+		var arg1 *connect.Request[apiv1.ProjectUpdateRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectUpdateRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.ProjectUpdateRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Update_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceClient_Update_Call {
-	_c.Call.Return(projectResponse, err)
+func (_c *MockProjectServiceClient_Update_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceClient_Update_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockProjectServiceClient_Update_Call) RunAndReturn(run func(ctx context.Context, in *v1.ProjectUpdateRequest, opts ...grpc.CallOption) (*v1.ProjectResponse, error)) *MockProjectServiceClient_Update_Call {
+func (_c *MockProjectServiceClient_Update_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceClient_Update_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/test/mocks/ProjectServiceHandler.go b/pkg/test/mocks/ProjectServiceHandler.go
new file mode 100644
index 0000000..1d2d67a
--- /dev/null
+++ b/pkg/test/mocks/ProjectServiceHandler.go
@@ -0,0 +1,448 @@
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
+
+package mocks
+
+import (
+	"context"
+
+	"connectrpc.com/connect"
+	"github.com/metal-stack/masterdata-api/api/v1"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// NewMockProjectServiceHandler creates a new instance of MockProjectServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockProjectServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockProjectServiceHandler {
+	mock := &MockProjectServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
+// MockProjectServiceHandler is an autogenerated mock type for the ProjectServiceHandler type
+type MockProjectServiceHandler struct {
+	mock.Mock
+}
+
+type MockProjectServiceHandler_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *MockProjectServiceHandler) EXPECT() *MockProjectServiceHandler_Expecter {
+	return &MockProjectServiceHandler_Expecter{mock: &_m.Mock}
+}
+
+// Create provides a mock function for the type MockProjectServiceHandler
+func (_mock *MockProjectServiceHandler) Create(context1 context.Context, request *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectCreateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectServiceHandler_Create_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Create'
+type MockProjectServiceHandler_Create_Call struct {
+	*mock.Call
+}
+
+// Create is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectCreateRequest]
+func (_e *MockProjectServiceHandler_Expecter) Create(context1 interface{}, request interface{}) *MockProjectServiceHandler_Create_Call {
+	return &MockProjectServiceHandler_Create_Call{Call: _e.mock.On("Create", context1, request)}
+}
+
+func (_c *MockProjectServiceHandler_Create_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectCreateRequest])) *MockProjectServiceHandler_Create_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectCreateRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectCreateRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Create_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceHandler_Create_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Create_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectCreateRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceHandler_Create_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Delete provides a mock function for the type MockProjectServiceHandler
+func (_mock *MockProjectServiceHandler) Delete(context1 context.Context, request *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectDeleteRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectServiceHandler_Delete_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Delete'
+type MockProjectServiceHandler_Delete_Call struct {
+	*mock.Call
+}
+
+// Delete is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectDeleteRequest]
+func (_e *MockProjectServiceHandler_Expecter) Delete(context1 interface{}, request interface{}) *MockProjectServiceHandler_Delete_Call {
+	return &MockProjectServiceHandler_Delete_Call{Call: _e.mock.On("Delete", context1, request)}
+}
+
+func (_c *MockProjectServiceHandler_Delete_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectDeleteRequest])) *MockProjectServiceHandler_Delete_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectDeleteRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectDeleteRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Delete_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceHandler_Delete_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Delete_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectDeleteRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceHandler_Delete_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Find provides a mock function for the type MockProjectServiceHandler
+func (_mock *MockProjectServiceHandler) Find(context1 context.Context, request *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectListResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) *connect.Response[apiv1.ProjectListResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectListResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectFindRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectServiceHandler_Find_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Find'
+type MockProjectServiceHandler_Find_Call struct {
+	*mock.Call
+}
+
+// Find is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectFindRequest]
+func (_e *MockProjectServiceHandler_Expecter) Find(context1 interface{}, request interface{}) *MockProjectServiceHandler_Find_Call {
+	return &MockProjectServiceHandler_Find_Call{Call: _e.mock.On("Find", context1, request)}
+}
+
+func (_c *MockProjectServiceHandler_Find_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectFindRequest])) *MockProjectServiceHandler_Find_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectFindRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectFindRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Find_Call) Return(response *connect.Response[apiv1.ProjectListResponse], err error) *MockProjectServiceHandler_Find_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Find_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectFindRequest]) (*connect.Response[apiv1.ProjectListResponse], error)) *MockProjectServiceHandler_Find_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Get provides a mock function for the type MockProjectServiceHandler
+func (_mock *MockProjectServiceHandler) Get(context1 context.Context, request *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectGetRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectServiceHandler_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
+type MockProjectServiceHandler_Get_Call struct {
+	*mock.Call
+}
+
+// Get is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectGetRequest]
+func (_e *MockProjectServiceHandler_Expecter) Get(context1 interface{}, request interface{}) *MockProjectServiceHandler_Get_Call {
+	return &MockProjectServiceHandler_Get_Call{Call: _e.mock.On("Get", context1, request)}
+}
+
+func (_c *MockProjectServiceHandler_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectGetRequest])) *MockProjectServiceHandler_Get_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectGetRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectGetRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Get_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceHandler_Get_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectGetRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceHandler_Get_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetHistory provides a mock function for the type MockProjectServiceHandler
+func (_mock *MockProjectServiceHandler) GetHistory(context1 context.Context, request *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetHistory")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectGetHistoryRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectServiceHandler_GetHistory_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetHistory'
+type MockProjectServiceHandler_GetHistory_Call struct {
+	*mock.Call
+}
+
+// GetHistory is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectGetHistoryRequest]
+func (_e *MockProjectServiceHandler_Expecter) GetHistory(context1 interface{}, request interface{}) *MockProjectServiceHandler_GetHistory_Call {
+	return &MockProjectServiceHandler_GetHistory_Call{Call: _e.mock.On("GetHistory", context1, request)}
+}
+
+func (_c *MockProjectServiceHandler_GetHistory_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectGetHistoryRequest])) *MockProjectServiceHandler_GetHistory_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectGetHistoryRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectGetHistoryRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_GetHistory_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceHandler_GetHistory_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_GetHistory_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectGetHistoryRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceHandler_GetHistory_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Update provides a mock function for the type MockProjectServiceHandler
+func (_mock *MockProjectServiceHandler) Update(context1 context.Context, request *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.ProjectResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) *connect.Response[apiv1.ProjectResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ProjectResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ProjectUpdateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockProjectServiceHandler_Update_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Update'
+type MockProjectServiceHandler_Update_Call struct {
+	*mock.Call
+}
+
+// Update is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ProjectUpdateRequest]
+func (_e *MockProjectServiceHandler_Expecter) Update(context1 interface{}, request interface{}) *MockProjectServiceHandler_Update_Call {
+	return &MockProjectServiceHandler_Update_Call{Call: _e.mock.On("Update", context1, request)}
+}
+
+func (_c *MockProjectServiceHandler_Update_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ProjectUpdateRequest])) *MockProjectServiceHandler_Update_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ProjectUpdateRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ProjectUpdateRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Update_Call) Return(response *connect.Response[apiv1.ProjectResponse], err error) *MockProjectServiceHandler_Update_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockProjectServiceHandler_Update_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ProjectUpdateRequest]) (*connect.Response[apiv1.ProjectResponse], error)) *MockProjectServiceHandler_Update_Call {
+	_c.Call.Return(run)
+	return _c
+}
diff --git a/pkg/test/mocks/ProjectServiceServer.go b/pkg/test/mocks/ProjectServiceServer.go
deleted file mode 100644
index d6a8837..0000000
--- a/pkg/test/mocks/ProjectServiceServer.go
+++ /dev/null
@@ -1,447 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	"context"
-
-	"github.com/metal-stack/masterdata-api/api/v1"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockProjectServiceServer creates a new instance of MockProjectServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockProjectServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockProjectServiceServer {
-	mock := &MockProjectServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockProjectServiceServer is an autogenerated mock type for the ProjectServiceServer type
-type MockProjectServiceServer struct {
-	mock.Mock
-}
-
-type MockProjectServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockProjectServiceServer) EXPECT() *MockProjectServiceServer_Expecter {
-	return &MockProjectServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// Create provides a mock function for the type MockProjectServiceServer
-func (_mock *MockProjectServiceServer) Create(context1 context.Context, projectCreateRequest *v1.ProjectCreateRequest) (*v1.ProjectResponse, error) {
-	ret := _mock.Called(context1, projectCreateRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Create")
-	}
-
-	var r0 *v1.ProjectResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectCreateRequest) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(context1, projectCreateRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectCreateRequest) *v1.ProjectResponse); ok {
-		r0 = returnFunc(context1, projectCreateRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectCreateRequest) error); ok {
-		r1 = returnFunc(context1, projectCreateRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectServiceServer_Create_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Create'
-type MockProjectServiceServer_Create_Call struct {
-	*mock.Call
-}
-
-// Create is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectCreateRequest *v1.ProjectCreateRequest
-func (_e *MockProjectServiceServer_Expecter) Create(context1 interface{}, projectCreateRequest interface{}) *MockProjectServiceServer_Create_Call {
-	return &MockProjectServiceServer_Create_Call{Call: _e.mock.On("Create", context1, projectCreateRequest)}
-}
-
-func (_c *MockProjectServiceServer_Create_Call) Run(run func(context1 context.Context, projectCreateRequest *v1.ProjectCreateRequest)) *MockProjectServiceServer_Create_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectCreateRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectCreateRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Create_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceServer_Create_Call {
-	_c.Call.Return(projectResponse, err)
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Create_Call) RunAndReturn(run func(context1 context.Context, projectCreateRequest *v1.ProjectCreateRequest) (*v1.ProjectResponse, error)) *MockProjectServiceServer_Create_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Delete provides a mock function for the type MockProjectServiceServer
-func (_mock *MockProjectServiceServer) Delete(context1 context.Context, projectDeleteRequest *v1.ProjectDeleteRequest) (*v1.ProjectResponse, error) {
-	ret := _mock.Called(context1, projectDeleteRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Delete")
-	}
-
-	var r0 *v1.ProjectResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectDeleteRequest) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(context1, projectDeleteRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectDeleteRequest) *v1.ProjectResponse); ok {
-		r0 = returnFunc(context1, projectDeleteRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectDeleteRequest) error); ok {
-		r1 = returnFunc(context1, projectDeleteRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectServiceServer_Delete_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Delete'
-type MockProjectServiceServer_Delete_Call struct {
-	*mock.Call
-}
-
-// Delete is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectDeleteRequest *v1.ProjectDeleteRequest
-func (_e *MockProjectServiceServer_Expecter) Delete(context1 interface{}, projectDeleteRequest interface{}) *MockProjectServiceServer_Delete_Call {
-	return &MockProjectServiceServer_Delete_Call{Call: _e.mock.On("Delete", context1, projectDeleteRequest)}
-}
-
-func (_c *MockProjectServiceServer_Delete_Call) Run(run func(context1 context.Context, projectDeleteRequest *v1.ProjectDeleteRequest)) *MockProjectServiceServer_Delete_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectDeleteRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectDeleteRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Delete_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceServer_Delete_Call {
-	_c.Call.Return(projectResponse, err)
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Delete_Call) RunAndReturn(run func(context1 context.Context, projectDeleteRequest *v1.ProjectDeleteRequest) (*v1.ProjectResponse, error)) *MockProjectServiceServer_Delete_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Find provides a mock function for the type MockProjectServiceServer
-func (_mock *MockProjectServiceServer) Find(context1 context.Context, projectFindRequest *v1.ProjectFindRequest) (*v1.ProjectListResponse, error) {
-	ret := _mock.Called(context1, projectFindRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Find")
-	}
-
-	var r0 *v1.ProjectListResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectFindRequest) (*v1.ProjectListResponse, error)); ok {
-		return returnFunc(context1, projectFindRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectFindRequest) *v1.ProjectListResponse); ok {
-		r0 = returnFunc(context1, projectFindRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectListResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectFindRequest) error); ok {
-		r1 = returnFunc(context1, projectFindRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectServiceServer_Find_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Find'
-type MockProjectServiceServer_Find_Call struct {
-	*mock.Call
-}
-
-// Find is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectFindRequest *v1.ProjectFindRequest
-func (_e *MockProjectServiceServer_Expecter) Find(context1 interface{}, projectFindRequest interface{}) *MockProjectServiceServer_Find_Call {
-	return &MockProjectServiceServer_Find_Call{Call: _e.mock.On("Find", context1, projectFindRequest)}
-}
-
-func (_c *MockProjectServiceServer_Find_Call) Run(run func(context1 context.Context, projectFindRequest *v1.ProjectFindRequest)) *MockProjectServiceServer_Find_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectFindRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectFindRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Find_Call) Return(projectListResponse *v1.ProjectListResponse, err error) *MockProjectServiceServer_Find_Call {
-	_c.Call.Return(projectListResponse, err)
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Find_Call) RunAndReturn(run func(context1 context.Context, projectFindRequest *v1.ProjectFindRequest) (*v1.ProjectListResponse, error)) *MockProjectServiceServer_Find_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Get provides a mock function for the type MockProjectServiceServer
-func (_mock *MockProjectServiceServer) Get(context1 context.Context, projectGetRequest *v1.ProjectGetRequest) (*v1.ProjectResponse, error) {
-	ret := _mock.Called(context1, projectGetRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Get")
-	}
-
-	var r0 *v1.ProjectResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectGetRequest) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(context1, projectGetRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectGetRequest) *v1.ProjectResponse); ok {
-		r0 = returnFunc(context1, projectGetRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectGetRequest) error); ok {
-		r1 = returnFunc(context1, projectGetRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectServiceServer_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
-type MockProjectServiceServer_Get_Call struct {
-	*mock.Call
-}
-
-// Get is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectGetRequest *v1.ProjectGetRequest
-func (_e *MockProjectServiceServer_Expecter) Get(context1 interface{}, projectGetRequest interface{}) *MockProjectServiceServer_Get_Call {
-	return &MockProjectServiceServer_Get_Call{Call: _e.mock.On("Get", context1, projectGetRequest)}
-}
-
-func (_c *MockProjectServiceServer_Get_Call) Run(run func(context1 context.Context, projectGetRequest *v1.ProjectGetRequest)) *MockProjectServiceServer_Get_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectGetRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectGetRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Get_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceServer_Get_Call {
-	_c.Call.Return(projectResponse, err)
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Get_Call) RunAndReturn(run func(context1 context.Context, projectGetRequest *v1.ProjectGetRequest) (*v1.ProjectResponse, error)) *MockProjectServiceServer_Get_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetHistory provides a mock function for the type MockProjectServiceServer
-func (_mock *MockProjectServiceServer) GetHistory(context1 context.Context, projectGetHistoryRequest *v1.ProjectGetHistoryRequest) (*v1.ProjectResponse, error) {
-	ret := _mock.Called(context1, projectGetHistoryRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetHistory")
-	}
-
-	var r0 *v1.ProjectResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectGetHistoryRequest) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(context1, projectGetHistoryRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectGetHistoryRequest) *v1.ProjectResponse); ok {
-		r0 = returnFunc(context1, projectGetHistoryRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectGetHistoryRequest) error); ok {
-		r1 = returnFunc(context1, projectGetHistoryRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectServiceServer_GetHistory_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetHistory'
-type MockProjectServiceServer_GetHistory_Call struct {
-	*mock.Call
-}
-
-// GetHistory is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectGetHistoryRequest *v1.ProjectGetHistoryRequest
-func (_e *MockProjectServiceServer_Expecter) GetHistory(context1 interface{}, projectGetHistoryRequest interface{}) *MockProjectServiceServer_GetHistory_Call {
-	return &MockProjectServiceServer_GetHistory_Call{Call: _e.mock.On("GetHistory", context1, projectGetHistoryRequest)}
-}
-
-func (_c *MockProjectServiceServer_GetHistory_Call) Run(run func(context1 context.Context, projectGetHistoryRequest *v1.ProjectGetHistoryRequest)) *MockProjectServiceServer_GetHistory_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectGetHistoryRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectGetHistoryRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectServiceServer_GetHistory_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceServer_GetHistory_Call {
-	_c.Call.Return(projectResponse, err)
-	return _c
-}
-
-func (_c *MockProjectServiceServer_GetHistory_Call) RunAndReturn(run func(context1 context.Context, projectGetHistoryRequest *v1.ProjectGetHistoryRequest) (*v1.ProjectResponse, error)) *MockProjectServiceServer_GetHistory_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Update provides a mock function for the type MockProjectServiceServer
-func (_mock *MockProjectServiceServer) Update(context1 context.Context, projectUpdateRequest *v1.ProjectUpdateRequest) (*v1.ProjectResponse, error) {
-	ret := _mock.Called(context1, projectUpdateRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Update")
-	}
-
-	var r0 *v1.ProjectResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectUpdateRequest) (*v1.ProjectResponse, error)); ok {
-		return returnFunc(context1, projectUpdateRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ProjectUpdateRequest) *v1.ProjectResponse); ok {
-		r0 = returnFunc(context1, projectUpdateRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ProjectResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ProjectUpdateRequest) error); ok {
-		r1 = returnFunc(context1, projectUpdateRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockProjectServiceServer_Update_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Update'
-type MockProjectServiceServer_Update_Call struct {
-	*mock.Call
-}
-
-// Update is a helper method to define mock.On call
-//   - context1 context.Context
-//   - projectUpdateRequest *v1.ProjectUpdateRequest
-func (_e *MockProjectServiceServer_Expecter) Update(context1 interface{}, projectUpdateRequest interface{}) *MockProjectServiceServer_Update_Call {
-	return &MockProjectServiceServer_Update_Call{Call: _e.mock.On("Update", context1, projectUpdateRequest)}
-}
-
-func (_c *MockProjectServiceServer_Update_Call) Run(run func(context1 context.Context, projectUpdateRequest *v1.ProjectUpdateRequest)) *MockProjectServiceServer_Update_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ProjectUpdateRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ProjectUpdateRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Update_Call) Return(projectResponse *v1.ProjectResponse, err error) *MockProjectServiceServer_Update_Call {
-	_c.Call.Return(projectResponse, err)
-	return _c
-}
-
-func (_c *MockProjectServiceServer_Update_Call) RunAndReturn(run func(context1 context.Context, projectUpdateRequest *v1.ProjectUpdateRequest) (*v1.ProjectResponse, error)) *MockProjectServiceServer_Update_Call {
-	_c.Call.Return(run)
-	return _c
-}
diff --git a/pkg/test/mocks/Storage.go b/pkg/test/mocks/Storage.go
index b47ed8c..e9680b3 100644
--- a/pkg/test/mocks/Storage.go
+++ b/pkg/test/mocks/Storage.go
@@ -221,7 +221,7 @@ func (_c *MockStorage_DeleteAll_Call[E]) RunAndReturn(run func(ctx context.Conte
 }
 
 // Find provides a mock function for the type MockStorage
-func (_mock *MockStorage[E]) Find(ctx context.Context, paging *v1.Paging, filters ...any) ([]E, *uint64, error) {
+func (_mock *MockStorage[E]) Find(ctx context.Context, paging *apiv1.Paging, filters ...any) ([]E, *uint64, error) {
 	var tmpRet mock.Arguments
 	if len(filters) > 0 {
 		tmpRet = _mock.Called(ctx, paging, filters)
@@ -237,24 +237,24 @@ func (_mock *MockStorage[E]) Find(ctx context.Context, paging *v1.Paging, filter
 	var r0 []E
 	var r1 *uint64
 	var r2 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.Paging, ...any) ([]E, *uint64, error)); ok {
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *apiv1.Paging, ...any) ([]E, *uint64, error)); ok {
 		return returnFunc(ctx, paging, filters...)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.Paging, ...any) []E); ok {
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *apiv1.Paging, ...any) []E); ok {
 		r0 = returnFunc(ctx, paging, filters...)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]E)
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.Paging, ...any) *uint64); ok {
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *apiv1.Paging, ...any) *uint64); ok {
 		r1 = returnFunc(ctx, paging, filters...)
 	} else {
 		if ret.Get(1) != nil {
 			r1 = ret.Get(1).(*uint64)
 		}
 	}
-	if returnFunc, ok := ret.Get(2).(func(context.Context, *v1.Paging, ...any) error); ok {
+	if returnFunc, ok := ret.Get(2).(func(context.Context, *apiv1.Paging, ...any) error); ok {
 		r2 = returnFunc(ctx, paging, filters...)
 	} else {
 		r2 = ret.Error(2)
@@ -269,22 +269,22 @@ type MockStorage_Find_Call[E datastore.Entity] struct {
 
 // Find is a helper method to define mock.On call
 //   - ctx context.Context
-//   - paging *v1.Paging
+//   - paging *apiv1.Paging
 //   - filters ...any
 func (_e *MockStorage_Expecter[E]) Find(ctx interface{}, paging interface{}, filters ...interface{}) *MockStorage_Find_Call[E] {
 	return &MockStorage_Find_Call[E]{Call: _e.mock.On("Find",
 		append([]interface{}{ctx, paging}, filters...)...)}
 }
 
-func (_c *MockStorage_Find_Call[E]) Run(run func(ctx context.Context, paging *v1.Paging, filters ...any)) *MockStorage_Find_Call[E] {
+func (_c *MockStorage_Find_Call[E]) Run(run func(ctx context.Context, paging *apiv1.Paging, filters ...any)) *MockStorage_Find_Call[E] {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.Paging
+		var arg1 *apiv1.Paging
 		if args[1] != nil {
-			arg1 = args[1].(*v1.Paging)
+			arg1 = args[1].(*apiv1.Paging)
 		}
 		var arg2 []any
 		var variadicArgs []any
@@ -306,7 +306,7 @@ func (_c *MockStorage_Find_Call[E]) Return(vs []E, v *uint64, err error) *MockSt
 	return _c
 }
 
-func (_c *MockStorage_Find_Call[E]) RunAndReturn(run func(ctx context.Context, paging *v1.Paging, filters ...any) ([]E, *uint64, error)) *MockStorage_Find_Call[E] {
+func (_c *MockStorage_Find_Call[E]) RunAndReturn(run func(ctx context.Context, paging *apiv1.Paging, filters ...any) ([]E, *uint64, error)) *MockStorage_Find_Call[E] {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/test/mocks/TenantMemberServiceClient.go b/pkg/test/mocks/TenantMemberServiceClient.go
index b60adc0..7799a10 100644
--- a/pkg/test/mocks/TenantMemberServiceClient.go
+++ b/pkg/test/mocks/TenantMemberServiceClient.go
@@ -7,9 +7,9 @@ package mocks
 import (
 	"context"
 
+	"connectrpc.com/connect"
 	"github.com/metal-stack/masterdata-api/api/v1"
 	mock "github.com/stretchr/testify/mock"
-	"google.golang.org/grpc"
 )
 
 // NewMockTenantMemberServiceClient creates a new instance of MockTenantMemberServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
@@ -40,33 +40,27 @@ func (_m *MockTenantMemberServiceClient) EXPECT() *MockTenantMemberServiceClient
 }
 
 // Create provides a mock function for the type MockTenantMemberServiceClient
-func (_mock *MockTenantMemberServiceClient) Create(ctx context.Context, in *v1.TenantMemberCreateRequest, opts ...grpc.CallOption) (*v1.TenantMemberResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantMemberServiceClient) Create(context1 context.Context, request *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Create")
 	}
 
-	var r0 *v1.TenantMemberResponse
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberCreateRequest, ...grpc.CallOption) (*v1.TenantMemberResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberCreateRequest, ...grpc.CallOption) *v1.TenantMemberResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberCreateRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -79,77 +73,62 @@ type MockTenantMemberServiceClient_Create_Call struct {
 }
 
 // Create is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantMemberCreateRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantMemberServiceClient_Expecter) Create(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantMemberServiceClient_Create_Call {
-	return &MockTenantMemberServiceClient_Create_Call{Call: _e.mock.On("Create",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberCreateRequest]
+func (_e *MockTenantMemberServiceClient_Expecter) Create(context1 interface{}, request interface{}) *MockTenantMemberServiceClient_Create_Call {
+	return &MockTenantMemberServiceClient_Create_Call{Call: _e.mock.On("Create", context1, request)}
 }
 
-func (_c *MockTenantMemberServiceClient_Create_Call) Run(run func(ctx context.Context, in *v1.TenantMemberCreateRequest, opts ...grpc.CallOption)) *MockTenantMemberServiceClient_Create_Call {
+func (_c *MockTenantMemberServiceClient_Create_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberCreateRequest])) *MockTenantMemberServiceClient_Create_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantMemberCreateRequest
+		var arg1 *connect.Request[apiv1.TenantMemberCreateRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberCreateRequest)
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberCreateRequest])
 		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
-		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Create_Call) Return(tenantMemberResponse *v1.TenantMemberResponse, err error) *MockTenantMemberServiceClient_Create_Call {
-	_c.Call.Return(tenantMemberResponse, err)
+func (_c *MockTenantMemberServiceClient_Create_Call) Return(response *connect.Response[apiv1.TenantMemberResponse], err error) *MockTenantMemberServiceClient_Create_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Create_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantMemberCreateRequest, opts ...grpc.CallOption) (*v1.TenantMemberResponse, error)) *MockTenantMemberServiceClient_Create_Call {
+func (_c *MockTenantMemberServiceClient_Create_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)) *MockTenantMemberServiceClient_Create_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Delete provides a mock function for the type MockTenantMemberServiceClient
-func (_mock *MockTenantMemberServiceClient) Delete(ctx context.Context, in *v1.TenantMemberDeleteRequest, opts ...grpc.CallOption) (*v1.TenantMemberResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantMemberServiceClient) Delete(context1 context.Context, request *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Delete")
 	}
 
-	var r0 *v1.TenantMemberResponse
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberDeleteRequest, ...grpc.CallOption) (*v1.TenantMemberResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberDeleteRequest, ...grpc.CallOption) *v1.TenantMemberResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberDeleteRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -162,77 +141,62 @@ type MockTenantMemberServiceClient_Delete_Call struct {
 }
 
 // Delete is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantMemberDeleteRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantMemberServiceClient_Expecter) Delete(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantMemberServiceClient_Delete_Call {
-	return &MockTenantMemberServiceClient_Delete_Call{Call: _e.mock.On("Delete",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberDeleteRequest]
+func (_e *MockTenantMemberServiceClient_Expecter) Delete(context1 interface{}, request interface{}) *MockTenantMemberServiceClient_Delete_Call {
+	return &MockTenantMemberServiceClient_Delete_Call{Call: _e.mock.On("Delete", context1, request)}
 }
 
-func (_c *MockTenantMemberServiceClient_Delete_Call) Run(run func(ctx context.Context, in *v1.TenantMemberDeleteRequest, opts ...grpc.CallOption)) *MockTenantMemberServiceClient_Delete_Call {
+func (_c *MockTenantMemberServiceClient_Delete_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberDeleteRequest])) *MockTenantMemberServiceClient_Delete_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantMemberDeleteRequest
+		var arg1 *connect.Request[apiv1.TenantMemberDeleteRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberDeleteRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberDeleteRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Delete_Call) Return(tenantMemberResponse *v1.TenantMemberResponse, err error) *MockTenantMemberServiceClient_Delete_Call {
-	_c.Call.Return(tenantMemberResponse, err)
+func (_c *MockTenantMemberServiceClient_Delete_Call) Return(response *connect.Response[apiv1.TenantMemberResponse], err error) *MockTenantMemberServiceClient_Delete_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Delete_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantMemberDeleteRequest, opts ...grpc.CallOption) (*v1.TenantMemberResponse, error)) *MockTenantMemberServiceClient_Delete_Call {
+func (_c *MockTenantMemberServiceClient_Delete_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)) *MockTenantMemberServiceClient_Delete_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Find provides a mock function for the type MockTenantMemberServiceClient
-func (_mock *MockTenantMemberServiceClient) Find(ctx context.Context, in *v1.TenantMemberFindRequest, opts ...grpc.CallOption) (*v1.TenantMemberListResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantMemberServiceClient) Find(context1 context.Context, request *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Find")
 	}
 
-	var r0 *v1.TenantMemberListResponse
+	var r0 *connect.Response[apiv1.TenantMemberListResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberFindRequest, ...grpc.CallOption) (*v1.TenantMemberListResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberFindRequest, ...grpc.CallOption) *v1.TenantMemberListResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) *connect.Response[apiv1.TenantMemberListResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberListResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberListResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberFindRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -245,77 +209,62 @@ type MockTenantMemberServiceClient_Find_Call struct {
 }
 
 // Find is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantMemberFindRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantMemberServiceClient_Expecter) Find(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantMemberServiceClient_Find_Call {
-	return &MockTenantMemberServiceClient_Find_Call{Call: _e.mock.On("Find",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberFindRequest]
+func (_e *MockTenantMemberServiceClient_Expecter) Find(context1 interface{}, request interface{}) *MockTenantMemberServiceClient_Find_Call {
+	return &MockTenantMemberServiceClient_Find_Call{Call: _e.mock.On("Find", context1, request)}
 }
 
-func (_c *MockTenantMemberServiceClient_Find_Call) Run(run func(ctx context.Context, in *v1.TenantMemberFindRequest, opts ...grpc.CallOption)) *MockTenantMemberServiceClient_Find_Call {
+func (_c *MockTenantMemberServiceClient_Find_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberFindRequest])) *MockTenantMemberServiceClient_Find_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantMemberFindRequest
+		var arg1 *connect.Request[apiv1.TenantMemberFindRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberFindRequest)
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberFindRequest])
 		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
-		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Find_Call) Return(tenantMemberListResponse *v1.TenantMemberListResponse, err error) *MockTenantMemberServiceClient_Find_Call {
-	_c.Call.Return(tenantMemberListResponse, err)
+func (_c *MockTenantMemberServiceClient_Find_Call) Return(response *connect.Response[apiv1.TenantMemberListResponse], err error) *MockTenantMemberServiceClient_Find_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Find_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantMemberFindRequest, opts ...grpc.CallOption) (*v1.TenantMemberListResponse, error)) *MockTenantMemberServiceClient_Find_Call {
+func (_c *MockTenantMemberServiceClient_Find_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error)) *MockTenantMemberServiceClient_Find_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Get provides a mock function for the type MockTenantMemberServiceClient
-func (_mock *MockTenantMemberServiceClient) Get(ctx context.Context, in *v1.TenantMemberGetRequest, opts ...grpc.CallOption) (*v1.TenantMemberResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantMemberServiceClient) Get(context1 context.Context, request *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Get")
 	}
 
-	var r0 *v1.TenantMemberResponse
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberGetRequest, ...grpc.CallOption) (*v1.TenantMemberResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberGetRequest, ...grpc.CallOption) *v1.TenantMemberResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberGetRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -328,77 +277,62 @@ type MockTenantMemberServiceClient_Get_Call struct {
 }
 
 // Get is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantMemberGetRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantMemberServiceClient_Expecter) Get(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantMemberServiceClient_Get_Call {
-	return &MockTenantMemberServiceClient_Get_Call{Call: _e.mock.On("Get",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberGetRequest]
+func (_e *MockTenantMemberServiceClient_Expecter) Get(context1 interface{}, request interface{}) *MockTenantMemberServiceClient_Get_Call {
+	return &MockTenantMemberServiceClient_Get_Call{Call: _e.mock.On("Get", context1, request)}
 }
 
-func (_c *MockTenantMemberServiceClient_Get_Call) Run(run func(ctx context.Context, in *v1.TenantMemberGetRequest, opts ...grpc.CallOption)) *MockTenantMemberServiceClient_Get_Call {
+func (_c *MockTenantMemberServiceClient_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberGetRequest])) *MockTenantMemberServiceClient_Get_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantMemberGetRequest
+		var arg1 *connect.Request[apiv1.TenantMemberGetRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberGetRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberGetRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Get_Call) Return(tenantMemberResponse *v1.TenantMemberResponse, err error) *MockTenantMemberServiceClient_Get_Call {
-	_c.Call.Return(tenantMemberResponse, err)
+func (_c *MockTenantMemberServiceClient_Get_Call) Return(response *connect.Response[apiv1.TenantMemberResponse], err error) *MockTenantMemberServiceClient_Get_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Get_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantMemberGetRequest, opts ...grpc.CallOption) (*v1.TenantMemberResponse, error)) *MockTenantMemberServiceClient_Get_Call {
+func (_c *MockTenantMemberServiceClient_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)) *MockTenantMemberServiceClient_Get_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Update provides a mock function for the type MockTenantMemberServiceClient
-func (_mock *MockTenantMemberServiceClient) Update(ctx context.Context, in *v1.TenantMemberUpdateRequest, opts ...grpc.CallOption) (*v1.TenantMemberResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantMemberServiceClient) Update(context1 context.Context, request *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Update")
 	}
 
-	var r0 *v1.TenantMemberResponse
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberUpdateRequest, ...grpc.CallOption) (*v1.TenantMemberResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberUpdateRequest, ...grpc.CallOption) *v1.TenantMemberResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberUpdateRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -411,45 +345,36 @@ type MockTenantMemberServiceClient_Update_Call struct {
 }
 
 // Update is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantMemberUpdateRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantMemberServiceClient_Expecter) Update(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantMemberServiceClient_Update_Call {
-	return &MockTenantMemberServiceClient_Update_Call{Call: _e.mock.On("Update",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberUpdateRequest]
+func (_e *MockTenantMemberServiceClient_Expecter) Update(context1 interface{}, request interface{}) *MockTenantMemberServiceClient_Update_Call {
+	return &MockTenantMemberServiceClient_Update_Call{Call: _e.mock.On("Update", context1, request)}
 }
 
-func (_c *MockTenantMemberServiceClient_Update_Call) Run(run func(ctx context.Context, in *v1.TenantMemberUpdateRequest, opts ...grpc.CallOption)) *MockTenantMemberServiceClient_Update_Call {
+func (_c *MockTenantMemberServiceClient_Update_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberUpdateRequest])) *MockTenantMemberServiceClient_Update_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantMemberUpdateRequest
+		var arg1 *connect.Request[apiv1.TenantMemberUpdateRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberUpdateRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberUpdateRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Update_Call) Return(tenantMemberResponse *v1.TenantMemberResponse, err error) *MockTenantMemberServiceClient_Update_Call {
-	_c.Call.Return(tenantMemberResponse, err)
+func (_c *MockTenantMemberServiceClient_Update_Call) Return(response *connect.Response[apiv1.TenantMemberResponse], err error) *MockTenantMemberServiceClient_Update_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantMemberServiceClient_Update_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantMemberUpdateRequest, opts ...grpc.CallOption) (*v1.TenantMemberResponse, error)) *MockTenantMemberServiceClient_Update_Call {
+func (_c *MockTenantMemberServiceClient_Update_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)) *MockTenantMemberServiceClient_Update_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/test/mocks/TenantMemberServiceHandler.go b/pkg/test/mocks/TenantMemberServiceHandler.go
new file mode 100644
index 0000000..66cd060
--- /dev/null
+++ b/pkg/test/mocks/TenantMemberServiceHandler.go
@@ -0,0 +1,380 @@
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
+
+package mocks
+
+import (
+	"context"
+
+	"connectrpc.com/connect"
+	"github.com/metal-stack/masterdata-api/api/v1"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// NewMockTenantMemberServiceHandler creates a new instance of MockTenantMemberServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockTenantMemberServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockTenantMemberServiceHandler {
+	mock := &MockTenantMemberServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
+// MockTenantMemberServiceHandler is an autogenerated mock type for the TenantMemberServiceHandler type
+type MockTenantMemberServiceHandler struct {
+	mock.Mock
+}
+
+type MockTenantMemberServiceHandler_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *MockTenantMemberServiceHandler) EXPECT() *MockTenantMemberServiceHandler_Expecter {
+	return &MockTenantMemberServiceHandler_Expecter{mock: &_m.Mock}
+}
+
+// Create provides a mock function for the type MockTenantMemberServiceHandler
+func (_mock *MockTenantMemberServiceHandler) Create(context1 context.Context, request *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberCreateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantMemberServiceHandler_Create_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Create'
+type MockTenantMemberServiceHandler_Create_Call struct {
+	*mock.Call
+}
+
+// Create is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberCreateRequest]
+func (_e *MockTenantMemberServiceHandler_Expecter) Create(context1 interface{}, request interface{}) *MockTenantMemberServiceHandler_Create_Call {
+	return &MockTenantMemberServiceHandler_Create_Call{Call: _e.mock.On("Create", context1, request)}
+}
+
+func (_c *MockTenantMemberServiceHandler_Create_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberCreateRequest])) *MockTenantMemberServiceHandler_Create_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantMemberCreateRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberCreateRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Create_Call) Return(response *connect.Response[apiv1.TenantMemberResponse], err error) *MockTenantMemberServiceHandler_Create_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Create_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberCreateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)) *MockTenantMemberServiceHandler_Create_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Delete provides a mock function for the type MockTenantMemberServiceHandler
+func (_mock *MockTenantMemberServiceHandler) Delete(context1 context.Context, request *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberDeleteRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantMemberServiceHandler_Delete_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Delete'
+type MockTenantMemberServiceHandler_Delete_Call struct {
+	*mock.Call
+}
+
+// Delete is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberDeleteRequest]
+func (_e *MockTenantMemberServiceHandler_Expecter) Delete(context1 interface{}, request interface{}) *MockTenantMemberServiceHandler_Delete_Call {
+	return &MockTenantMemberServiceHandler_Delete_Call{Call: _e.mock.On("Delete", context1, request)}
+}
+
+func (_c *MockTenantMemberServiceHandler_Delete_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberDeleteRequest])) *MockTenantMemberServiceHandler_Delete_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantMemberDeleteRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberDeleteRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Delete_Call) Return(response *connect.Response[apiv1.TenantMemberResponse], err error) *MockTenantMemberServiceHandler_Delete_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Delete_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberDeleteRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)) *MockTenantMemberServiceHandler_Delete_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Find provides a mock function for the type MockTenantMemberServiceHandler
+func (_mock *MockTenantMemberServiceHandler) Find(context1 context.Context, request *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberListResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) *connect.Response[apiv1.TenantMemberListResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberListResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberFindRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantMemberServiceHandler_Find_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Find'
+type MockTenantMemberServiceHandler_Find_Call struct {
+	*mock.Call
+}
+
+// Find is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberFindRequest]
+func (_e *MockTenantMemberServiceHandler_Expecter) Find(context1 interface{}, request interface{}) *MockTenantMemberServiceHandler_Find_Call {
+	return &MockTenantMemberServiceHandler_Find_Call{Call: _e.mock.On("Find", context1, request)}
+}
+
+func (_c *MockTenantMemberServiceHandler_Find_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberFindRequest])) *MockTenantMemberServiceHandler_Find_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantMemberFindRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberFindRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Find_Call) Return(response *connect.Response[apiv1.TenantMemberListResponse], err error) *MockTenantMemberServiceHandler_Find_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Find_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberFindRequest]) (*connect.Response[apiv1.TenantMemberListResponse], error)) *MockTenantMemberServiceHandler_Find_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Get provides a mock function for the type MockTenantMemberServiceHandler
+func (_mock *MockTenantMemberServiceHandler) Get(context1 context.Context, request *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberGetRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantMemberServiceHandler_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
+type MockTenantMemberServiceHandler_Get_Call struct {
+	*mock.Call
+}
+
+// Get is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberGetRequest]
+func (_e *MockTenantMemberServiceHandler_Expecter) Get(context1 interface{}, request interface{}) *MockTenantMemberServiceHandler_Get_Call {
+	return &MockTenantMemberServiceHandler_Get_Call{Call: _e.mock.On("Get", context1, request)}
+}
+
+func (_c *MockTenantMemberServiceHandler_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberGetRequest])) *MockTenantMemberServiceHandler_Get_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantMemberGetRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberGetRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Get_Call) Return(response *connect.Response[apiv1.TenantMemberResponse], err error) *MockTenantMemberServiceHandler_Get_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberGetRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)) *MockTenantMemberServiceHandler_Get_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Update provides a mock function for the type MockTenantMemberServiceHandler
+func (_mock *MockTenantMemberServiceHandler) Update(context1 context.Context, request *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.TenantMemberResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) *connect.Response[apiv1.TenantMemberResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantMemberResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantMemberUpdateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantMemberServiceHandler_Update_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Update'
+type MockTenantMemberServiceHandler_Update_Call struct {
+	*mock.Call
+}
+
+// Update is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantMemberUpdateRequest]
+func (_e *MockTenantMemberServiceHandler_Expecter) Update(context1 interface{}, request interface{}) *MockTenantMemberServiceHandler_Update_Call {
+	return &MockTenantMemberServiceHandler_Update_Call{Call: _e.mock.On("Update", context1, request)}
+}
+
+func (_c *MockTenantMemberServiceHandler_Update_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberUpdateRequest])) *MockTenantMemberServiceHandler_Update_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantMemberUpdateRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantMemberUpdateRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Update_Call) Return(response *connect.Response[apiv1.TenantMemberResponse], err error) *MockTenantMemberServiceHandler_Update_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantMemberServiceHandler_Update_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantMemberUpdateRequest]) (*connect.Response[apiv1.TenantMemberResponse], error)) *MockTenantMemberServiceHandler_Update_Call {
+	_c.Call.Return(run)
+	return _c
+}
diff --git a/pkg/test/mocks/TenantMemberServiceServer.go b/pkg/test/mocks/TenantMemberServiceServer.go
deleted file mode 100644
index ae01f7a..0000000
--- a/pkg/test/mocks/TenantMemberServiceServer.go
+++ /dev/null
@@ -1,379 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	"context"
-
-	"github.com/metal-stack/masterdata-api/api/v1"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockTenantMemberServiceServer creates a new instance of MockTenantMemberServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockTenantMemberServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockTenantMemberServiceServer {
-	mock := &MockTenantMemberServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockTenantMemberServiceServer is an autogenerated mock type for the TenantMemberServiceServer type
-type MockTenantMemberServiceServer struct {
-	mock.Mock
-}
-
-type MockTenantMemberServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockTenantMemberServiceServer) EXPECT() *MockTenantMemberServiceServer_Expecter {
-	return &MockTenantMemberServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// Create provides a mock function for the type MockTenantMemberServiceServer
-func (_mock *MockTenantMemberServiceServer) Create(context1 context.Context, tenantMemberCreateRequest *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error) {
-	ret := _mock.Called(context1, tenantMemberCreateRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Create")
-	}
-
-	var r0 *v1.TenantMemberResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error)); ok {
-		return returnFunc(context1, tenantMemberCreateRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberCreateRequest) *v1.TenantMemberResponse); ok {
-		r0 = returnFunc(context1, tenantMemberCreateRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberCreateRequest) error); ok {
-		r1 = returnFunc(context1, tenantMemberCreateRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantMemberServiceServer_Create_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Create'
-type MockTenantMemberServiceServer_Create_Call struct {
-	*mock.Call
-}
-
-// Create is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantMemberCreateRequest *v1.TenantMemberCreateRequest
-func (_e *MockTenantMemberServiceServer_Expecter) Create(context1 interface{}, tenantMemberCreateRequest interface{}) *MockTenantMemberServiceServer_Create_Call {
-	return &MockTenantMemberServiceServer_Create_Call{Call: _e.mock.On("Create", context1, tenantMemberCreateRequest)}
-}
-
-func (_c *MockTenantMemberServiceServer_Create_Call) Run(run func(context1 context.Context, tenantMemberCreateRequest *v1.TenantMemberCreateRequest)) *MockTenantMemberServiceServer_Create_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantMemberCreateRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberCreateRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Create_Call) Return(tenantMemberResponse *v1.TenantMemberResponse, err error) *MockTenantMemberServiceServer_Create_Call {
-	_c.Call.Return(tenantMemberResponse, err)
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Create_Call) RunAndReturn(run func(context1 context.Context, tenantMemberCreateRequest *v1.TenantMemberCreateRequest) (*v1.TenantMemberResponse, error)) *MockTenantMemberServiceServer_Create_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Delete provides a mock function for the type MockTenantMemberServiceServer
-func (_mock *MockTenantMemberServiceServer) Delete(context1 context.Context, tenantMemberDeleteRequest *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error) {
-	ret := _mock.Called(context1, tenantMemberDeleteRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Delete")
-	}
-
-	var r0 *v1.TenantMemberResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error)); ok {
-		return returnFunc(context1, tenantMemberDeleteRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberDeleteRequest) *v1.TenantMemberResponse); ok {
-		r0 = returnFunc(context1, tenantMemberDeleteRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberDeleteRequest) error); ok {
-		r1 = returnFunc(context1, tenantMemberDeleteRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantMemberServiceServer_Delete_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Delete'
-type MockTenantMemberServiceServer_Delete_Call struct {
-	*mock.Call
-}
-
-// Delete is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantMemberDeleteRequest *v1.TenantMemberDeleteRequest
-func (_e *MockTenantMemberServiceServer_Expecter) Delete(context1 interface{}, tenantMemberDeleteRequest interface{}) *MockTenantMemberServiceServer_Delete_Call {
-	return &MockTenantMemberServiceServer_Delete_Call{Call: _e.mock.On("Delete", context1, tenantMemberDeleteRequest)}
-}
-
-func (_c *MockTenantMemberServiceServer_Delete_Call) Run(run func(context1 context.Context, tenantMemberDeleteRequest *v1.TenantMemberDeleteRequest)) *MockTenantMemberServiceServer_Delete_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantMemberDeleteRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberDeleteRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Delete_Call) Return(tenantMemberResponse *v1.TenantMemberResponse, err error) *MockTenantMemberServiceServer_Delete_Call {
-	_c.Call.Return(tenantMemberResponse, err)
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Delete_Call) RunAndReturn(run func(context1 context.Context, tenantMemberDeleteRequest *v1.TenantMemberDeleteRequest) (*v1.TenantMemberResponse, error)) *MockTenantMemberServiceServer_Delete_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Find provides a mock function for the type MockTenantMemberServiceServer
-func (_mock *MockTenantMemberServiceServer) Find(context1 context.Context, tenantMemberFindRequest *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error) {
-	ret := _mock.Called(context1, tenantMemberFindRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Find")
-	}
-
-	var r0 *v1.TenantMemberListResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error)); ok {
-		return returnFunc(context1, tenantMemberFindRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberFindRequest) *v1.TenantMemberListResponse); ok {
-		r0 = returnFunc(context1, tenantMemberFindRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberListResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberFindRequest) error); ok {
-		r1 = returnFunc(context1, tenantMemberFindRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantMemberServiceServer_Find_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Find'
-type MockTenantMemberServiceServer_Find_Call struct {
-	*mock.Call
-}
-
-// Find is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantMemberFindRequest *v1.TenantMemberFindRequest
-func (_e *MockTenantMemberServiceServer_Expecter) Find(context1 interface{}, tenantMemberFindRequest interface{}) *MockTenantMemberServiceServer_Find_Call {
-	return &MockTenantMemberServiceServer_Find_Call{Call: _e.mock.On("Find", context1, tenantMemberFindRequest)}
-}
-
-func (_c *MockTenantMemberServiceServer_Find_Call) Run(run func(context1 context.Context, tenantMemberFindRequest *v1.TenantMemberFindRequest)) *MockTenantMemberServiceServer_Find_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantMemberFindRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberFindRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Find_Call) Return(tenantMemberListResponse *v1.TenantMemberListResponse, err error) *MockTenantMemberServiceServer_Find_Call {
-	_c.Call.Return(tenantMemberListResponse, err)
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Find_Call) RunAndReturn(run func(context1 context.Context, tenantMemberFindRequest *v1.TenantMemberFindRequest) (*v1.TenantMemberListResponse, error)) *MockTenantMemberServiceServer_Find_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Get provides a mock function for the type MockTenantMemberServiceServer
-func (_mock *MockTenantMemberServiceServer) Get(context1 context.Context, tenantMemberGetRequest *v1.TenantMemberGetRequest) (*v1.TenantMemberResponse, error) {
-	ret := _mock.Called(context1, tenantMemberGetRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Get")
-	}
-
-	var r0 *v1.TenantMemberResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberGetRequest) (*v1.TenantMemberResponse, error)); ok {
-		return returnFunc(context1, tenantMemberGetRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberGetRequest) *v1.TenantMemberResponse); ok {
-		r0 = returnFunc(context1, tenantMemberGetRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberGetRequest) error); ok {
-		r1 = returnFunc(context1, tenantMemberGetRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantMemberServiceServer_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
-type MockTenantMemberServiceServer_Get_Call struct {
-	*mock.Call
-}
-
-// Get is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantMemberGetRequest *v1.TenantMemberGetRequest
-func (_e *MockTenantMemberServiceServer_Expecter) Get(context1 interface{}, tenantMemberGetRequest interface{}) *MockTenantMemberServiceServer_Get_Call {
-	return &MockTenantMemberServiceServer_Get_Call{Call: _e.mock.On("Get", context1, tenantMemberGetRequest)}
-}
-
-func (_c *MockTenantMemberServiceServer_Get_Call) Run(run func(context1 context.Context, tenantMemberGetRequest *v1.TenantMemberGetRequest)) *MockTenantMemberServiceServer_Get_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantMemberGetRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberGetRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Get_Call) Return(tenantMemberResponse *v1.TenantMemberResponse, err error) *MockTenantMemberServiceServer_Get_Call {
-	_c.Call.Return(tenantMemberResponse, err)
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Get_Call) RunAndReturn(run func(context1 context.Context, tenantMemberGetRequest *v1.TenantMemberGetRequest) (*v1.TenantMemberResponse, error)) *MockTenantMemberServiceServer_Get_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Update provides a mock function for the type MockTenantMemberServiceServer
-func (_mock *MockTenantMemberServiceServer) Update(context1 context.Context, tenantMemberUpdateRequest *v1.TenantMemberUpdateRequest) (*v1.TenantMemberResponse, error) {
-	ret := _mock.Called(context1, tenantMemberUpdateRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Update")
-	}
-
-	var r0 *v1.TenantMemberResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberUpdateRequest) (*v1.TenantMemberResponse, error)); ok {
-		return returnFunc(context1, tenantMemberUpdateRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantMemberUpdateRequest) *v1.TenantMemberResponse); ok {
-		r0 = returnFunc(context1, tenantMemberUpdateRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantMemberResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantMemberUpdateRequest) error); ok {
-		r1 = returnFunc(context1, tenantMemberUpdateRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantMemberServiceServer_Update_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Update'
-type MockTenantMemberServiceServer_Update_Call struct {
-	*mock.Call
-}
-
-// Update is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantMemberUpdateRequest *v1.TenantMemberUpdateRequest
-func (_e *MockTenantMemberServiceServer_Expecter) Update(context1 interface{}, tenantMemberUpdateRequest interface{}) *MockTenantMemberServiceServer_Update_Call {
-	return &MockTenantMemberServiceServer_Update_Call{Call: _e.mock.On("Update", context1, tenantMemberUpdateRequest)}
-}
-
-func (_c *MockTenantMemberServiceServer_Update_Call) Run(run func(context1 context.Context, tenantMemberUpdateRequest *v1.TenantMemberUpdateRequest)) *MockTenantMemberServiceServer_Update_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantMemberUpdateRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantMemberUpdateRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Update_Call) Return(tenantMemberResponse *v1.TenantMemberResponse, err error) *MockTenantMemberServiceServer_Update_Call {
-	_c.Call.Return(tenantMemberResponse, err)
-	return _c
-}
-
-func (_c *MockTenantMemberServiceServer_Update_Call) RunAndReturn(run func(context1 context.Context, tenantMemberUpdateRequest *v1.TenantMemberUpdateRequest) (*v1.TenantMemberResponse, error)) *MockTenantMemberServiceServer_Update_Call {
-	_c.Call.Return(run)
-	return _c
-}
diff --git a/pkg/test/mocks/TenantServiceClient.go b/pkg/test/mocks/TenantServiceClient.go
index 9bc7880..ba627f2 100644
--- a/pkg/test/mocks/TenantServiceClient.go
+++ b/pkg/test/mocks/TenantServiceClient.go
@@ -7,9 +7,9 @@ package mocks
 import (
 	"context"
 
+	"connectrpc.com/connect"
 	"github.com/metal-stack/masterdata-api/api/v1"
 	mock "github.com/stretchr/testify/mock"
-	"google.golang.org/grpc"
 )
 
 // NewMockTenantServiceClient creates a new instance of MockTenantServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
@@ -40,33 +40,27 @@ func (_m *MockTenantServiceClient) EXPECT() *MockTenantServiceClient_Expecter {
 }
 
 // Create provides a mock function for the type MockTenantServiceClient
-func (_mock *MockTenantServiceClient) Create(ctx context.Context, in *v1.TenantCreateRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantServiceClient) Create(context1 context.Context, request *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Create")
 	}
 
-	var r0 *v1.TenantResponse
+	var r0 *connect.Response[apiv1.TenantResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantCreateRequest, ...grpc.CallOption) (*v1.TenantResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantCreateRequest, ...grpc.CallOption) *v1.TenantResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantCreateRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -79,77 +73,62 @@ type MockTenantServiceClient_Create_Call struct {
 }
 
 // Create is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantCreateRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantServiceClient_Expecter) Create(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantServiceClient_Create_Call {
-	return &MockTenantServiceClient_Create_Call{Call: _e.mock.On("Create",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantCreateRequest]
+func (_e *MockTenantServiceClient_Expecter) Create(context1 interface{}, request interface{}) *MockTenantServiceClient_Create_Call {
+	return &MockTenantServiceClient_Create_Call{Call: _e.mock.On("Create", context1, request)}
 }
 
-func (_c *MockTenantServiceClient_Create_Call) Run(run func(ctx context.Context, in *v1.TenantCreateRequest, opts ...grpc.CallOption)) *MockTenantServiceClient_Create_Call {
+func (_c *MockTenantServiceClient_Create_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantCreateRequest])) *MockTenantServiceClient_Create_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantCreateRequest
+		var arg1 *connect.Request[apiv1.TenantCreateRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantCreateRequest)
+			arg1 = args[1].(*connect.Request[apiv1.TenantCreateRequest])
 		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
-		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Create_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceClient_Create_Call {
-	_c.Call.Return(tenantResponse, err)
+func (_c *MockTenantServiceClient_Create_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceClient_Create_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Create_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantCreateRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error)) *MockTenantServiceClient_Create_Call {
+func (_c *MockTenantServiceClient_Create_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceClient_Create_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Delete provides a mock function for the type MockTenantServiceClient
-func (_mock *MockTenantServiceClient) Delete(ctx context.Context, in *v1.TenantDeleteRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantServiceClient) Delete(context1 context.Context, request *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Delete")
 	}
 
-	var r0 *v1.TenantResponse
+	var r0 *connect.Response[apiv1.TenantResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantDeleteRequest, ...grpc.CallOption) (*v1.TenantResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantDeleteRequest, ...grpc.CallOption) *v1.TenantResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantDeleteRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -162,77 +141,62 @@ type MockTenantServiceClient_Delete_Call struct {
 }
 
 // Delete is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantDeleteRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantServiceClient_Expecter) Delete(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantServiceClient_Delete_Call {
-	return &MockTenantServiceClient_Delete_Call{Call: _e.mock.On("Delete",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantDeleteRequest]
+func (_e *MockTenantServiceClient_Expecter) Delete(context1 interface{}, request interface{}) *MockTenantServiceClient_Delete_Call {
+	return &MockTenantServiceClient_Delete_Call{Call: _e.mock.On("Delete", context1, request)}
 }
 
-func (_c *MockTenantServiceClient_Delete_Call) Run(run func(ctx context.Context, in *v1.TenantDeleteRequest, opts ...grpc.CallOption)) *MockTenantServiceClient_Delete_Call {
+func (_c *MockTenantServiceClient_Delete_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantDeleteRequest])) *MockTenantServiceClient_Delete_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantDeleteRequest
+		var arg1 *connect.Request[apiv1.TenantDeleteRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantDeleteRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.TenantDeleteRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Delete_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceClient_Delete_Call {
-	_c.Call.Return(tenantResponse, err)
+func (_c *MockTenantServiceClient_Delete_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceClient_Delete_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Delete_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantDeleteRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error)) *MockTenantServiceClient_Delete_Call {
+func (_c *MockTenantServiceClient_Delete_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceClient_Delete_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Find provides a mock function for the type MockTenantServiceClient
-func (_mock *MockTenantServiceClient) Find(ctx context.Context, in *v1.TenantFindRequest, opts ...grpc.CallOption) (*v1.TenantListResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantServiceClient) Find(context1 context.Context, request *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Find")
 	}
 
-	var r0 *v1.TenantListResponse
+	var r0 *connect.Response[apiv1.TenantListResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantFindRequest, ...grpc.CallOption) (*v1.TenantListResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantFindRequest, ...grpc.CallOption) *v1.TenantListResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) *connect.Response[apiv1.TenantListResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantListResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantListResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantFindRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -245,77 +209,62 @@ type MockTenantServiceClient_Find_Call struct {
 }
 
 // Find is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantFindRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantServiceClient_Expecter) Find(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantServiceClient_Find_Call {
-	return &MockTenantServiceClient_Find_Call{Call: _e.mock.On("Find",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantFindRequest]
+func (_e *MockTenantServiceClient_Expecter) Find(context1 interface{}, request interface{}) *MockTenantServiceClient_Find_Call {
+	return &MockTenantServiceClient_Find_Call{Call: _e.mock.On("Find", context1, request)}
 }
 
-func (_c *MockTenantServiceClient_Find_Call) Run(run func(ctx context.Context, in *v1.TenantFindRequest, opts ...grpc.CallOption)) *MockTenantServiceClient_Find_Call {
+func (_c *MockTenantServiceClient_Find_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantFindRequest])) *MockTenantServiceClient_Find_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantFindRequest
+		var arg1 *connect.Request[apiv1.TenantFindRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantFindRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.TenantFindRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Find_Call) Return(tenantListResponse *v1.TenantListResponse, err error) *MockTenantServiceClient_Find_Call {
-	_c.Call.Return(tenantListResponse, err)
+func (_c *MockTenantServiceClient_Find_Call) Return(response *connect.Response[apiv1.TenantListResponse], err error) *MockTenantServiceClient_Find_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Find_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantFindRequest, opts ...grpc.CallOption) (*v1.TenantListResponse, error)) *MockTenantServiceClient_Find_Call {
+func (_c *MockTenantServiceClient_Find_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error)) *MockTenantServiceClient_Find_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // FindParticipatingProjects provides a mock function for the type MockTenantServiceClient
-func (_mock *MockTenantServiceClient) FindParticipatingProjects(ctx context.Context, in *v1.FindParticipatingProjectsRequest, opts ...grpc.CallOption) (*v1.FindParticipatingProjectsResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantServiceClient) FindParticipatingProjects(context1 context.Context, request *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for FindParticipatingProjects")
 	}
 
-	var r0 *v1.FindParticipatingProjectsResponse
+	var r0 *connect.Response[apiv1.FindParticipatingProjectsResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.FindParticipatingProjectsRequest, ...grpc.CallOption) (*v1.FindParticipatingProjectsResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.FindParticipatingProjectsRequest, ...grpc.CallOption) *v1.FindParticipatingProjectsResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) *connect.Response[apiv1.FindParticipatingProjectsResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.FindParticipatingProjectsResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.FindParticipatingProjectsResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.FindParticipatingProjectsRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -328,77 +277,62 @@ type MockTenantServiceClient_FindParticipatingProjects_Call struct {
 }
 
 // FindParticipatingProjects is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.FindParticipatingProjectsRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantServiceClient_Expecter) FindParticipatingProjects(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantServiceClient_FindParticipatingProjects_Call {
-	return &MockTenantServiceClient_FindParticipatingProjects_Call{Call: _e.mock.On("FindParticipatingProjects",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.FindParticipatingProjectsRequest]
+func (_e *MockTenantServiceClient_Expecter) FindParticipatingProjects(context1 interface{}, request interface{}) *MockTenantServiceClient_FindParticipatingProjects_Call {
+	return &MockTenantServiceClient_FindParticipatingProjects_Call{Call: _e.mock.On("FindParticipatingProjects", context1, request)}
 }
 
-func (_c *MockTenantServiceClient_FindParticipatingProjects_Call) Run(run func(ctx context.Context, in *v1.FindParticipatingProjectsRequest, opts ...grpc.CallOption)) *MockTenantServiceClient_FindParticipatingProjects_Call {
+func (_c *MockTenantServiceClient_FindParticipatingProjects_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.FindParticipatingProjectsRequest])) *MockTenantServiceClient_FindParticipatingProjects_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.FindParticipatingProjectsRequest
+		var arg1 *connect.Request[apiv1.FindParticipatingProjectsRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.FindParticipatingProjectsRequest)
+			arg1 = args[1].(*connect.Request[apiv1.FindParticipatingProjectsRequest])
 		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
-		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantServiceClient_FindParticipatingProjects_Call) Return(findParticipatingProjectsResponse *v1.FindParticipatingProjectsResponse, err error) *MockTenantServiceClient_FindParticipatingProjects_Call {
-	_c.Call.Return(findParticipatingProjectsResponse, err)
+func (_c *MockTenantServiceClient_FindParticipatingProjects_Call) Return(response *connect.Response[apiv1.FindParticipatingProjectsResponse], err error) *MockTenantServiceClient_FindParticipatingProjects_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantServiceClient_FindParticipatingProjects_Call) RunAndReturn(run func(ctx context.Context, in *v1.FindParticipatingProjectsRequest, opts ...grpc.CallOption) (*v1.FindParticipatingProjectsResponse, error)) *MockTenantServiceClient_FindParticipatingProjects_Call {
+func (_c *MockTenantServiceClient_FindParticipatingProjects_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error)) *MockTenantServiceClient_FindParticipatingProjects_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // FindParticipatingTenants provides a mock function for the type MockTenantServiceClient
-func (_mock *MockTenantServiceClient) FindParticipatingTenants(ctx context.Context, in *v1.FindParticipatingTenantsRequest, opts ...grpc.CallOption) (*v1.FindParticipatingTenantsResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantServiceClient) FindParticipatingTenants(context1 context.Context, request *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for FindParticipatingTenants")
 	}
 
-	var r0 *v1.FindParticipatingTenantsResponse
+	var r0 *connect.Response[apiv1.FindParticipatingTenantsResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.FindParticipatingTenantsRequest, ...grpc.CallOption) (*v1.FindParticipatingTenantsResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.FindParticipatingTenantsRequest, ...grpc.CallOption) *v1.FindParticipatingTenantsResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) *connect.Response[apiv1.FindParticipatingTenantsResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.FindParticipatingTenantsResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.FindParticipatingTenantsResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.FindParticipatingTenantsRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -411,77 +345,62 @@ type MockTenantServiceClient_FindParticipatingTenants_Call struct {
 }
 
 // FindParticipatingTenants is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.FindParticipatingTenantsRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantServiceClient_Expecter) FindParticipatingTenants(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantServiceClient_FindParticipatingTenants_Call {
-	return &MockTenantServiceClient_FindParticipatingTenants_Call{Call: _e.mock.On("FindParticipatingTenants",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.FindParticipatingTenantsRequest]
+func (_e *MockTenantServiceClient_Expecter) FindParticipatingTenants(context1 interface{}, request interface{}) *MockTenantServiceClient_FindParticipatingTenants_Call {
+	return &MockTenantServiceClient_FindParticipatingTenants_Call{Call: _e.mock.On("FindParticipatingTenants", context1, request)}
 }
 
-func (_c *MockTenantServiceClient_FindParticipatingTenants_Call) Run(run func(ctx context.Context, in *v1.FindParticipatingTenantsRequest, opts ...grpc.CallOption)) *MockTenantServiceClient_FindParticipatingTenants_Call {
+func (_c *MockTenantServiceClient_FindParticipatingTenants_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.FindParticipatingTenantsRequest])) *MockTenantServiceClient_FindParticipatingTenants_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.FindParticipatingTenantsRequest
+		var arg1 *connect.Request[apiv1.FindParticipatingTenantsRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.FindParticipatingTenantsRequest)
+			arg1 = args[1].(*connect.Request[apiv1.FindParticipatingTenantsRequest])
 		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
-		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantServiceClient_FindParticipatingTenants_Call) Return(findParticipatingTenantsResponse *v1.FindParticipatingTenantsResponse, err error) *MockTenantServiceClient_FindParticipatingTenants_Call {
-	_c.Call.Return(findParticipatingTenantsResponse, err)
+func (_c *MockTenantServiceClient_FindParticipatingTenants_Call) Return(response *connect.Response[apiv1.FindParticipatingTenantsResponse], err error) *MockTenantServiceClient_FindParticipatingTenants_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantServiceClient_FindParticipatingTenants_Call) RunAndReturn(run func(ctx context.Context, in *v1.FindParticipatingTenantsRequest, opts ...grpc.CallOption) (*v1.FindParticipatingTenantsResponse, error)) *MockTenantServiceClient_FindParticipatingTenants_Call {
+func (_c *MockTenantServiceClient_FindParticipatingTenants_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error)) *MockTenantServiceClient_FindParticipatingTenants_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Get provides a mock function for the type MockTenantServiceClient
-func (_mock *MockTenantServiceClient) Get(ctx context.Context, in *v1.TenantGetRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantServiceClient) Get(context1 context.Context, request *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Get")
 	}
 
-	var r0 *v1.TenantResponse
+	var r0 *connect.Response[apiv1.TenantResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantGetRequest, ...grpc.CallOption) (*v1.TenantResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantGetRequest, ...grpc.CallOption) *v1.TenantResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantGetRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -494,77 +413,62 @@ type MockTenantServiceClient_Get_Call struct {
 }
 
 // Get is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantGetRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantServiceClient_Expecter) Get(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantServiceClient_Get_Call {
-	return &MockTenantServiceClient_Get_Call{Call: _e.mock.On("Get",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantGetRequest]
+func (_e *MockTenantServiceClient_Expecter) Get(context1 interface{}, request interface{}) *MockTenantServiceClient_Get_Call {
+	return &MockTenantServiceClient_Get_Call{Call: _e.mock.On("Get", context1, request)}
 }
 
-func (_c *MockTenantServiceClient_Get_Call) Run(run func(ctx context.Context, in *v1.TenantGetRequest, opts ...grpc.CallOption)) *MockTenantServiceClient_Get_Call {
+func (_c *MockTenantServiceClient_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantGetRequest])) *MockTenantServiceClient_Get_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantGetRequest
+		var arg1 *connect.Request[apiv1.TenantGetRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantGetRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.TenantGetRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Get_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceClient_Get_Call {
-	_c.Call.Return(tenantResponse, err)
+func (_c *MockTenantServiceClient_Get_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceClient_Get_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Get_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantGetRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error)) *MockTenantServiceClient_Get_Call {
+func (_c *MockTenantServiceClient_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceClient_Get_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // GetHistory provides a mock function for the type MockTenantServiceClient
-func (_mock *MockTenantServiceClient) GetHistory(ctx context.Context, in *v1.TenantGetHistoryRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantServiceClient) GetHistory(context1 context.Context, request *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for GetHistory")
 	}
 
-	var r0 *v1.TenantResponse
+	var r0 *connect.Response[apiv1.TenantResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantGetHistoryRequest, ...grpc.CallOption) (*v1.TenantResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantGetHistoryRequest, ...grpc.CallOption) *v1.TenantResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantGetHistoryRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -577,77 +481,62 @@ type MockTenantServiceClient_GetHistory_Call struct {
 }
 
 // GetHistory is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantGetHistoryRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantServiceClient_Expecter) GetHistory(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantServiceClient_GetHistory_Call {
-	return &MockTenantServiceClient_GetHistory_Call{Call: _e.mock.On("GetHistory",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantGetHistoryRequest]
+func (_e *MockTenantServiceClient_Expecter) GetHistory(context1 interface{}, request interface{}) *MockTenantServiceClient_GetHistory_Call {
+	return &MockTenantServiceClient_GetHistory_Call{Call: _e.mock.On("GetHistory", context1, request)}
 }
 
-func (_c *MockTenantServiceClient_GetHistory_Call) Run(run func(ctx context.Context, in *v1.TenantGetHistoryRequest, opts ...grpc.CallOption)) *MockTenantServiceClient_GetHistory_Call {
+func (_c *MockTenantServiceClient_GetHistory_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantGetHistoryRequest])) *MockTenantServiceClient_GetHistory_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantGetHistoryRequest
+		var arg1 *connect.Request[apiv1.TenantGetHistoryRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantGetHistoryRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.TenantGetHistoryRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantServiceClient_GetHistory_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceClient_GetHistory_Call {
-	_c.Call.Return(tenantResponse, err)
+func (_c *MockTenantServiceClient_GetHistory_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceClient_GetHistory_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantServiceClient_GetHistory_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantGetHistoryRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error)) *MockTenantServiceClient_GetHistory_Call {
+func (_c *MockTenantServiceClient_GetHistory_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceClient_GetHistory_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // ListTenantMembers provides a mock function for the type MockTenantServiceClient
-func (_mock *MockTenantServiceClient) ListTenantMembers(ctx context.Context, in *v1.ListTenantMembersRequest, opts ...grpc.CallOption) (*v1.ListTenantMembersResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantServiceClient) ListTenantMembers(context1 context.Context, request *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for ListTenantMembers")
 	}
 
-	var r0 *v1.ListTenantMembersResponse
+	var r0 *connect.Response[apiv1.ListTenantMembersResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ListTenantMembersRequest, ...grpc.CallOption) (*v1.ListTenantMembersResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ListTenantMembersRequest, ...grpc.CallOption) *v1.ListTenantMembersResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) *connect.Response[apiv1.ListTenantMembersResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ListTenantMembersResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.ListTenantMembersResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ListTenantMembersRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -660,77 +549,62 @@ type MockTenantServiceClient_ListTenantMembers_Call struct {
 }
 
 // ListTenantMembers is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.ListTenantMembersRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantServiceClient_Expecter) ListTenantMembers(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantServiceClient_ListTenantMembers_Call {
-	return &MockTenantServiceClient_ListTenantMembers_Call{Call: _e.mock.On("ListTenantMembers",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ListTenantMembersRequest]
+func (_e *MockTenantServiceClient_Expecter) ListTenantMembers(context1 interface{}, request interface{}) *MockTenantServiceClient_ListTenantMembers_Call {
+	return &MockTenantServiceClient_ListTenantMembers_Call{Call: _e.mock.On("ListTenantMembers", context1, request)}
 }
 
-func (_c *MockTenantServiceClient_ListTenantMembers_Call) Run(run func(ctx context.Context, in *v1.ListTenantMembersRequest, opts ...grpc.CallOption)) *MockTenantServiceClient_ListTenantMembers_Call {
+func (_c *MockTenantServiceClient_ListTenantMembers_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ListTenantMembersRequest])) *MockTenantServiceClient_ListTenantMembers_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.ListTenantMembersRequest
+		var arg1 *connect.Request[apiv1.ListTenantMembersRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.ListTenantMembersRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.ListTenantMembersRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantServiceClient_ListTenantMembers_Call) Return(listTenantMembersResponse *v1.ListTenantMembersResponse, err error) *MockTenantServiceClient_ListTenantMembers_Call {
-	_c.Call.Return(listTenantMembersResponse, err)
+func (_c *MockTenantServiceClient_ListTenantMembers_Call) Return(response *connect.Response[apiv1.ListTenantMembersResponse], err error) *MockTenantServiceClient_ListTenantMembers_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantServiceClient_ListTenantMembers_Call) RunAndReturn(run func(ctx context.Context, in *v1.ListTenantMembersRequest, opts ...grpc.CallOption) (*v1.ListTenantMembersResponse, error)) *MockTenantServiceClient_ListTenantMembers_Call {
+func (_c *MockTenantServiceClient_ListTenantMembers_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error)) *MockTenantServiceClient_ListTenantMembers_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Update provides a mock function for the type MockTenantServiceClient
-func (_mock *MockTenantServiceClient) Update(ctx context.Context, in *v1.TenantUpdateRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockTenantServiceClient) Update(context1 context.Context, request *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Update")
 	}
 
-	var r0 *v1.TenantResponse
+	var r0 *connect.Response[apiv1.TenantResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantUpdateRequest, ...grpc.CallOption) (*v1.TenantResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantUpdateRequest, ...grpc.CallOption) *v1.TenantResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantUpdateRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -743,45 +617,36 @@ type MockTenantServiceClient_Update_Call struct {
 }
 
 // Update is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.TenantUpdateRequest
-//   - opts ...grpc.CallOption
-func (_e *MockTenantServiceClient_Expecter) Update(ctx interface{}, in interface{}, opts ...interface{}) *MockTenantServiceClient_Update_Call {
-	return &MockTenantServiceClient_Update_Call{Call: _e.mock.On("Update",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantUpdateRequest]
+func (_e *MockTenantServiceClient_Expecter) Update(context1 interface{}, request interface{}) *MockTenantServiceClient_Update_Call {
+	return &MockTenantServiceClient_Update_Call{Call: _e.mock.On("Update", context1, request)}
 }
 
-func (_c *MockTenantServiceClient_Update_Call) Run(run func(ctx context.Context, in *v1.TenantUpdateRequest, opts ...grpc.CallOption)) *MockTenantServiceClient_Update_Call {
+func (_c *MockTenantServiceClient_Update_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantUpdateRequest])) *MockTenantServiceClient_Update_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.TenantUpdateRequest
+		var arg1 *connect.Request[apiv1.TenantUpdateRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantUpdateRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.TenantUpdateRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Update_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceClient_Update_Call {
-	_c.Call.Return(tenantResponse, err)
+func (_c *MockTenantServiceClient_Update_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceClient_Update_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockTenantServiceClient_Update_Call) RunAndReturn(run func(ctx context.Context, in *v1.TenantUpdateRequest, opts ...grpc.CallOption) (*v1.TenantResponse, error)) *MockTenantServiceClient_Update_Call {
+func (_c *MockTenantServiceClient_Update_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceClient_Update_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/test/mocks/TenantServiceHandler.go b/pkg/test/mocks/TenantServiceHandler.go
new file mode 100644
index 0000000..106d928
--- /dev/null
+++ b/pkg/test/mocks/TenantServiceHandler.go
@@ -0,0 +1,652 @@
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
+
+package mocks
+
+import (
+	"context"
+
+	"connectrpc.com/connect"
+	"github.com/metal-stack/masterdata-api/api/v1"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// NewMockTenantServiceHandler creates a new instance of MockTenantServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockTenantServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockTenantServiceHandler {
+	mock := &MockTenantServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
+// MockTenantServiceHandler is an autogenerated mock type for the TenantServiceHandler type
+type MockTenantServiceHandler struct {
+	mock.Mock
+}
+
+type MockTenantServiceHandler_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *MockTenantServiceHandler) EXPECT() *MockTenantServiceHandler_Expecter {
+	return &MockTenantServiceHandler_Expecter{mock: &_m.Mock}
+}
+
+// Create provides a mock function for the type MockTenantServiceHandler
+func (_mock *MockTenantServiceHandler) Create(context1 context.Context, request *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantCreateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantServiceHandler_Create_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Create'
+type MockTenantServiceHandler_Create_Call struct {
+	*mock.Call
+}
+
+// Create is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantCreateRequest]
+func (_e *MockTenantServiceHandler_Expecter) Create(context1 interface{}, request interface{}) *MockTenantServiceHandler_Create_Call {
+	return &MockTenantServiceHandler_Create_Call{Call: _e.mock.On("Create", context1, request)}
+}
+
+func (_c *MockTenantServiceHandler_Create_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantCreateRequest])) *MockTenantServiceHandler_Create_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantCreateRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantCreateRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Create_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceHandler_Create_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Create_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantCreateRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceHandler_Create_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Delete provides a mock function for the type MockTenantServiceHandler
+func (_mock *MockTenantServiceHandler) Delete(context1 context.Context, request *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantDeleteRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantServiceHandler_Delete_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Delete'
+type MockTenantServiceHandler_Delete_Call struct {
+	*mock.Call
+}
+
+// Delete is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantDeleteRequest]
+func (_e *MockTenantServiceHandler_Expecter) Delete(context1 interface{}, request interface{}) *MockTenantServiceHandler_Delete_Call {
+	return &MockTenantServiceHandler_Delete_Call{Call: _e.mock.On("Delete", context1, request)}
+}
+
+func (_c *MockTenantServiceHandler_Delete_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantDeleteRequest])) *MockTenantServiceHandler_Delete_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantDeleteRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantDeleteRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Delete_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceHandler_Delete_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Delete_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantDeleteRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceHandler_Delete_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Find provides a mock function for the type MockTenantServiceHandler
+func (_mock *MockTenantServiceHandler) Find(context1 context.Context, request *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Find")
+	}
+
+	var r0 *connect.Response[apiv1.TenantListResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) *connect.Response[apiv1.TenantListResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantListResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantFindRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantServiceHandler_Find_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Find'
+type MockTenantServiceHandler_Find_Call struct {
+	*mock.Call
+}
+
+// Find is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantFindRequest]
+func (_e *MockTenantServiceHandler_Expecter) Find(context1 interface{}, request interface{}) *MockTenantServiceHandler_Find_Call {
+	return &MockTenantServiceHandler_Find_Call{Call: _e.mock.On("Find", context1, request)}
+}
+
+func (_c *MockTenantServiceHandler_Find_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantFindRequest])) *MockTenantServiceHandler_Find_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantFindRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantFindRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Find_Call) Return(response *connect.Response[apiv1.TenantListResponse], err error) *MockTenantServiceHandler_Find_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Find_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantFindRequest]) (*connect.Response[apiv1.TenantListResponse], error)) *MockTenantServiceHandler_Find_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FindParticipatingProjects provides a mock function for the type MockTenantServiceHandler
+func (_mock *MockTenantServiceHandler) FindParticipatingProjects(context1 context.Context, request *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FindParticipatingProjects")
+	}
+
+	var r0 *connect.Response[apiv1.FindParticipatingProjectsResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) *connect.Response[apiv1.FindParticipatingProjectsResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.FindParticipatingProjectsResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.FindParticipatingProjectsRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantServiceHandler_FindParticipatingProjects_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FindParticipatingProjects'
+type MockTenantServiceHandler_FindParticipatingProjects_Call struct {
+	*mock.Call
+}
+
+// FindParticipatingProjects is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.FindParticipatingProjectsRequest]
+func (_e *MockTenantServiceHandler_Expecter) FindParticipatingProjects(context1 interface{}, request interface{}) *MockTenantServiceHandler_FindParticipatingProjects_Call {
+	return &MockTenantServiceHandler_FindParticipatingProjects_Call{Call: _e.mock.On("FindParticipatingProjects", context1, request)}
+}
+
+func (_c *MockTenantServiceHandler_FindParticipatingProjects_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.FindParticipatingProjectsRequest])) *MockTenantServiceHandler_FindParticipatingProjects_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.FindParticipatingProjectsRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.FindParticipatingProjectsRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_FindParticipatingProjects_Call) Return(response *connect.Response[apiv1.FindParticipatingProjectsResponse], err error) *MockTenantServiceHandler_FindParticipatingProjects_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_FindParticipatingProjects_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.FindParticipatingProjectsRequest]) (*connect.Response[apiv1.FindParticipatingProjectsResponse], error)) *MockTenantServiceHandler_FindParticipatingProjects_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// FindParticipatingTenants provides a mock function for the type MockTenantServiceHandler
+func (_mock *MockTenantServiceHandler) FindParticipatingTenants(context1 context.Context, request *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for FindParticipatingTenants")
+	}
+
+	var r0 *connect.Response[apiv1.FindParticipatingTenantsResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) *connect.Response[apiv1.FindParticipatingTenantsResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.FindParticipatingTenantsResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.FindParticipatingTenantsRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantServiceHandler_FindParticipatingTenants_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FindParticipatingTenants'
+type MockTenantServiceHandler_FindParticipatingTenants_Call struct {
+	*mock.Call
+}
+
+// FindParticipatingTenants is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.FindParticipatingTenantsRequest]
+func (_e *MockTenantServiceHandler_Expecter) FindParticipatingTenants(context1 interface{}, request interface{}) *MockTenantServiceHandler_FindParticipatingTenants_Call {
+	return &MockTenantServiceHandler_FindParticipatingTenants_Call{Call: _e.mock.On("FindParticipatingTenants", context1, request)}
+}
+
+func (_c *MockTenantServiceHandler_FindParticipatingTenants_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.FindParticipatingTenantsRequest])) *MockTenantServiceHandler_FindParticipatingTenants_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.FindParticipatingTenantsRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.FindParticipatingTenantsRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_FindParticipatingTenants_Call) Return(response *connect.Response[apiv1.FindParticipatingTenantsResponse], err error) *MockTenantServiceHandler_FindParticipatingTenants_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_FindParticipatingTenants_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.FindParticipatingTenantsRequest]) (*connect.Response[apiv1.FindParticipatingTenantsResponse], error)) *MockTenantServiceHandler_FindParticipatingTenants_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Get provides a mock function for the type MockTenantServiceHandler
+func (_mock *MockTenantServiceHandler) Get(context1 context.Context, request *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantGetRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantServiceHandler_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
+type MockTenantServiceHandler_Get_Call struct {
+	*mock.Call
+}
+
+// Get is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantGetRequest]
+func (_e *MockTenantServiceHandler_Expecter) Get(context1 interface{}, request interface{}) *MockTenantServiceHandler_Get_Call {
+	return &MockTenantServiceHandler_Get_Call{Call: _e.mock.On("Get", context1, request)}
+}
+
+func (_c *MockTenantServiceHandler_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantGetRequest])) *MockTenantServiceHandler_Get_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantGetRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantGetRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Get_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceHandler_Get_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantGetRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceHandler_Get_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// GetHistory provides a mock function for the type MockTenantServiceHandler
+func (_mock *MockTenantServiceHandler) GetHistory(context1 context.Context, request *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetHistory")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantGetHistoryRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantServiceHandler_GetHistory_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetHistory'
+type MockTenantServiceHandler_GetHistory_Call struct {
+	*mock.Call
+}
+
+// GetHistory is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantGetHistoryRequest]
+func (_e *MockTenantServiceHandler_Expecter) GetHistory(context1 interface{}, request interface{}) *MockTenantServiceHandler_GetHistory_Call {
+	return &MockTenantServiceHandler_GetHistory_Call{Call: _e.mock.On("GetHistory", context1, request)}
+}
+
+func (_c *MockTenantServiceHandler_GetHistory_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantGetHistoryRequest])) *MockTenantServiceHandler_GetHistory_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantGetHistoryRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantGetHistoryRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_GetHistory_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceHandler_GetHistory_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_GetHistory_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantGetHistoryRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceHandler_GetHistory_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ListTenantMembers provides a mock function for the type MockTenantServiceHandler
+func (_mock *MockTenantServiceHandler) ListTenantMembers(context1 context.Context, request *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ListTenantMembers")
+	}
+
+	var r0 *connect.Response[apiv1.ListTenantMembersResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) *connect.Response[apiv1.ListTenantMembersResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.ListTenantMembersResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.ListTenantMembersRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantServiceHandler_ListTenantMembers_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ListTenantMembers'
+type MockTenantServiceHandler_ListTenantMembers_Call struct {
+	*mock.Call
+}
+
+// ListTenantMembers is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.ListTenantMembersRequest]
+func (_e *MockTenantServiceHandler_Expecter) ListTenantMembers(context1 interface{}, request interface{}) *MockTenantServiceHandler_ListTenantMembers_Call {
+	return &MockTenantServiceHandler_ListTenantMembers_Call{Call: _e.mock.On("ListTenantMembers", context1, request)}
+}
+
+func (_c *MockTenantServiceHandler_ListTenantMembers_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.ListTenantMembersRequest])) *MockTenantServiceHandler_ListTenantMembers_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.ListTenantMembersRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.ListTenantMembersRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_ListTenantMembers_Call) Return(response *connect.Response[apiv1.ListTenantMembersResponse], err error) *MockTenantServiceHandler_ListTenantMembers_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_ListTenantMembers_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.ListTenantMembersRequest]) (*connect.Response[apiv1.ListTenantMembersResponse], error)) *MockTenantServiceHandler_ListTenantMembers_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Update provides a mock function for the type MockTenantServiceHandler
+func (_mock *MockTenantServiceHandler) Update(context1 context.Context, request *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 *connect.Response[apiv1.TenantResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) *connect.Response[apiv1.TenantResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.TenantResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.TenantUpdateRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockTenantServiceHandler_Update_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Update'
+type MockTenantServiceHandler_Update_Call struct {
+	*mock.Call
+}
+
+// Update is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.TenantUpdateRequest]
+func (_e *MockTenantServiceHandler_Expecter) Update(context1 interface{}, request interface{}) *MockTenantServiceHandler_Update_Call {
+	return &MockTenantServiceHandler_Update_Call{Call: _e.mock.On("Update", context1, request)}
+}
+
+func (_c *MockTenantServiceHandler_Update_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.TenantUpdateRequest])) *MockTenantServiceHandler_Update_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.TenantUpdateRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.TenantUpdateRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Update_Call) Return(response *connect.Response[apiv1.TenantResponse], err error) *MockTenantServiceHandler_Update_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockTenantServiceHandler_Update_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.TenantUpdateRequest]) (*connect.Response[apiv1.TenantResponse], error)) *MockTenantServiceHandler_Update_Call {
+	_c.Call.Return(run)
+	return _c
+}
diff --git a/pkg/test/mocks/TenantServiceServer.go b/pkg/test/mocks/TenantServiceServer.go
deleted file mode 100644
index df0dbc5..0000000
--- a/pkg/test/mocks/TenantServiceServer.go
+++ /dev/null
@@ -1,651 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	"context"
-
-	"github.com/metal-stack/masterdata-api/api/v1"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockTenantServiceServer creates a new instance of MockTenantServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockTenantServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockTenantServiceServer {
-	mock := &MockTenantServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockTenantServiceServer is an autogenerated mock type for the TenantServiceServer type
-type MockTenantServiceServer struct {
-	mock.Mock
-}
-
-type MockTenantServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockTenantServiceServer) EXPECT() *MockTenantServiceServer_Expecter {
-	return &MockTenantServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// Create provides a mock function for the type MockTenantServiceServer
-func (_mock *MockTenantServiceServer) Create(context1 context.Context, tenantCreateRequest *v1.TenantCreateRequest) (*v1.TenantResponse, error) {
-	ret := _mock.Called(context1, tenantCreateRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Create")
-	}
-
-	var r0 *v1.TenantResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantCreateRequest) (*v1.TenantResponse, error)); ok {
-		return returnFunc(context1, tenantCreateRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantCreateRequest) *v1.TenantResponse); ok {
-		r0 = returnFunc(context1, tenantCreateRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantCreateRequest) error); ok {
-		r1 = returnFunc(context1, tenantCreateRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantServiceServer_Create_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Create'
-type MockTenantServiceServer_Create_Call struct {
-	*mock.Call
-}
-
-// Create is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantCreateRequest *v1.TenantCreateRequest
-func (_e *MockTenantServiceServer_Expecter) Create(context1 interface{}, tenantCreateRequest interface{}) *MockTenantServiceServer_Create_Call {
-	return &MockTenantServiceServer_Create_Call{Call: _e.mock.On("Create", context1, tenantCreateRequest)}
-}
-
-func (_c *MockTenantServiceServer_Create_Call) Run(run func(context1 context.Context, tenantCreateRequest *v1.TenantCreateRequest)) *MockTenantServiceServer_Create_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantCreateRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantCreateRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Create_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceServer_Create_Call {
-	_c.Call.Return(tenantResponse, err)
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Create_Call) RunAndReturn(run func(context1 context.Context, tenantCreateRequest *v1.TenantCreateRequest) (*v1.TenantResponse, error)) *MockTenantServiceServer_Create_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Delete provides a mock function for the type MockTenantServiceServer
-func (_mock *MockTenantServiceServer) Delete(context1 context.Context, tenantDeleteRequest *v1.TenantDeleteRequest) (*v1.TenantResponse, error) {
-	ret := _mock.Called(context1, tenantDeleteRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Delete")
-	}
-
-	var r0 *v1.TenantResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantDeleteRequest) (*v1.TenantResponse, error)); ok {
-		return returnFunc(context1, tenantDeleteRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantDeleteRequest) *v1.TenantResponse); ok {
-		r0 = returnFunc(context1, tenantDeleteRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantDeleteRequest) error); ok {
-		r1 = returnFunc(context1, tenantDeleteRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantServiceServer_Delete_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Delete'
-type MockTenantServiceServer_Delete_Call struct {
-	*mock.Call
-}
-
-// Delete is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantDeleteRequest *v1.TenantDeleteRequest
-func (_e *MockTenantServiceServer_Expecter) Delete(context1 interface{}, tenantDeleteRequest interface{}) *MockTenantServiceServer_Delete_Call {
-	return &MockTenantServiceServer_Delete_Call{Call: _e.mock.On("Delete", context1, tenantDeleteRequest)}
-}
-
-func (_c *MockTenantServiceServer_Delete_Call) Run(run func(context1 context.Context, tenantDeleteRequest *v1.TenantDeleteRequest)) *MockTenantServiceServer_Delete_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantDeleteRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantDeleteRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Delete_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceServer_Delete_Call {
-	_c.Call.Return(tenantResponse, err)
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Delete_Call) RunAndReturn(run func(context1 context.Context, tenantDeleteRequest *v1.TenantDeleteRequest) (*v1.TenantResponse, error)) *MockTenantServiceServer_Delete_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Find provides a mock function for the type MockTenantServiceServer
-func (_mock *MockTenantServiceServer) Find(context1 context.Context, tenantFindRequest *v1.TenantFindRequest) (*v1.TenantListResponse, error) {
-	ret := _mock.Called(context1, tenantFindRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Find")
-	}
-
-	var r0 *v1.TenantListResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantFindRequest) (*v1.TenantListResponse, error)); ok {
-		return returnFunc(context1, tenantFindRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantFindRequest) *v1.TenantListResponse); ok {
-		r0 = returnFunc(context1, tenantFindRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantListResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantFindRequest) error); ok {
-		r1 = returnFunc(context1, tenantFindRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantServiceServer_Find_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Find'
-type MockTenantServiceServer_Find_Call struct {
-	*mock.Call
-}
-
-// Find is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantFindRequest *v1.TenantFindRequest
-func (_e *MockTenantServiceServer_Expecter) Find(context1 interface{}, tenantFindRequest interface{}) *MockTenantServiceServer_Find_Call {
-	return &MockTenantServiceServer_Find_Call{Call: _e.mock.On("Find", context1, tenantFindRequest)}
-}
-
-func (_c *MockTenantServiceServer_Find_Call) Run(run func(context1 context.Context, tenantFindRequest *v1.TenantFindRequest)) *MockTenantServiceServer_Find_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantFindRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantFindRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Find_Call) Return(tenantListResponse *v1.TenantListResponse, err error) *MockTenantServiceServer_Find_Call {
-	_c.Call.Return(tenantListResponse, err)
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Find_Call) RunAndReturn(run func(context1 context.Context, tenantFindRequest *v1.TenantFindRequest) (*v1.TenantListResponse, error)) *MockTenantServiceServer_Find_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FindParticipatingProjects provides a mock function for the type MockTenantServiceServer
-func (_mock *MockTenantServiceServer) FindParticipatingProjects(context1 context.Context, findParticipatingProjectsRequest *v1.FindParticipatingProjectsRequest) (*v1.FindParticipatingProjectsResponse, error) {
-	ret := _mock.Called(context1, findParticipatingProjectsRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FindParticipatingProjects")
-	}
-
-	var r0 *v1.FindParticipatingProjectsResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.FindParticipatingProjectsRequest) (*v1.FindParticipatingProjectsResponse, error)); ok {
-		return returnFunc(context1, findParticipatingProjectsRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.FindParticipatingProjectsRequest) *v1.FindParticipatingProjectsResponse); ok {
-		r0 = returnFunc(context1, findParticipatingProjectsRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.FindParticipatingProjectsResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.FindParticipatingProjectsRequest) error); ok {
-		r1 = returnFunc(context1, findParticipatingProjectsRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantServiceServer_FindParticipatingProjects_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FindParticipatingProjects'
-type MockTenantServiceServer_FindParticipatingProjects_Call struct {
-	*mock.Call
-}
-
-// FindParticipatingProjects is a helper method to define mock.On call
-//   - context1 context.Context
-//   - findParticipatingProjectsRequest *v1.FindParticipatingProjectsRequest
-func (_e *MockTenantServiceServer_Expecter) FindParticipatingProjects(context1 interface{}, findParticipatingProjectsRequest interface{}) *MockTenantServiceServer_FindParticipatingProjects_Call {
-	return &MockTenantServiceServer_FindParticipatingProjects_Call{Call: _e.mock.On("FindParticipatingProjects", context1, findParticipatingProjectsRequest)}
-}
-
-func (_c *MockTenantServiceServer_FindParticipatingProjects_Call) Run(run func(context1 context.Context, findParticipatingProjectsRequest *v1.FindParticipatingProjectsRequest)) *MockTenantServiceServer_FindParticipatingProjects_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.FindParticipatingProjectsRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.FindParticipatingProjectsRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantServiceServer_FindParticipatingProjects_Call) Return(findParticipatingProjectsResponse *v1.FindParticipatingProjectsResponse, err error) *MockTenantServiceServer_FindParticipatingProjects_Call {
-	_c.Call.Return(findParticipatingProjectsResponse, err)
-	return _c
-}
-
-func (_c *MockTenantServiceServer_FindParticipatingProjects_Call) RunAndReturn(run func(context1 context.Context, findParticipatingProjectsRequest *v1.FindParticipatingProjectsRequest) (*v1.FindParticipatingProjectsResponse, error)) *MockTenantServiceServer_FindParticipatingProjects_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// FindParticipatingTenants provides a mock function for the type MockTenantServiceServer
-func (_mock *MockTenantServiceServer) FindParticipatingTenants(context1 context.Context, findParticipatingTenantsRequest *v1.FindParticipatingTenantsRequest) (*v1.FindParticipatingTenantsResponse, error) {
-	ret := _mock.Called(context1, findParticipatingTenantsRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for FindParticipatingTenants")
-	}
-
-	var r0 *v1.FindParticipatingTenantsResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.FindParticipatingTenantsRequest) (*v1.FindParticipatingTenantsResponse, error)); ok {
-		return returnFunc(context1, findParticipatingTenantsRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.FindParticipatingTenantsRequest) *v1.FindParticipatingTenantsResponse); ok {
-		r0 = returnFunc(context1, findParticipatingTenantsRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.FindParticipatingTenantsResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.FindParticipatingTenantsRequest) error); ok {
-		r1 = returnFunc(context1, findParticipatingTenantsRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantServiceServer_FindParticipatingTenants_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'FindParticipatingTenants'
-type MockTenantServiceServer_FindParticipatingTenants_Call struct {
-	*mock.Call
-}
-
-// FindParticipatingTenants is a helper method to define mock.On call
-//   - context1 context.Context
-//   - findParticipatingTenantsRequest *v1.FindParticipatingTenantsRequest
-func (_e *MockTenantServiceServer_Expecter) FindParticipatingTenants(context1 interface{}, findParticipatingTenantsRequest interface{}) *MockTenantServiceServer_FindParticipatingTenants_Call {
-	return &MockTenantServiceServer_FindParticipatingTenants_Call{Call: _e.mock.On("FindParticipatingTenants", context1, findParticipatingTenantsRequest)}
-}
-
-func (_c *MockTenantServiceServer_FindParticipatingTenants_Call) Run(run func(context1 context.Context, findParticipatingTenantsRequest *v1.FindParticipatingTenantsRequest)) *MockTenantServiceServer_FindParticipatingTenants_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.FindParticipatingTenantsRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.FindParticipatingTenantsRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantServiceServer_FindParticipatingTenants_Call) Return(findParticipatingTenantsResponse *v1.FindParticipatingTenantsResponse, err error) *MockTenantServiceServer_FindParticipatingTenants_Call {
-	_c.Call.Return(findParticipatingTenantsResponse, err)
-	return _c
-}
-
-func (_c *MockTenantServiceServer_FindParticipatingTenants_Call) RunAndReturn(run func(context1 context.Context, findParticipatingTenantsRequest *v1.FindParticipatingTenantsRequest) (*v1.FindParticipatingTenantsResponse, error)) *MockTenantServiceServer_FindParticipatingTenants_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Get provides a mock function for the type MockTenantServiceServer
-func (_mock *MockTenantServiceServer) Get(context1 context.Context, tenantGetRequest *v1.TenantGetRequest) (*v1.TenantResponse, error) {
-	ret := _mock.Called(context1, tenantGetRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Get")
-	}
-
-	var r0 *v1.TenantResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantGetRequest) (*v1.TenantResponse, error)); ok {
-		return returnFunc(context1, tenantGetRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantGetRequest) *v1.TenantResponse); ok {
-		r0 = returnFunc(context1, tenantGetRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantGetRequest) error); ok {
-		r1 = returnFunc(context1, tenantGetRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantServiceServer_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
-type MockTenantServiceServer_Get_Call struct {
-	*mock.Call
-}
-
-// Get is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantGetRequest *v1.TenantGetRequest
-func (_e *MockTenantServiceServer_Expecter) Get(context1 interface{}, tenantGetRequest interface{}) *MockTenantServiceServer_Get_Call {
-	return &MockTenantServiceServer_Get_Call{Call: _e.mock.On("Get", context1, tenantGetRequest)}
-}
-
-func (_c *MockTenantServiceServer_Get_Call) Run(run func(context1 context.Context, tenantGetRequest *v1.TenantGetRequest)) *MockTenantServiceServer_Get_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantGetRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantGetRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Get_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceServer_Get_Call {
-	_c.Call.Return(tenantResponse, err)
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Get_Call) RunAndReturn(run func(context1 context.Context, tenantGetRequest *v1.TenantGetRequest) (*v1.TenantResponse, error)) *MockTenantServiceServer_Get_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// GetHistory provides a mock function for the type MockTenantServiceServer
-func (_mock *MockTenantServiceServer) GetHistory(context1 context.Context, tenantGetHistoryRequest *v1.TenantGetHistoryRequest) (*v1.TenantResponse, error) {
-	ret := _mock.Called(context1, tenantGetHistoryRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetHistory")
-	}
-
-	var r0 *v1.TenantResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantGetHistoryRequest) (*v1.TenantResponse, error)); ok {
-		return returnFunc(context1, tenantGetHistoryRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantGetHistoryRequest) *v1.TenantResponse); ok {
-		r0 = returnFunc(context1, tenantGetHistoryRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantGetHistoryRequest) error); ok {
-		r1 = returnFunc(context1, tenantGetHistoryRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantServiceServer_GetHistory_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetHistory'
-type MockTenantServiceServer_GetHistory_Call struct {
-	*mock.Call
-}
-
-// GetHistory is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantGetHistoryRequest *v1.TenantGetHistoryRequest
-func (_e *MockTenantServiceServer_Expecter) GetHistory(context1 interface{}, tenantGetHistoryRequest interface{}) *MockTenantServiceServer_GetHistory_Call {
-	return &MockTenantServiceServer_GetHistory_Call{Call: _e.mock.On("GetHistory", context1, tenantGetHistoryRequest)}
-}
-
-func (_c *MockTenantServiceServer_GetHistory_Call) Run(run func(context1 context.Context, tenantGetHistoryRequest *v1.TenantGetHistoryRequest)) *MockTenantServiceServer_GetHistory_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantGetHistoryRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantGetHistoryRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantServiceServer_GetHistory_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceServer_GetHistory_Call {
-	_c.Call.Return(tenantResponse, err)
-	return _c
-}
-
-func (_c *MockTenantServiceServer_GetHistory_Call) RunAndReturn(run func(context1 context.Context, tenantGetHistoryRequest *v1.TenantGetHistoryRequest) (*v1.TenantResponse, error)) *MockTenantServiceServer_GetHistory_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// ListTenantMembers provides a mock function for the type MockTenantServiceServer
-func (_mock *MockTenantServiceServer) ListTenantMembers(context1 context.Context, listTenantMembersRequest *v1.ListTenantMembersRequest) (*v1.ListTenantMembersResponse, error) {
-	ret := _mock.Called(context1, listTenantMembersRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ListTenantMembers")
-	}
-
-	var r0 *v1.ListTenantMembersResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ListTenantMembersRequest) (*v1.ListTenantMembersResponse, error)); ok {
-		return returnFunc(context1, listTenantMembersRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.ListTenantMembersRequest) *v1.ListTenantMembersResponse); ok {
-		r0 = returnFunc(context1, listTenantMembersRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.ListTenantMembersResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.ListTenantMembersRequest) error); ok {
-		r1 = returnFunc(context1, listTenantMembersRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantServiceServer_ListTenantMembers_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ListTenantMembers'
-type MockTenantServiceServer_ListTenantMembers_Call struct {
-	*mock.Call
-}
-
-// ListTenantMembers is a helper method to define mock.On call
-//   - context1 context.Context
-//   - listTenantMembersRequest *v1.ListTenantMembersRequest
-func (_e *MockTenantServiceServer_Expecter) ListTenantMembers(context1 interface{}, listTenantMembersRequest interface{}) *MockTenantServiceServer_ListTenantMembers_Call {
-	return &MockTenantServiceServer_ListTenantMembers_Call{Call: _e.mock.On("ListTenantMembers", context1, listTenantMembersRequest)}
-}
-
-func (_c *MockTenantServiceServer_ListTenantMembers_Call) Run(run func(context1 context.Context, listTenantMembersRequest *v1.ListTenantMembersRequest)) *MockTenantServiceServer_ListTenantMembers_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.ListTenantMembersRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.ListTenantMembersRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantServiceServer_ListTenantMembers_Call) Return(listTenantMembersResponse *v1.ListTenantMembersResponse, err error) *MockTenantServiceServer_ListTenantMembers_Call {
-	_c.Call.Return(listTenantMembersResponse, err)
-	return _c
-}
-
-func (_c *MockTenantServiceServer_ListTenantMembers_Call) RunAndReturn(run func(context1 context.Context, listTenantMembersRequest *v1.ListTenantMembersRequest) (*v1.ListTenantMembersResponse, error)) *MockTenantServiceServer_ListTenantMembers_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Update provides a mock function for the type MockTenantServiceServer
-func (_mock *MockTenantServiceServer) Update(context1 context.Context, tenantUpdateRequest *v1.TenantUpdateRequest) (*v1.TenantResponse, error) {
-	ret := _mock.Called(context1, tenantUpdateRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Update")
-	}
-
-	var r0 *v1.TenantResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantUpdateRequest) (*v1.TenantResponse, error)); ok {
-		return returnFunc(context1, tenantUpdateRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.TenantUpdateRequest) *v1.TenantResponse); ok {
-		r0 = returnFunc(context1, tenantUpdateRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.TenantResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.TenantUpdateRequest) error); ok {
-		r1 = returnFunc(context1, tenantUpdateRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockTenantServiceServer_Update_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Update'
-type MockTenantServiceServer_Update_Call struct {
-	*mock.Call
-}
-
-// Update is a helper method to define mock.On call
-//   - context1 context.Context
-//   - tenantUpdateRequest *v1.TenantUpdateRequest
-func (_e *MockTenantServiceServer_Expecter) Update(context1 interface{}, tenantUpdateRequest interface{}) *MockTenantServiceServer_Update_Call {
-	return &MockTenantServiceServer_Update_Call{Call: _e.mock.On("Update", context1, tenantUpdateRequest)}
-}
-
-func (_c *MockTenantServiceServer_Update_Call) Run(run func(context1 context.Context, tenantUpdateRequest *v1.TenantUpdateRequest)) *MockTenantServiceServer_Update_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.TenantUpdateRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.TenantUpdateRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Update_Call) Return(tenantResponse *v1.TenantResponse, err error) *MockTenantServiceServer_Update_Call {
-	_c.Call.Return(tenantResponse, err)
-	return _c
-}
-
-func (_c *MockTenantServiceServer_Update_Call) RunAndReturn(run func(context1 context.Context, tenantUpdateRequest *v1.TenantUpdateRequest) (*v1.TenantResponse, error)) *MockTenantServiceServer_Update_Call {
-	_c.Call.Return(run)
-	return _c
-}
diff --git a/pkg/test/mocks/UnsafeProjectMemberServiceServer.go b/pkg/test/mocks/UnsafeProjectMemberServiceServer.go
deleted file mode 100644
index d41622d..0000000
--- a/pkg/test/mocks/UnsafeProjectMemberServiceServer.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockUnsafeProjectMemberServiceServer creates a new instance of MockUnsafeProjectMemberServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockUnsafeProjectMemberServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockUnsafeProjectMemberServiceServer {
-	mock := &MockUnsafeProjectMemberServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockUnsafeProjectMemberServiceServer is an autogenerated mock type for the UnsafeProjectMemberServiceServer type
-type MockUnsafeProjectMemberServiceServer struct {
-	mock.Mock
-}
-
-type MockUnsafeProjectMemberServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockUnsafeProjectMemberServiceServer) EXPECT() *MockUnsafeProjectMemberServiceServer_Expecter {
-	return &MockUnsafeProjectMemberServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// mustEmbedUnimplementedProjectMemberServiceServer provides a mock function for the type MockUnsafeProjectMemberServiceServer
-func (_mock *MockUnsafeProjectMemberServiceServer) mustEmbedUnimplementedProjectMemberServiceServer() {
-	_mock.Called()
-	return
-}
-
-// MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'mustEmbedUnimplementedProjectMemberServiceServer'
-type MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call struct {
-	*mock.Call
-}
-
-// mustEmbedUnimplementedProjectMemberServiceServer is a helper method to define mock.On call
-func (_e *MockUnsafeProjectMemberServiceServer_Expecter) mustEmbedUnimplementedProjectMemberServiceServer() *MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call {
-	return &MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call{Call: _e.mock.On("mustEmbedUnimplementedProjectMemberServiceServer")}
-}
-
-func (_c *MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call) Run(run func()) *MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call) Return() *MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call {
-	_c.Call.Return()
-	return _c
-}
-
-func (_c *MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call) RunAndReturn(run func()) *MockUnsafeProjectMemberServiceServer_mustEmbedUnimplementedProjectMemberServiceServer_Call {
-	_c.Run(run)
-	return _c
-}
diff --git a/pkg/test/mocks/UnsafeProjectServiceServer.go b/pkg/test/mocks/UnsafeProjectServiceServer.go
deleted file mode 100644
index 30a74ee..0000000
--- a/pkg/test/mocks/UnsafeProjectServiceServer.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockUnsafeProjectServiceServer creates a new instance of MockUnsafeProjectServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockUnsafeProjectServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockUnsafeProjectServiceServer {
-	mock := &MockUnsafeProjectServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockUnsafeProjectServiceServer is an autogenerated mock type for the UnsafeProjectServiceServer type
-type MockUnsafeProjectServiceServer struct {
-	mock.Mock
-}
-
-type MockUnsafeProjectServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockUnsafeProjectServiceServer) EXPECT() *MockUnsafeProjectServiceServer_Expecter {
-	return &MockUnsafeProjectServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// mustEmbedUnimplementedProjectServiceServer provides a mock function for the type MockUnsafeProjectServiceServer
-func (_mock *MockUnsafeProjectServiceServer) mustEmbedUnimplementedProjectServiceServer() {
-	_mock.Called()
-	return
-}
-
-// MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'mustEmbedUnimplementedProjectServiceServer'
-type MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call struct {
-	*mock.Call
-}
-
-// mustEmbedUnimplementedProjectServiceServer is a helper method to define mock.On call
-func (_e *MockUnsafeProjectServiceServer_Expecter) mustEmbedUnimplementedProjectServiceServer() *MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call {
-	return &MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call{Call: _e.mock.On("mustEmbedUnimplementedProjectServiceServer")}
-}
-
-func (_c *MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call) Run(run func()) *MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call) Return() *MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call {
-	_c.Call.Return()
-	return _c
-}
-
-func (_c *MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call) RunAndReturn(run func()) *MockUnsafeProjectServiceServer_mustEmbedUnimplementedProjectServiceServer_Call {
-	_c.Run(run)
-	return _c
-}
diff --git a/pkg/test/mocks/UnsafeTenantMemberServiceServer.go b/pkg/test/mocks/UnsafeTenantMemberServiceServer.go
deleted file mode 100644
index 9355875..0000000
--- a/pkg/test/mocks/UnsafeTenantMemberServiceServer.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockUnsafeTenantMemberServiceServer creates a new instance of MockUnsafeTenantMemberServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockUnsafeTenantMemberServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockUnsafeTenantMemberServiceServer {
-	mock := &MockUnsafeTenantMemberServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockUnsafeTenantMemberServiceServer is an autogenerated mock type for the UnsafeTenantMemberServiceServer type
-type MockUnsafeTenantMemberServiceServer struct {
-	mock.Mock
-}
-
-type MockUnsafeTenantMemberServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockUnsafeTenantMemberServiceServer) EXPECT() *MockUnsafeTenantMemberServiceServer_Expecter {
-	return &MockUnsafeTenantMemberServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// mustEmbedUnimplementedTenantMemberServiceServer provides a mock function for the type MockUnsafeTenantMemberServiceServer
-func (_mock *MockUnsafeTenantMemberServiceServer) mustEmbedUnimplementedTenantMemberServiceServer() {
-	_mock.Called()
-	return
-}
-
-// MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'mustEmbedUnimplementedTenantMemberServiceServer'
-type MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call struct {
-	*mock.Call
-}
-
-// mustEmbedUnimplementedTenantMemberServiceServer is a helper method to define mock.On call
-func (_e *MockUnsafeTenantMemberServiceServer_Expecter) mustEmbedUnimplementedTenantMemberServiceServer() *MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call {
-	return &MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call{Call: _e.mock.On("mustEmbedUnimplementedTenantMemberServiceServer")}
-}
-
-func (_c *MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call) Run(run func()) *MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call) Return() *MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call {
-	_c.Call.Return()
-	return _c
-}
-
-func (_c *MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call) RunAndReturn(run func()) *MockUnsafeTenantMemberServiceServer_mustEmbedUnimplementedTenantMemberServiceServer_Call {
-	_c.Run(run)
-	return _c
-}
diff --git a/pkg/test/mocks/UnsafeTenantServiceServer.go b/pkg/test/mocks/UnsafeTenantServiceServer.go
deleted file mode 100644
index 5e60599..0000000
--- a/pkg/test/mocks/UnsafeTenantServiceServer.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockUnsafeTenantServiceServer creates a new instance of MockUnsafeTenantServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockUnsafeTenantServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockUnsafeTenantServiceServer {
-	mock := &MockUnsafeTenantServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockUnsafeTenantServiceServer is an autogenerated mock type for the UnsafeTenantServiceServer type
-type MockUnsafeTenantServiceServer struct {
-	mock.Mock
-}
-
-type MockUnsafeTenantServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockUnsafeTenantServiceServer) EXPECT() *MockUnsafeTenantServiceServer_Expecter {
-	return &MockUnsafeTenantServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// mustEmbedUnimplementedTenantServiceServer provides a mock function for the type MockUnsafeTenantServiceServer
-func (_mock *MockUnsafeTenantServiceServer) mustEmbedUnimplementedTenantServiceServer() {
-	_mock.Called()
-	return
-}
-
-// MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'mustEmbedUnimplementedTenantServiceServer'
-type MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call struct {
-	*mock.Call
-}
-
-// mustEmbedUnimplementedTenantServiceServer is a helper method to define mock.On call
-func (_e *MockUnsafeTenantServiceServer_Expecter) mustEmbedUnimplementedTenantServiceServer() *MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call {
-	return &MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call{Call: _e.mock.On("mustEmbedUnimplementedTenantServiceServer")}
-}
-
-func (_c *MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call) Run(run func()) *MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call) Return() *MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call {
-	_c.Call.Return()
-	return _c
-}
-
-func (_c *MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call) RunAndReturn(run func()) *MockUnsafeTenantServiceServer_mustEmbedUnimplementedTenantServiceServer_Call {
-	_c.Run(run)
-	return _c
-}
diff --git a/pkg/test/mocks/UnsafeVersionServiceServer.go b/pkg/test/mocks/UnsafeVersionServiceServer.go
deleted file mode 100644
index 920b417..0000000
--- a/pkg/test/mocks/UnsafeVersionServiceServer.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockUnsafeVersionServiceServer creates a new instance of MockUnsafeVersionServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockUnsafeVersionServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockUnsafeVersionServiceServer {
-	mock := &MockUnsafeVersionServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockUnsafeVersionServiceServer is an autogenerated mock type for the UnsafeVersionServiceServer type
-type MockUnsafeVersionServiceServer struct {
-	mock.Mock
-}
-
-type MockUnsafeVersionServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockUnsafeVersionServiceServer) EXPECT() *MockUnsafeVersionServiceServer_Expecter {
-	return &MockUnsafeVersionServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// mustEmbedUnimplementedVersionServiceServer provides a mock function for the type MockUnsafeVersionServiceServer
-func (_mock *MockUnsafeVersionServiceServer) mustEmbedUnimplementedVersionServiceServer() {
-	_mock.Called()
-	return
-}
-
-// MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'mustEmbedUnimplementedVersionServiceServer'
-type MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call struct {
-	*mock.Call
-}
-
-// mustEmbedUnimplementedVersionServiceServer is a helper method to define mock.On call
-func (_e *MockUnsafeVersionServiceServer_Expecter) mustEmbedUnimplementedVersionServiceServer() *MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call {
-	return &MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call{Call: _e.mock.On("mustEmbedUnimplementedVersionServiceServer")}
-}
-
-func (_c *MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call) Run(run func()) *MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call) Return() *MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call {
-	_c.Call.Return()
-	return _c
-}
-
-func (_c *MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call) RunAndReturn(run func()) *MockUnsafeVersionServiceServer_mustEmbedUnimplementedVersionServiceServer_Call {
-	_c.Run(run)
-	return _c
-}
diff --git a/pkg/test/mocks/VersionServiceClient.go b/pkg/test/mocks/VersionServiceClient.go
index 7e2b556..5d9f2c4 100644
--- a/pkg/test/mocks/VersionServiceClient.go
+++ b/pkg/test/mocks/VersionServiceClient.go
@@ -7,9 +7,9 @@ package mocks
 import (
 	"context"
 
+	"connectrpc.com/connect"
 	"github.com/metal-stack/masterdata-api/api/v1"
 	mock "github.com/stretchr/testify/mock"
-	"google.golang.org/grpc"
 )
 
 // NewMockVersionServiceClient creates a new instance of MockVersionServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
@@ -40,33 +40,27 @@ func (_m *MockVersionServiceClient) EXPECT() *MockVersionServiceClient_Expecter
 }
 
 // Get provides a mock function for the type MockVersionServiceClient
-func (_mock *MockVersionServiceClient) Get(ctx context.Context, in *v1.GetVersionRequest, opts ...grpc.CallOption) (*v1.GetVersionResponse, error) {
-	var tmpRet mock.Arguments
-	if len(opts) > 0 {
-		tmpRet = _mock.Called(ctx, in, opts)
-	} else {
-		tmpRet = _mock.Called(ctx, in)
-	}
-	ret := tmpRet
+func (_mock *MockVersionServiceClient) Get(context1 context.Context, request *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error) {
+	ret := _mock.Called(context1, request)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Get")
 	}
 
-	var r0 *v1.GetVersionResponse
+	var r0 *connect.Response[apiv1.GetVersionResponse]
 	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.GetVersionRequest, ...grpc.CallOption) (*v1.GetVersionResponse, error)); ok {
-		return returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error)); ok {
+		return returnFunc(context1, request)
 	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.GetVersionRequest, ...grpc.CallOption) *v1.GetVersionResponse); ok {
-		r0 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) *connect.Response[apiv1.GetVersionResponse]); ok {
+		r0 = returnFunc(context1, request)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.GetVersionResponse)
+			r0 = ret.Get(0).(*connect.Response[apiv1.GetVersionResponse])
 		}
 	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.GetVersionRequest, ...grpc.CallOption) error); ok {
-		r1 = returnFunc(ctx, in, opts...)
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) error); ok {
+		r1 = returnFunc(context1, request)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -79,45 +73,36 @@ type MockVersionServiceClient_Get_Call struct {
 }
 
 // Get is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *v1.GetVersionRequest
-//   - opts ...grpc.CallOption
-func (_e *MockVersionServiceClient_Expecter) Get(ctx interface{}, in interface{}, opts ...interface{}) *MockVersionServiceClient_Get_Call {
-	return &MockVersionServiceClient_Get_Call{Call: _e.mock.On("Get",
-		append([]interface{}{ctx, in}, opts...)...)}
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.GetVersionRequest]
+func (_e *MockVersionServiceClient_Expecter) Get(context1 interface{}, request interface{}) *MockVersionServiceClient_Get_Call {
+	return &MockVersionServiceClient_Get_Call{Call: _e.mock.On("Get", context1, request)}
 }
 
-func (_c *MockVersionServiceClient_Get_Call) Run(run func(ctx context.Context, in *v1.GetVersionRequest, opts ...grpc.CallOption)) *MockVersionServiceClient_Get_Call {
+func (_c *MockVersionServiceClient_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.GetVersionRequest])) *MockVersionServiceClient_Get_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		var arg0 context.Context
 		if args[0] != nil {
 			arg0 = args[0].(context.Context)
 		}
-		var arg1 *v1.GetVersionRequest
+		var arg1 *connect.Request[apiv1.GetVersionRequest]
 		if args[1] != nil {
-			arg1 = args[1].(*v1.GetVersionRequest)
-		}
-		var arg2 []grpc.CallOption
-		var variadicArgs []grpc.CallOption
-		if len(args) > 2 {
-			variadicArgs = args[2].([]grpc.CallOption)
+			arg1 = args[1].(*connect.Request[apiv1.GetVersionRequest])
 		}
-		arg2 = variadicArgs
 		run(
 			arg0,
 			arg1,
-			arg2...,
 		)
 	})
 	return _c
 }
 
-func (_c *MockVersionServiceClient_Get_Call) Return(getVersionResponse *v1.GetVersionResponse, err error) *MockVersionServiceClient_Get_Call {
-	_c.Call.Return(getVersionResponse, err)
+func (_c *MockVersionServiceClient_Get_Call) Return(response *connect.Response[apiv1.GetVersionResponse], err error) *MockVersionServiceClient_Get_Call {
+	_c.Call.Return(response, err)
 	return _c
 }
 
-func (_c *MockVersionServiceClient_Get_Call) RunAndReturn(run func(ctx context.Context, in *v1.GetVersionRequest, opts ...grpc.CallOption) (*v1.GetVersionResponse, error)) *MockVersionServiceClient_Get_Call {
+func (_c *MockVersionServiceClient_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error)) *MockVersionServiceClient_Get_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/test/mocks/VersionServiceHandler.go b/pkg/test/mocks/VersionServiceHandler.go
new file mode 100644
index 0000000..d22b9b8
--- /dev/null
+++ b/pkg/test/mocks/VersionServiceHandler.go
@@ -0,0 +1,108 @@
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
+
+package mocks
+
+import (
+	"context"
+
+	"connectrpc.com/connect"
+	"github.com/metal-stack/masterdata-api/api/v1"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// NewMockVersionServiceHandler creates a new instance of MockVersionServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockVersionServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockVersionServiceHandler {
+	mock := &MockVersionServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
+// MockVersionServiceHandler is an autogenerated mock type for the VersionServiceHandler type
+type MockVersionServiceHandler struct {
+	mock.Mock
+}
+
+type MockVersionServiceHandler_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *MockVersionServiceHandler) EXPECT() *MockVersionServiceHandler_Expecter {
+	return &MockVersionServiceHandler_Expecter{mock: &_m.Mock}
+}
+
+// Get provides a mock function for the type MockVersionServiceHandler
+func (_mock *MockVersionServiceHandler) Get(context1 context.Context, request *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error) {
+	ret := _mock.Called(context1, request)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *connect.Response[apiv1.GetVersionResponse]
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error)); ok {
+		return returnFunc(context1, request)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) *connect.Response[apiv1.GetVersionResponse]); ok {
+		r0 = returnFunc(context1, request)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*connect.Response[apiv1.GetVersionResponse])
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *connect.Request[apiv1.GetVersionRequest]) error); ok {
+		r1 = returnFunc(context1, request)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// MockVersionServiceHandler_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
+type MockVersionServiceHandler_Get_Call struct {
+	*mock.Call
+}
+
+// Get is a helper method to define mock.On call
+//   - context1 context.Context
+//   - request *connect.Request[apiv1.GetVersionRequest]
+func (_e *MockVersionServiceHandler_Expecter) Get(context1 interface{}, request interface{}) *MockVersionServiceHandler_Get_Call {
+	return &MockVersionServiceHandler_Get_Call{Call: _e.mock.On("Get", context1, request)}
+}
+
+func (_c *MockVersionServiceHandler_Get_Call) Run(run func(context1 context.Context, request *connect.Request[apiv1.GetVersionRequest])) *MockVersionServiceHandler_Get_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *connect.Request[apiv1.GetVersionRequest]
+		if args[1] != nil {
+			arg1 = args[1].(*connect.Request[apiv1.GetVersionRequest])
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *MockVersionServiceHandler_Get_Call) Return(response *connect.Response[apiv1.GetVersionResponse], err error) *MockVersionServiceHandler_Get_Call {
+	_c.Call.Return(response, err)
+	return _c
+}
+
+func (_c *MockVersionServiceHandler_Get_Call) RunAndReturn(run func(context1 context.Context, request *connect.Request[apiv1.GetVersionRequest]) (*connect.Response[apiv1.GetVersionResponse], error)) *MockVersionServiceHandler_Get_Call {
+	_c.Call.Return(run)
+	return _c
+}
diff --git a/pkg/test/mocks/VersionServiceServer.go b/pkg/test/mocks/VersionServiceServer.go
deleted file mode 100644
index a02b211..0000000
--- a/pkg/test/mocks/VersionServiceServer.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Code generated by mockery; DO NOT EDIT.
-// github.com/vektra/mockery
-// template: testify
-
-package mocks
-
-import (
-	"context"
-
-	"github.com/metal-stack/masterdata-api/api/v1"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// NewMockVersionServiceServer creates a new instance of MockVersionServiceServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockVersionServiceServer(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockVersionServiceServer {
-	mock := &MockVersionServiceServer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
-
-// MockVersionServiceServer is an autogenerated mock type for the VersionServiceServer type
-type MockVersionServiceServer struct {
-	mock.Mock
-}
-
-type MockVersionServiceServer_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockVersionServiceServer) EXPECT() *MockVersionServiceServer_Expecter {
-	return &MockVersionServiceServer_Expecter{mock: &_m.Mock}
-}
-
-// Get provides a mock function for the type MockVersionServiceServer
-func (_mock *MockVersionServiceServer) Get(context1 context.Context, getVersionRequest *v1.GetVersionRequest) (*v1.GetVersionResponse, error) {
-	ret := _mock.Called(context1, getVersionRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Get")
-	}
-
-	var r0 *v1.GetVersionResponse
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.GetVersionRequest) (*v1.GetVersionResponse, error)); ok {
-		return returnFunc(context1, getVersionRequest)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.GetVersionRequest) *v1.GetVersionResponse); ok {
-		r0 = returnFunc(context1, getVersionRequest)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1.GetVersionResponse)
-		}
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.GetVersionRequest) error); ok {
-		r1 = returnFunc(context1, getVersionRequest)
-	} else {
-		r1 = ret.Error(1)
-	}
-	return r0, r1
-}
-
-// MockVersionServiceServer_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
-type MockVersionServiceServer_Get_Call struct {
-	*mock.Call
-}
-
-// Get is a helper method to define mock.On call
-//   - context1 context.Context
-//   - getVersionRequest *v1.GetVersionRequest
-func (_e *MockVersionServiceServer_Expecter) Get(context1 interface{}, getVersionRequest interface{}) *MockVersionServiceServer_Get_Call {
-	return &MockVersionServiceServer_Get_Call{Call: _e.mock.On("Get", context1, getVersionRequest)}
-}
-
-func (_c *MockVersionServiceServer_Get_Call) Run(run func(context1 context.Context, getVersionRequest *v1.GetVersionRequest)) *MockVersionServiceServer_Get_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		var arg0 context.Context
-		if args[0] != nil {
-			arg0 = args[0].(context.Context)
-		}
-		var arg1 *v1.GetVersionRequest
-		if args[1] != nil {
-			arg1 = args[1].(*v1.GetVersionRequest)
-		}
-		run(
-			arg0,
-			arg1,
-		)
-	})
-	return _c
-}
-
-func (_c *MockVersionServiceServer_Get_Call) Return(getVersionResponse *v1.GetVersionResponse, err error) *MockVersionServiceServer_Get_Call {
-	_c.Call.Return(getVersionResponse, err)
-	return _c
-}
-
-func (_c *MockVersionServiceServer_Get_Call) RunAndReturn(run func(context1 context.Context, getVersionRequest *v1.GetVersionRequest) (*v1.GetVersionResponse, error)) *MockVersionServiceServer_Get_Call {
-	_c.Call.Return(run)
-	return _c
-}
diff --git a/proto/Makefile b/proto/Makefile
index 617dcfd..7292c3d 100644
--- a/proto/Makefile
+++ b/proto/Makefile
@@ -1,5 +1,5 @@
 MAKEFLAGS += --no-print-directory
-BUF_VERSION := 1.57.0
+BUF_VERSION := 1.57.2
 
 _buf:
 	docker run --rm \
diff --git a/proto/v1/common.proto b/proto/api/v1/common.proto
similarity index 95%
rename from proto/v1/common.proto
rename to proto/api/v1/common.proto
index 0b177f9..e13bd4c 100644
--- a/proto/v1/common.proto
+++ b/proto/api/v1/common.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package v1;
+package api.v1;
 
 message Paging {
   // page is used for pagination, if unset only the first page is returned,
diff --git a/proto/v1/iam.proto b/proto/api/v1/iam.proto
similarity index 99%
rename from proto/v1/iam.proto
rename to proto/api/v1/iam.proto
index 5c2a955..86d4174 100644
--- a/proto/v1/iam.proto
+++ b/proto/api/v1/iam.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package v1;
+package api.v1;
 
 message IAMConfig {
   IssuerConfig issuer_config = 1;
diff --git a/proto/v1/meta.proto b/proto/api/v1/meta.proto
similarity index 95%
rename from proto/v1/meta.proto
rename to proto/api/v1/meta.proto
index 855f0c8..7e292df 100644
--- a/proto/v1/meta.proto
+++ b/proto/api/v1/meta.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package v1;
+package api.v1;
 
 import "google/protobuf/timestamp.proto";
 
diff --git a/proto/v1/project.proto b/proto/api/v1/project.proto
similarity index 94%
rename from proto/v1/project.proto
rename to proto/api/v1/project.proto
index ccbd73d..4707aaf 100644
--- a/proto/v1/project.proto
+++ b/proto/api/v1/project.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-package v1;
+package api.v1;
 
+import "api/v1/common.proto";
+import "api/v1/meta.proto";
+import "api/v1/quota.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
-import "v1/common.proto";
-import "v1/meta.proto";
-import "v1/quota.proto";
 
 service ProjectService {
   rpc Create(ProjectCreateRequest) returns (ProjectResponse);
diff --git a/proto/v1/project_member.proto b/proto/api/v1/project_member.proto
similarity index 96%
rename from proto/v1/project_member.proto
rename to proto/api/v1/project_member.proto
index 76946f6..58fe20f 100644
--- a/proto/v1/project_member.proto
+++ b/proto/api/v1/project_member.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package v1;
+package api.v1;
 
-import "v1/meta.proto";
+import "api/v1/meta.proto";
 
 service ProjectMemberService {
   rpc Create(ProjectMemberCreateRequest) returns (ProjectMemberResponse);
diff --git a/proto/v1/quota.proto b/proto/api/v1/quota.proto
similarity index 97%
rename from proto/v1/quota.proto
rename to proto/api/v1/quota.proto
index 5734668..529b2b7 100644
--- a/proto/v1/quota.proto
+++ b/proto/api/v1/quota.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package v1;
+package api.v1;
 
 import "google/protobuf/wrappers.proto";
 
diff --git a/proto/v1/tenant.proto b/proto/api/v1/tenant.proto
similarity index 94%
rename from proto/v1/tenant.proto
rename to proto/api/v1/tenant.proto
index 1f5bda3..bec0f25 100644
--- a/proto/v1/tenant.proto
+++ b/proto/api/v1/tenant.proto
@@ -1,14 +1,14 @@
 syntax = "proto3";
 
-package v1;
+package api.v1;
 
+import "api/v1/common.proto";
+import "api/v1/iam.proto";
+import "api/v1/meta.proto";
+import "api/v1/project.proto";
+import "api/v1/quota.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
-import "v1/common.proto";
-import "v1/iam.proto";
-import "v1/meta.proto";
-import "v1/project.proto";
-import "v1/quota.proto";
 
 service TenantService {
   rpc Create(TenantCreateRequest) returns (TenantResponse);
diff --git a/proto/v1/tenant_member.proto b/proto/api/v1/tenant_member.proto
similarity index 96%
rename from proto/v1/tenant_member.proto
rename to proto/api/v1/tenant_member.proto
index 1d7bafa..d094f59 100644
--- a/proto/v1/tenant_member.proto
+++ b/proto/api/v1/tenant_member.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package v1;
+package api.v1;
 
-import "v1/meta.proto";
+import "api/v1/meta.proto";
 
 service TenantMemberService {
   rpc Create(TenantMemberCreateRequest) returns (TenantMemberResponse);
diff --git a/proto/v1/version.proto b/proto/api/v1/version.proto
similarity index 94%
rename from proto/v1/version.proto
rename to proto/api/v1/version.proto
index 10ad748..9da2ed6 100644
--- a/proto/v1/version.proto
+++ b/proto/api/v1/version.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package v1;
+package api.v1;
 
 service VersionService {
   rpc Get(GetVersionRequest) returns (GetVersionResponse);
diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml
index b128f6f..653d7da 100644
--- a/proto/buf.gen.yaml
+++ b/proto/buf.gen.yaml
@@ -5,9 +5,9 @@ managed:
     - file_option: go_package_prefix
       value: github.com/metal-stack/masterdata-api
 plugins:
-  - remote: buf.build/grpc/go:v1.5.1
-    out: ../api
-    opt: paths=source_relative,require_unimplemented_servers=false
-  - remote: buf.build/protocolbuffers/go:v1.36.8
-    out: ../api
+  - remote: buf.build/connectrpc/go:v1.19.1
+    out: ../
+    opt: paths=source_relative,simple
+  - remote: buf.build/protocolbuffers/go:v1.36.10
+    out: ../
     opt: paths=source_relative
diff --git a/server/main.go b/server/main.go
deleted file mode 100644
index ae7dba7..0000000
--- a/server/main.go
+++ /dev/null
@@ -1,319 +0,0 @@
-package main
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"log/slog"
-	"net"
-	"net/http"
-	_ "net/http/pprof" //nolint:gosec
-	"os"
-	"runtime/debug"
-	"strings"
-	"time"
-
-	"github.com/metal-stack/masterdata-api/pkg/auth"
-	"github.com/metal-stack/masterdata-api/pkg/health"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/collectors"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
-	"go.opentelemetry.io/otel/trace"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/reflection"
-	"google.golang.org/grpc/status"
-
-	grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
-	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors"
-	grpcauth "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth"
-	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
-	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery"
-	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector"
-
-	apiv1 "github.com/metal-stack/masterdata-api/api/v1"
-	"github.com/metal-stack/masterdata-api/pkg/datastore"
-	"github.com/metal-stack/masterdata-api/pkg/service"
-	"github.com/metal-stack/v"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	healthv1 "google.golang.org/grpc/health/grpc_health_v1"
-)
-
-const (
-	moduleName = "masterdata-api"
-)
-
-var (
-	logger *slog.Logger
-)
-
-var rootCmd = &cobra.Command{
-	Use:     moduleName,
-	Short:   "api to manage masterdata data for metal cloud components",
-	Version: v.V.String(),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		return run()
-	},
-}
-
-func main() {
-	if err := rootCmd.Execute(); err != nil {
-		logger.Error("failed executing root command", "error", err)
-	}
-}
-
-func initConfig() {
-	viper.SetEnvPrefix("MASTERDATA_API")
-	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
-	viper.AutomaticEnv()
-}
-
-func init() {
-	cobra.OnInitialize(initConfig)
-	rootCmd.Flags().IntP("port", "", 50051, "the port to serve on")
-	rootCmd.Flags().BoolP("debug", "", false, "enable debugging")
-
-	rootCmd.Flags().StringP("ca", "", "certs/ca.pem", "ca path")
-	rootCmd.Flags().StringP("cert", "", "certs/server.pem", "server certificate path")
-	rootCmd.Flags().StringP("certkey", "", "certs/server-key.pem", "server key path")
-
-	rootCmd.Flags().StringP("dbhost", "", "localhost", "postgres database server hostname/ip")
-	rootCmd.Flags().StringP("dbport", "", "5432", "postgres database server port")
-	rootCmd.Flags().StringP("dbuser", "", "masterdata", "postgres database user")
-	rootCmd.Flags().StringP("dbpassword", "", "password", "postgres database password")
-	rootCmd.Flags().StringP("dbname", "", "masterdata", "postgres database name")
-	rootCmd.Flags().StringP("dbsslmode", "", "disable", "sslmode to talk to the the database")
-	rootCmd.Flags().StringP("hmackey", "", auth.HmacDefaultKey, "preshared hmac key to authenticate.")
-
-	err := viper.BindPFlags(rootCmd.Flags())
-	if err != nil {
-		logger.Error("unable to construct root command", "error", err)
-	}
-}
-
-func run() error {
-
-	lvl := slog.LevelInfo
-	if viper.IsSet("debug") {
-		lvl = slog.LevelDebug
-	}
-	jsonHandler := slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: lvl, AddSource: false})
-
-	logger := slog.New(jsonHandler)
-
-	port := viper.GetInt("port")
-	addr := fmt.Sprintf(":%d", port)
-	lis, err := net.Listen("tcp", addr)
-	if err != nil {
-		return fmt.Errorf("failed to listen: %w", err)
-	}
-
-	logger.Info("starting masterdata-api", "version", v.V.String(), "address", addr)
-
-	hmacKey := viper.GetString("hmackey")
-	if hmacKey == "" {
-		hmacKey = auth.HmacDefaultKey
-	}
-	auther, err := auth.NewHMACAuther(hmacKey, auth.EditUser)
-	if err != nil {
-		return fmt.Errorf("failed to create auther: %w", err)
-	}
-
-	caFile := viper.GetString("ca")
-	// Get system certificate pool
-	certPool, err := x509.SystemCertPool()
-	if err != nil {
-		return fmt.Errorf("could not read system certificate pool: %w", err)
-	}
-
-	if caFile != "" {
-		logger.Info("using ca", "ca", caFile)
-		ca, err := os.ReadFile(caFile)
-		if err != nil {
-			return fmt.Errorf("could not read ca certificate: %w", err)
-		}
-		// Append the certificates from the CA
-		if ok := certPool.AppendCertsFromPEM(ca); !ok {
-			return fmt.Errorf("failed to append ca certs: %w", err)
-		}
-	}
-
-	serverCert := viper.GetString("cert")
-	serverKey := viper.GetString("certkey")
-	cert, err := tls.LoadX509KeyPair(serverCert, serverKey)
-	if err != nil {
-		return fmt.Errorf("failed to load key pair: %w", err)
-	}
-
-	creds := credentials.NewTLS(&tls.Config{
-		ClientAuth:   tls.RequireAndVerifyClientCert,
-		Certificates: []tls.Certificate{cert},
-		ClientCAs:    certPool,
-		MinVersion:   tls.VersionTLS12,
-	})
-
-	srvMetrics := grpcprom.NewServerMetrics(
-		grpcprom.WithServerHandlingTimeHistogram(
-			grpcprom.WithHistogramBuckets([]float64{0.001, 0.01, 0.1, 0.3, 0.6, 1, 3, 6, 9, 20, 30, 60, 90, 120}),
-		),
-	)
-	exemplarFromContext := func(ctx context.Context) prometheus.Labels {
-		if span := trace.SpanContextFromContext(ctx); span.IsSampled() {
-			return prometheus.Labels{"traceID": span.TraceID().String()}
-		}
-		return nil
-	}
-	allButHealthZ := func(ctx context.Context, callMeta interceptors.CallMeta) bool {
-		return healthv1.Health_ServiceDesc.ServiceName != callMeta.Service
-	}
-
-	// Setup metric for panic recoveries.
-	reg := prometheus.NewRegistry()
-	reg.MustRegister(srvMetrics)
-	reg.MustRegister(collectors.NewGoCollector())
-	panicsTotal := promauto.With(reg).NewCounter(prometheus.CounterOpts{
-		Name: "grpc_req_panics_recovered_total",
-		Help: "Total number of gRPC requests recovered from internal panic.",
-	})
-	grpcPanicRecoveryHandler := func(p any) (err error) {
-		panicsTotal.Inc()
-		logger.Error("recovered from panic", "panic", p, "stack", debug.Stack())
-		return status.Errorf(codes.Internal, "%s", p)
-	}
-
-	// Set GRPC Interceptors
-	// opts := []grpc.ServerOption{}
-	// grpcServer := grpc.NewServer(opts...)
-	grpcServer := grpc.NewServer(
-		grpc.Creds(creds),
-		grpc.StatsHandler(otelgrpc.NewServerHandler()),
-		grpc.ChainUnaryInterceptor(
-			// Order matters e.g. tracing interceptor have to create span first for the later exemplars to work.
-			srvMetrics.UnaryServerInterceptor(),
-			logging.UnaryServerInterceptor(interceptorLogger(logger)),
-			selector.UnaryServerInterceptor(grpcauth.UnaryServerInterceptor(auther.Auth), selector.MatchFunc(allButHealthZ)),
-			recovery.UnaryServerInterceptor(recovery.WithRecoveryHandler(grpcPanicRecoveryHandler)),
-		),
-		grpc.ChainStreamInterceptor(
-			srvMetrics.StreamServerInterceptor(grpcprom.WithExemplarFromContext(exemplarFromContext)),
-			logging.StreamServerInterceptor(interceptorLogger(logger)),
-			selector.StreamServerInterceptor(grpcauth.StreamServerInterceptor(auther.Auth), selector.MatchFunc(allButHealthZ)),
-			recovery.StreamServerInterceptor(recovery.WithRecoveryHandler(grpcPanicRecoveryHandler)),
-		),
-	)
-
-	ves := []datastore.Entity{
-		&apiv1.Project{},
-		&apiv1.ProjectMember{},
-		&apiv1.Tenant{},
-		&apiv1.TenantMember{},
-	}
-	dbHost := viper.GetString("dbhost")
-	dbPort := viper.GetString("dbport")
-	dbUser := viper.GetString("dbuser")
-	dbPassword := viper.GetString("dbpassword")
-	dbName := viper.GetString("dbname")
-	dbSSLMode := viper.GetString("dbsslmode")
-
-	db, err := datastore.NewPostgresDB(logger, dbHost, dbPort, dbUser, dbPassword, dbName, dbSSLMode, ves...)
-	if err != nil {
-		return fmt.Errorf("failed to create postgres connection: %w", err)
-	}
-
-	healthServer := health.NewHealthServer()
-
-	err = datastore.Initdb(logger, db, healthServer, "initdb.d")
-	if err != nil {
-		logger.Error("unable to apply initdb content", "error", err)
-	}
-
-	err = datastore.MigrateDB(logger, db, healthServer)
-	if err != nil {
-		logger.Error("unable to apply migrate db", "error", err)
-	}
-
-	ps := datastore.New(logger, db, &apiv1.Project{})
-	pms := datastore.New(logger, db, &apiv1.ProjectMember{})
-	ts := datastore.New(logger, db, &apiv1.Tenant{})
-	tms := datastore.New(logger, db, &apiv1.TenantMember{})
-
-	projectService := service.NewProjectService(logger, ps, pms, ts)
-	projectMemberService := service.NewProjectMemberService(logger, ps, pms, ts)
-	// FIXME db should not be required here
-	tenantService := service.NewTenantService(db, logger, ts, tms)
-	tenantMemberService := service.NewTenantMemberService(logger, ts, tms)
-	versionService := service.NewVersionService()
-
-	apiv1.RegisterProjectServiceServer(grpcServer, projectService)
-	apiv1.RegisterProjectMemberServiceServer(grpcServer, projectMemberService)
-	apiv1.RegisterTenantServiceServer(grpcServer, tenantService)
-	apiv1.RegisterTenantMemberServiceServer(grpcServer, tenantMemberService)
-	apiv1.RegisterVersionServiceServer(grpcServer, versionService)
-	healthv1.RegisterHealthServer(grpcServer, healthServer)
-
-	srvMetrics.InitializeMetrics(grpcServer)
-
-	// Register Prometheus metrics handler
-	metricsServer := http.NewServeMux()
-	metricsServer.Handle("/metrics", promhttp.HandlerFor(reg, promhttp.HandlerOpts{}))
-	go func() {
-		logger.Info("starting metrics endpoint of :2112")
-		server := http.Server{
-			Addr:              ":2112",
-			Handler:           metricsServer,
-			ReadHeaderTimeout: 1 * time.Minute,
-		}
-		err := server.ListenAndServe()
-		if err != nil {
-			logger.Error("failed to start metrics endpoint", "error", err)
-		}
-		os.Exit(1)
-	}()
-
-	go func() {
-		logger.Info("starting pprof endpoint of :2113")
-		// inspect via
-		// go tool pprof -http :8080 localhost:2113/debug/pprof/heap
-		// go tool pprof -http :8080 localhost:2113/debug/pprof/goroutine
-		server := http.Server{
-			Addr:              ":2113",
-			ReadHeaderTimeout: 1 * time.Minute,
-		}
-		err := server.ListenAndServe()
-		if err != nil {
-			logger.Error("failed to start pprof endpoint", "error", err)
-		}
-		os.Exit(1)
-	}()
-
-	reflection.Register(grpcServer)
-
-	if err := grpcServer.Serve(lis); err != nil {
-		return fmt.Errorf("failed to serve: %w", err)
-	}
-	return nil
-}
-
-// interceptorLogger adapts slog logger to interceptor logger.
-// This code is simple enough to be copied and not imported.
-func interceptorLogger(l *slog.Logger) logging.Logger {
-	return logging.LoggerFunc(func(_ context.Context, lvl logging.Level, msg string, fields ...any) {
-		switch lvl {
-		case logging.LevelDebug:
-			l.Debug(msg, fields...)
-		case logging.LevelInfo:
-			l.Info(msg, fields...)
-		case logging.LevelWarn:
-			l.Warn(msg, fields...)
-		case logging.LevelError:
-			l.Error(msg, fields...)
-		default:
-			panic(fmt.Sprintf("unknown level %v", lvl))
-		}
-	})
-}