diff --git a/pkg/bitbucket/client.go b/pkg/bitbucket/client.go
index 57fd4af..7b24523 100644
--- a/pkg/bitbucket/client.go
+++ b/pkg/bitbucket/client.go
@@ -49,12 +49,15 @@ type Client struct {
 	workspaceIDs map[string]bool
 }
 
-func NewClient(httpClient *http.Client) *Client {
-	wrapper := uhttp.NewBaseHttpClient(httpClient)
+func NewClient(ctx context.Context, httpClient *http.Client) (*Client, error) {
+	wrapper, err := uhttp.NewBaseHttpClientWithContext(ctx, httpClient)
+	if err != nil {
+		return nil, err
+	}
 
 	return &Client{
 		wrapper: wrapper,
-	}
+	}, nil
 }
 
 type LoginResponse struct {
diff --git a/pkg/connector/connector.go b/pkg/connector/connector.go
index c5aadd9..4e7e634 100644
--- a/pkg/connector/connector.go
+++ b/pkg/connector/connector.go
@@ -92,8 +92,12 @@ func New(ctx context.Context, workspaces []string, auth uhttp.AuthCredentials) (
 		return nil, fmt.Errorf("bitbucket-connector: failed to get http client: %w", err)
 	}
 
+	client, err := bitbucket.NewClient(ctx, httpClient)
+	if err != nil {
+		return nil, err
+	}
 	return &Bitbucket{
-		client:     bitbucket.NewClient(httpClient),
+		client:     client,
 		workspaces: workspaces,
 	}, nil
 }