diff --git a/api/src/router/public.rs b/api/src/router/public.rs
index e82c3d1..f8712d0 100644
--- a/api/src/router/public.rs
+++ b/api/src/router/public.rs
@@ -5,7 +5,7 @@ use crate::{
         connection_definition::{self, GetPublicConnectionDetailsRequest},
         connection_model_schema, connection_oauth_definition,
         event_access::create_event_access_for_new_user,
-        openapi, read, schema_generator,
+        openapi, read, schema_generator, tracker,
     },
     middleware::jwt_auth::{self, JwtState},
     server::AppState,
@@ -38,6 +38,7 @@ pub fn get_router(state: &Arc<AppState>) -> Router<Arc<AppState>> {
                 ),
         )
         .nest("/schemas", schema_generator::get_router())
+        .nest("/mark", tracker::get_router())
         .route(
             "/connection-data",
             get(read::<GetPublicConnectionDetailsRequest, PublicConnectionDetails>),
diff --git a/api/src/router/secured_key.rs b/api/src/router/secured_key.rs
index 7228124..84c504a 100644
--- a/api/src/router/secured_key.rs
+++ b/api/src/router/secured_key.rs
@@ -5,8 +5,8 @@ use crate::{
         connection_model_schema::{
             public_get_connection_model_schema, PublicGetConnectionModelSchema,
         },
-        event_access, events, knowledge, metrics, oauth, passthrough, secrets, tasks, tracker,
-        unified, vault_connection,
+        event_access, events, knowledge, metrics, oauth, passthrough, secrets, tasks, unified,
+        vault_connection,
     },
     middleware::{
         header_auth,
@@ -39,7 +39,6 @@ pub async fn get_router(state: &Arc<AppState>) -> Router<Arc<AppState>> {
         .nest("/events", events::get_router())
         .nest("/knowledge", knowledge::get_router())
         .nest("/tasks", tasks::get_router())
-        .nest("/track", tracker::get_router())
         .nest("/metrics", metrics::get_router())
         .nest("/oauth", oauth::get_router())
         .nest("/passthrough", passthrough::get_router())
diff --git a/cli/src/service/server.rs b/cli/src/service/server.rs
index 747107e..c52d359 100644
--- a/cli/src/service/server.rs
+++ b/cli/src/service/server.rs
@@ -65,7 +65,7 @@ impl Server {
 
         let url = format!(
             "{}/public/v3/users/oauth/provider/github",
-            api_url.clone().unwrap_or(DEFAULT_BASE.to_string())
+            api_url.clone().unwrap_or(DEFAULT_API.to_string())
         );
 
         let router = Router::new().route(