diff --git a/pkg/cli/root.go b/pkg/cli/root.go
index 621e6acdcb..c267609577 100644
--- a/pkg/cli/root.go
+++ b/pkg/cli/root.go
@@ -14,8 +14,9 @@ import (
 )
 
 type Obot struct {
-	Debug  bool `usage:"Enable debug logging"`
-	Client *apiclient.Client
+	Debug   bool   `usage:"Enable debug logging"`
+	BaseURL string `usage:"Base URL for the OBOT API" default:"http://localhost:8080/api"`
+	Client  *apiclient.Client
 }
 
 func (a *Obot) PersistentPre(*cobra.Command, []string) error {
@@ -27,6 +28,9 @@ func (a *Obot) PersistentPre(*cobra.Command, []string) error {
 		logger.SetDebug()
 	}
 
+	// Update the client's BaseURL from the flag/env value
+	a.Client.BaseURL = a.BaseURL
+
 	if a.Client.Token == "" {
 		a.Client = a.Client.WithTokenFetcher(internal.Token)
 	}
@@ -36,9 +40,9 @@ func (a *Obot) PersistentPre(*cobra.Command, []string) error {
 
 func New() *cobra.Command {
 	root := &Obot{
+		BaseURL: env.VarOrDefault("OBOT_BASE_URL", "http://localhost:8080/api"),
 		Client: &apiclient.Client{
-			BaseURL: env.VarOrDefault("OBOT_BASE_URL", "http://localhost:8080/api"),
-			Token:   os.Getenv("OBOT_TOKEN"),
+			Token: os.Getenv("OBOT_TOKEN"),
 		},
 	}
 	return cmd.Command(root,