diff --git a/internal/app/app.go b/internal/app/app.go
index 8983ee8..b2be66b 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -129,6 +129,10 @@ func envVarOverrides(v *viper.Viper, cfg *Configuration) error {
 		return errors.New("no listen address set")
 	}
 
+	if v.GetString("fleetdb.endpoint") != "" {
+		cfg.FleetDBAPIOptions.Endpoint = v.GetString("fleetdb.endpoint")
+	}
+
 	if v.GetString("fleetdb.disable.oauth") != "" {
 		cfg.FleetDBAPIOptions.DisableOAuth = v.GetBool("fleetdb.disable.oauth")
 	}