diff --git a/Cargo.lock b/Cargo.lock
index d79292523..f7e93b53f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -939,6 +939,7 @@ dependencies = [
  "libflate",
  "linux-boot-params",
  "log",
+ "tdx-guest",
  "uart_16550",
  "uefi",
  "uefi-raw",
@@ -1532,13 +1533,12 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tdx-guest"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d08fda76b8a438b7d926a92217a709ba39ef9031b8544a9a3f3af08d1b3f87e9"
+checksum = "944d4a19d6093a6f5f7bbd38ab73cc3dc11b0d17387345fc952224878caa7e7f"
 dependencies = [
  "bitflags 1.3.2",
  "iced-x86",
- "lazy_static",
  "raw-cpuid",
  "x86_64 0.14.13",
 ]
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
index 1f46db4b9..5dabca618 100644
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -33,7 +33,7 @@ ascii = { version = "1.1", default-features = false, features = ["alloc"] }
 intrusive-collections = "0.9.5"
 paste = "1.0"
 time = { version = "0.3", default-features = false, features = ["alloc"] }
-tdx-guest = { version = "0.1.7", optional = true }
+tdx-guest = { version = "0.1.8", optional = true }
 
 # parse elf file
 xmas-elf = "0.8.0"
diff --git a/ostd/Cargo.toml b/ostd/Cargo.toml
index 426bdb259..5e462620d 100644
--- a/ostd/Cargo.toml
+++ b/ostd/Cargo.toml
@@ -53,7 +53,7 @@ iced-x86 = { version = "1.21.0", default-features = false, features = [
     "decoder",
     "gas",
 ], optional = true }
-tdx-guest = { version = "0.1.7", optional = true }
+tdx-guest = { version = "0.1.8", optional = true }
 
 [target.riscv64gc-unknown-none-elf.dependencies]
 riscv = { version = "0.11.1", features = ["s-mode"] }
diff --git a/ostd/libs/linux-bzimage/setup/Cargo.toml b/ostd/libs/linux-bzimage/setup/Cargo.toml
index 077d6e753..b5ed9464d 100644
--- a/ostd/libs/linux-bzimage/setup/Cargo.toml
+++ b/ostd/libs/linux-bzimage/setup/Cargo.toml
@@ -26,7 +26,9 @@ log = "0.4.20"
 uefi = { version = "0.32.0", features = ["global_allocator", "panic_handler", "logger", "qemu"]}
 uefi-raw = "0.8.0"
 x86_64 = "0.15.1"
+tdx-guest = { version = "0.1.8", optional = true }
 
 [features]
-default = []
+default = ["cvm_guest"]
 debug_print = []
+cvm_guest = ["dep:tdx-guest"]