diff --git a/internal/controlplaneclient/client.go b/internal/controlplaneclient/client.go
index 152d086..2a20e3a 100644
--- a/internal/controlplaneclient/client.go
+++ b/internal/controlplaneclient/client.go
@@ -64,12 +64,7 @@ func (c *Client) Close() error {
 }
 
 func withAuth[T any](c *Client, req *connect.Request[T]) *connect.Request[T] {
-	if c.apiKey != "" {
-		req.Header().Set("Authorization", "Bearer "+c.apiKey)
-	}
-	if c.orgID != "" {
-		req.Header().Set("X-Org-Id", c.orgID)
-	}
+	ApplyAuth(req, c.apiKey, c.orgID)
 	return req
 }