diff --git a/src/grpc/index.ts b/src/grpc/index.ts
index a2fff61..2a59474 100644
--- a/src/grpc/index.ts
+++ b/src/grpc/index.ts
@@ -3,7 +3,7 @@ import { HeadscaleService } from "..";
 import { HeadscaleServiceClient } from "./generated/headscale/v1/headscale.client";
 import { GrpcWebFetchTransport } from "@protobuf-ts/grpcweb-transport";
 
-class HeadscaleControlService {
+export class HeadscaleControlService {
   private service: HeadscaleService;
   client: HeadscaleServiceClient;
 
diff --git a/src/index.ts b/src/index.ts
index 363e13a..17f5606 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,6 +8,9 @@ import { onShutdown } from "node-graceful-shutdown";
 import { headscaleFormula as formula } from "./formula";
 import createConfig from "./config";
 
+// Incldue gRPC stuff in final builds
+export * from "./grpc";
+
 export interface HeadscaleOptions {
   platform?: string;
   arch?: string;