diff --git a/rust/gui-client/src-tauri/src/client.rs b/rust/gui-client/src-tauri/src/client.rs
index 519e6f9ac..47e3efba9 100644
--- a/rust/gui-client/src-tauri/src/client.rs
+++ b/rust/gui-client/src-tauri/src/client.rs
@@ -29,7 +29,7 @@ use settings::AdvancedSettings;
 /// * `g` doesn't mean anything
 /// * `ed5437c88` is the Git commit hash
 /// * `-modified` is present if the working dir has any changes from that commit number
-pub const GIT_VERSION: &str = git_version::git_version!(
+const GIT_VERSION: &str = git_version::git_version!(
     args = ["--always", "--dirty=-modified", "--tags"],
     fallback = "unknown"
 );
@@ -157,7 +157,12 @@ fn fix_log_filter(settings: &mut AdvancedSettings) -> Result<()> {
 /// Don't drop the log handle or logging will stop.
 fn start_logging(directives: &str) -> Result<logging::Handles> {
     let logging_handles = logging::setup(directives)?;
-    tracing::info!(?GIT_VERSION, "`gui-client` started logging");
+    tracing::info!(
+        ?directives,
+        ?GIT_VERSION,
+        system_uptime_seconds = firezone_headless_client::uptime::get().map(|dur| dur.as_secs()),
+        "`gui-client` started logging"
+    );
 
     Ok(logging_handles)
 }
diff --git a/rust/gui-client/src-tauri/src/client/gui.rs b/rust/gui-client/src-tauri/src/client/gui.rs
index 33346222e..e9c0c6857 100644
--- a/rust/gui-client/src-tauri/src/client/gui.rs
+++ b/rust/gui-client/src-tauri/src/client/gui.rs
@@ -80,7 +80,6 @@ pub(crate) fn run(
     // Needed for the deep link server
     let rt = tokio::runtime::Runtime::new().context("Couldn't start Tokio runtime")?;
     let _guard = rt.enter();
-    rt.spawn(firezone_headless_client::heartbeat::heartbeat());
 
     let (ctlr_tx, ctlr_rx) = mpsc::channel(5);
 
diff --git a/rust/headless-client/src/heartbeat.rs b/rust/headless-client/src/heartbeat.rs
deleted file mode 100644
index c5a38dbc5..000000000
--- a/rust/headless-client/src/heartbeat.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-//! A heartbeat that logs to `INFO` at exponentially increasing intervals
-//! so it won't take up much disk space
-//!
-//! The IPC service is quiet when signed out, and the GUI is quiet when it's in steady
-//! state, so this heartbeat allows us to estimate roughly how long each process stayed
-//! up when looking at user logs, using unlimited disk space per run of the app.
-
-use crate::uptime;
-use std::time::Duration;
-use tokio::time::{sleep_until, Instant};
-
-/// Logs a heartbeat to `tracing::info!`. Put this in a Tokio task and forget about it.
-pub async fn heartbeat() {
-    let mut hb = Heartbeat::default();
-    loop {
-        sleep_until(hb.next_instant).await;
-        let system_uptime = uptime::get();
-        tracing::info!(?system_uptime, "Heartbeat");
-        hb.tick();
-    }
-}
-
-struct Heartbeat {
-    next_instant: Instant,
-    dur: Duration,
-}
-
-impl Default for Heartbeat {
-    fn default() -> Self {
-        Self {
-            next_instant: Instant::now(),
-            dur: Duration::from_secs(1),
-        }
-    }
-}
-
-impl Heartbeat {
-    fn tick(&mut self) {
-        self.next_instant += self.dur;
-        self.dur *= 2;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    /// Make sure this can run for a few years with no issue
-    #[test]
-    fn years() {
-        let mut hb = super::Heartbeat::default();
-        const SECONDS_PER_DAY: u64 = 86_400;
-        const DAYS_PER_YEAR: u64 = 365;
-        let far_future =
-            hb.next_instant + std::time::Duration::from_secs(SECONDS_PER_DAY * DAYS_PER_YEAR * 50);
-
-        // It will only print 32 lines or so for the next 50+ years
-        for _ in 0..50 {
-            hb.tick();
-        }
-        assert!(hb.next_instant > far_future);
-    }
-}
diff --git a/rust/headless-client/src/ipc_service.rs b/rust/headless-client/src/ipc_service.rs
index 742d8490b..88ba7ee98 100644
--- a/rust/headless-client/src/ipc_service.rs
+++ b/rust/headless-client/src/ipc_service.rs
@@ -91,7 +91,6 @@ fn run_debug_ipc_service() -> Result<()> {
     crate::setup_stdout_logging()?;
     let rt = tokio::runtime::Runtime::new()?;
     let _guard = rt.enter();
-    rt.spawn(crate::heartbeat::heartbeat());
     let mut signals = Signals::new()?;
 
     // Couldn't get the loop to work here yet, so SIGHUP is not implemented
@@ -297,11 +296,15 @@ fn setup_logging(log_dir: Option<PathBuf>) -> Result<connlib_client_shared::file
     std::fs::create_dir_all(&log_dir)
         .context("We should have permissions to create our log dir")?;
     let (layer, handle) = file_logger::layer(&log_dir);
-    let log_filter = get_log_filter().context("Couldn't read log filter")?;
-    let filter = EnvFilter::new(&log_filter);
+    let directives = get_log_filter().context("Couldn't read log filter")?;
+    let filter = EnvFilter::new(&directives);
     let subscriber = Registry::default().with(layer.with_filter(filter));
     set_global_default(subscriber).context("`set_global_default` should always work)")?;
-    tracing::info!(git_version = crate::GIT_VERSION, ?log_filter);
+    tracing::info!(
+        git_version = crate::GIT_VERSION,
+        system_uptime_seconds = crate::uptime::get().map(|dur| dur.as_secs()),
+        ?directives
+    );
     Ok(handle)
 }
 
diff --git a/rust/headless-client/src/ipc_service/linux.rs b/rust/headless-client/src/ipc_service/linux.rs
index b51ec8c9c..ff0201f01 100644
--- a/rust/headless-client/src/ipc_service/linux.rs
+++ b/rust/headless-client/src/ipc_service/linux.rs
@@ -10,7 +10,6 @@ pub(crate) fn run_ipc_service(cli: CliCommon) -> Result<()> {
         anyhow::bail!("This is the IPC service binary, it's not meant to run interactively.");
     }
     let rt = tokio::runtime::Runtime::new()?;
-    rt.spawn(crate::heartbeat::heartbeat());
     if let Err(error) = rt.block_on(super::ipc_listen()) {
         tracing::error!(?error, "`ipc_listen` failed");
     }
diff --git a/rust/headless-client/src/ipc_service/windows.rs b/rust/headless-client/src/ipc_service/windows.rs
index 6b4c082c3..c5d2efb65 100644
--- a/rust/headless-client/src/ipc_service/windows.rs
+++ b/rust/headless-client/src/ipc_service/windows.rs
@@ -76,7 +76,6 @@ fn fallible_windows_service_run(
     tracing::info!(?arguments, "fallible_windows_service_run");
 
     let rt = tokio::runtime::Runtime::new()?;
-    rt.spawn(crate::heartbeat::heartbeat());
 
     let ipc_task = rt.spawn(super::ipc_listen());
     let ipc_task_ah = ipc_task.abort_handle();
diff --git a/rust/headless-client/src/lib.rs b/rust/headless-client/src/lib.rs
index ad24febb7..6309d2d01 100644
--- a/rust/headless-client/src/lib.rs
+++ b/rust/headless-client/src/lib.rs
@@ -29,11 +29,10 @@ use platform::Signals;
 pub(crate) mod device_id;
 // Pub because the GUI reads the system resolvers
 pub mod dns_control;
-pub mod heartbeat;
 mod ipc_service;
 pub mod known_dirs;
 mod standalone;
-mod uptime;
+pub mod uptime;
 
 #[cfg(target_os = "linux")]
 #[path = "linux.rs"]