diff --git a/dist/fitra-darwin-amd64 b/dist/fitra-darwin-amd64
index 24dd121..5899d17 100755
Binary files a/dist/fitra-darwin-amd64 and b/dist/fitra-darwin-amd64 differ
diff --git a/dist/fitra-darwin-arm64 b/dist/fitra-darwin-arm64
index 9bbc950..85cc31e 100755
Binary files a/dist/fitra-darwin-arm64 and b/dist/fitra-darwin-arm64 differ
diff --git a/dist/fitra-linux-amd64 b/dist/fitra-linux-amd64
index d97e267..bc64c1c 100755
Binary files a/dist/fitra-linux-amd64 and b/dist/fitra-linux-amd64 differ
diff --git a/dist/fitra-linux-arm64 b/dist/fitra-linux-arm64
index 716fb18..6b0512a 100755
Binary files a/dist/fitra-linux-arm64 and b/dist/fitra-linux-arm64 differ
diff --git a/utils/analytics.go b/utils/analytics.go
index 781565e..f78b585 100644
--- a/utils/analytics.go
+++ b/utils/analytics.go
@@ -24,12 +24,17 @@ func SendAnalyticsEvent(eventType, pathname, pageTitle, userAgent, ipAddress str
 		return nil // Skip if no API key configured
 	}
 
+	hostname := os.Getenv("BASE_URL")
+	if hostname == "" {
+		hostname = "localhost:8080"
+	}
+
 	event := AnalyticsEvent{
 		APIKey:    apiKey,
 		SiteID:    "fitra-backend",
 		Type:      eventType,
 		Pathname:  pathname,
-		Hostname:  "a.adhd.sh",
+		Hostname:  hostname,
 		PageTitle: pageTitle,
 		UserAgent: userAgent,
 		IPAddress: ipAddress,
@@ -40,7 +45,7 @@ func SendAnalyticsEvent(eventType, pathname, pageTitle, userAgent, ipAddress str
 		return err
 	}
 
-	req, err := http.NewRequest("POST", "https://app.rybbit.io/api/track", bytes.NewBuffer(jsonData))
+	req, err := http.NewRequest("POST", "https://a.adhd.sh/api/track", bytes.NewBuffer(jsonData))
 	if err != nil {
 		return err
 	}
@@ -50,4 +55,4 @@ func SendAnalyticsEvent(eventType, pathname, pageTitle, userAgent, ipAddress str
 	client := &http.Client{}
 	_, err = client.Do(req)
 	return err
-}
\ No newline at end of file
+}