diff --git a/components/public-api-server/pkg/apiv1/tokens.go b/components/public-api-server/pkg/apiv1/tokens.go
new file mode 100644
index 00000000000000..1f57b03dc30058
--- /dev/null
+++ b/components/public-api-server/pkg/apiv1/tokens.go
@@ -0,0 +1,15 @@
+// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package apiv1
+
+import "github.com/gitpod-io/gitpod/components/public-api/go/experimental/v1/v1connect"
+
+func NewTokensService() *TokensService {
+	return &TokensService{}
+}
+
+type TokensService struct {
+	v1connect.UnimplementedTokensServiceHandler
+}
diff --git a/components/public-api-server/pkg/server/server.go b/components/public-api-server/pkg/server/server.go
index 5c15cb10d699df..3c40357821669f 100644
--- a/components/public-api-server/pkg/server/server.go
+++ b/components/public-api-server/pkg/server/server.go
@@ -104,6 +104,9 @@ func register(srv *baseserver.Server, connPool proxy.ServerConnectionPool) error
 	teamsRoute, teamsServiceHandler := v1connect.NewTeamsServiceHandler(apiv1.NewTeamsService(connPool), handlerOptions...)
 	srv.HTTPMux().Handle(teamsRoute, teamsServiceHandler)
 
+	tokensRoute, tokensServiceHandler := v1connect.NewTokensServiceHandler(apiv1.NewTokensService(), handlerOptions...)
+	srv.HTTPMux().Handle(tokensRoute, tokensServiceHandler)
+
 	return nil
 }