diff --git a/components/usage-api/buf.gen.yaml b/components/usage-api/buf.gen.yaml
new file mode 100644
index 00000000000000..4aef900d36d9d7
--- /dev/null
+++ b/components/usage-api/buf.gen.yaml
@@ -0,0 +1,10 @@
+version: v1
+plugins:
+  - name: go
+    out: go
+    opt:
+     - module=github.com/gitpod-io/gitpod/usage-api
+  - name: go-grpc
+    out: go
+    opt:
+      - module=github.com/gitpod-io/gitpod/usage-api
diff --git a/components/usage-api/generate.sh b/components/usage-api/generate.sh
index 2b86555b34facd..ff073205f7e84b 100755
--- a/components/usage-api/generate.sh
+++ b/components/usage-api/generate.sh
@@ -15,13 +15,12 @@ COMPONENTS_DIR="$ROOT_DIR"/components
 # shellcheck disable=SC1090,SC1091
 source "$ROOT_DIR"/scripts/protoc-generator.sh
 
-lint
+
 
 install_dependencies
-go_protoc "$COMPONENTS_DIR" "usage/v1"
-mkdir -p go/v1
-mv go/usage/v1/*.pb.go go/v1
-rm -rf go/usage
+lint
+protoc_buf_generate
+
 typescript_ts_protoc "$COMPONENTS_DIR" "usage/v1"
 
 update_license
diff --git a/components/usage-api/go.mod b/components/usage-api/go.mod
deleted file mode 100644
index e8c699620dd862..00000000000000
--- a/components/usage-api/go.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module github.com/gitpod-io/gitpod/usage-api-codegen
-
-go 1.19
-
-require google.golang.org/protobuf v1.28.1
diff --git a/components/usage-api/go.sum b/components/usage-api/go.sum
deleted file mode 100644
index 00f5993c956c43..00000000000000
--- a/components/usage-api/go.sum
+++ /dev/null
@@ -1,8 +0,0 @@
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
diff --git a/components/usage-api/go/v1/billing.pb.go b/components/usage-api/go/v1/billing.pb.go
index ff3a3211ce3d0c..f73232076bb7e4 100644
--- a/components/usage-api/go/v1/billing.pb.go
+++ b/components/usage-api/go/v1/billing.pb.go
@@ -4,8 +4,8 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.20.1
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
 // source: usage/v1/billing.proto
 
 package v1
diff --git a/components/usage-api/go/v1/billing_grpc.pb.go b/components/usage-api/go/v1/billing_grpc.pb.go
index 85978130408666..f5eb2d0373b0c5 100644
--- a/components/usage-api/go/v1/billing_grpc.pb.go
+++ b/components/usage-api/go/v1/billing_grpc.pb.go
@@ -5,7 +5,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.20.1
+// - protoc             (unknown)
 // source: usage/v1/billing.proto
 
 package v1
diff --git a/components/usage-api/go/v1/usage.pb.go b/components/usage-api/go/v1/usage.pb.go
index 75f806d5243b14..307e9e4e7d9d9c 100644
--- a/components/usage-api/go/v1/usage.pb.go
+++ b/components/usage-api/go/v1/usage.pb.go
@@ -4,8 +4,8 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.20.1
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
 // source: usage/v1/usage.proto
 
 package v1
diff --git a/components/usage-api/go/v1/usage_grpc.pb.go b/components/usage-api/go/v1/usage_grpc.pb.go
index e2efa1de9af648..9b26bd6dbe2e85 100644
--- a/components/usage-api/go/v1/usage_grpc.pb.go
+++ b/components/usage-api/go/v1/usage_grpc.pb.go
@@ -5,7 +5,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.20.1
+// - protoc             (unknown)
 // source: usage/v1/usage.proto
 
 package v1
diff --git a/components/usage-api/tools.go b/components/usage-api/tools.go
deleted file mode 100644
index 386553e1897216..00000000000000
--- a/components/usage-api/tools.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package usage_api_codegen
-
-import (
-	_ "google.golang.org/protobuf/cmd/protoc-gen-go"
-	_ "google.golang.org/protobuf/runtime/protoimpl"
-)