diff --git a/rust/bin-shared/src/lib.rs b/rust/bin-shared/src/lib.rs
index f738b6c0e..a90af0a1b 100644
--- a/rust/bin-shared/src/lib.rs
+++ b/rust/bin-shared/src/lib.rs
@@ -54,9 +54,9 @@ pub use tun_device_manager::TunDeviceManager;
 /// * `-modified` is present if the working dir has any changes from that commit number
 #[macro_export]
 macro_rules! git_version {
-    () => {
+    ($regex:literal) => {
         $crate::__reexport::git_version!(
-            args = ["--always", "--dirty=-modified", "--tags"],
+            args = ["--always", "--dirty=-modified", "--tags", "--match", $regex],
             fallback = "unknown"
         )
     };
diff --git a/rust/gui-client/src-tauri/src/client.rs b/rust/gui-client/src-tauri/src/client.rs
index e8894468e..43ee73e9d 100644
--- a/rust/gui-client/src-tauri/src/client.rs
+++ b/rust/gui-client/src-tauri/src/client.rs
@@ -131,7 +131,7 @@ fn start_logging(directives: &str) -> Result<logging::Handles> {
     tracing::info!(
         arch = std::env::consts::ARCH,
         ?directives,
-        git_version = firezone_bin_shared::git_version!(),
+        git_version = firezone_bin_shared::git_version!("gui-client-*"),
         system_uptime_seconds = firezone_headless_client::uptime::get().map(|dur| dur.as_secs()),
         "`gui-client` started logging"
     );
diff --git a/rust/gui-client/src-tauri/src/client/about.rs b/rust/gui-client/src-tauri/src/client/about.rs
index 01fa57569..232f73ef5 100644
--- a/rust/gui-client/src-tauri/src/client/about.rs
+++ b/rust/gui-client/src-tauri/src/client/about.rs
@@ -7,7 +7,7 @@ pub(crate) fn get_cargo_version() -> String {
 
 #[tauri::command]
 pub(crate) fn get_git_version() -> String {
-    firezone_bin_shared::git_version!().to_string()
+    firezone_bin_shared::git_version!("gui-client-*").to_string()
 }
 
 #[cfg(test)]
diff --git a/rust/headless-client/src/ipc_service.rs b/rust/headless-client/src/ipc_service.rs
index 5b418bcdb..2f297f786 100644
--- a/rust/headless-client/src/ipc_service.rs
+++ b/rust/headless-client/src/ipc_service.rs
@@ -104,7 +104,7 @@ fn run_debug_ipc_service(cli: Cli) -> Result<()> {
     crate::setup_stdout_logging()?;
     tracing::info!(
         arch = std::env::consts::ARCH,
-        git_version = firezone_bin_shared::git_version!(),
+        git_version = firezone_bin_shared::git_version!("gui-client-*"),
         system_uptime_seconds = crate::uptime::get().map(|dur| dur.as_secs()),
     );
     if !platform::elevation_check()? {
@@ -452,7 +452,7 @@ fn setup_logging(log_dir: Option<PathBuf>) -> Result<firezone_logging::file::Han
     set_global_default(subscriber).context("`set_global_default` should always work)")?;
     tracing::info!(
         arch = std::env::consts::ARCH,
-        git_version = firezone_bin_shared::git_version!(),
+        git_version = firezone_bin_shared::git_version!("gui-client-*"),
         system_uptime_seconds = crate::uptime::get().map(|dur| dur.as_secs()),
         ?directives
     );
diff --git a/rust/headless-client/src/main.rs b/rust/headless-client/src/main.rs
index ae7a6a865..a2949b35b 100644
--- a/rust/headless-client/src/main.rs
+++ b/rust/headless-client/src/main.rs
@@ -138,7 +138,7 @@ fn main() -> Result<()> {
 
     tracing::info!(
         arch = std::env::consts::ARCH,
-        git_version = firezone_bin_shared::git_version!()
+        git_version = firezone_bin_shared::git_version!("headless-client-*")
     );
 
     let rt = tokio::runtime::Builder::new_current_thread()