diff --git a/client/http.go b/client/http.go
index 6e8ced5..b0b1e75 100644
--- a/client/http.go
+++ b/client/http.go
@@ -4,6 +4,7 @@ import (
 	"crypto/tls"
 	"net"
 	"net/http"
+	"strings"
 	"time"
 
 	"code.gitea.io/bots-proto-go/ping/v1/pingv1connect"
@@ -51,15 +52,17 @@ func New(endpoint string, opts ...Option) *HTTPClient {
 		}
 	}
 
+	baseURL := strings.TrimRight(endpoint, "/") + "/api/bots"
+
 	return &HTTPClient{
 		PingServiceClient: pingv1connect.NewPingServiceClient(
 			cfg.httpClient,
-			endpoint,
+			baseURL,
 			cfg.opts...,
 		),
 		RunnerServiceClient: runnerv1connect.NewRunnerServiceClient(
 			cfg.httpClient,
-			endpoint,
+			baseURL,
 			cfg.opts...,
 		),
 		endpoint: endpoint,