diff --git a/Cargo.toml b/Cargo.toml
index 499891c6c..89f8880ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,6 +43,9 @@ vmm = { path = "vmm" }
 vmm-sys-util = "0.11.0"
 vm-memory = "0.10.0"
 
+[build-dependencies]
+clap = { version = "4.0.29", features = ["cargo"] }
+
 # List of patched crates
 [patch.crates-io]
 kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx" }
diff --git a/build.rs b/build.rs
index a0b98f571..3c0c84df8 100644
--- a/build.rs
+++ b/build.rs
@@ -3,10 +3,13 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#[macro_use(crate_version)]
+extern crate clap;
+
 use std::process::Command;
 
 fn main() {
-    let mut version = "v".to_owned() + env!("CARGO_PKG_VERSION");
+    let mut version = "v".to_owned() + crate_version!();
 
     if let Ok(git_out) = Command::new("git").args(["describe", "--dirty"]).output() {
         if git_out.status.success() {
diff --git a/performance-metrics/Cargo.toml b/performance-metrics/Cargo.toml
index ab53bd4f3..85241e684 100644
--- a/performance-metrics/Cargo.toml
+++ b/performance-metrics/Cargo.toml
@@ -13,3 +13,6 @@ serde_json = "1.0.89"
 test_infra = { path = "../test_infra" }
 thiserror = "1.0.38"
 wait-timeout = "0.2.0"
+
+[build-dependencies]
+clap = { version = "4.0.29", features = ["cargo"] }
diff --git a/performance-metrics/build.rs b/performance-metrics/build.rs
index 7dcd810af..0898cac38 100644
--- a/performance-metrics/build.rs
+++ b/performance-metrics/build.rs
@@ -3,11 +3,13 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#[macro_use(crate_version)]
+extern crate clap;
+
 use std::process::Command;
 
 fn main() {
-    let mut git_human_readable = "v".to_owned() + env!("CARGO_PKG_VERSION");
-
+    let mut git_human_readable = "v".to_owned() + crate_version!();
     if let Ok(git_out) = Command::new("git").args(["describe", "--dirty"]).output() {
         if git_out.status.success() {
             if let Ok(git_out_str) = String::from_utf8(git_out.stdout) {
diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml
index 0d1ab834a..ff12ef76a 100644
--- a/vhost_user_block/Cargo.toml
+++ b/vhost_user_block/Cargo.toml
@@ -20,3 +20,5 @@ virtio-queue = "0.7.0"
 vm-memory = "0.10.0"
 vmm-sys-util = "0.11.0"
 
+[build-dependencies]
+clap = { version = "4.0.29", features = ["cargo"] }
diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml
index da06dd84f..e29f55e25 100644
--- a/vhost_user_net/Cargo.toml
+++ b/vhost_user_net/Cargo.toml
@@ -18,3 +18,5 @@ virtio-bindings = "0.1.0"
 vm-memory = "0.10.0"
 vmm-sys-util = "0.11.0"
 
+[build-dependencies]
+clap = { version = "4.0.29", features = ["cargo"] }