diff --git a/workspaces/nitro-host/Cargo.lock b/workspaces/nitro-host/Cargo.lock
index 6386bf37e..95ec2a4f6 100644
--- a/workspaces/nitro-host/Cargo.lock
+++ b/workspaces/nitro-host/Cargo.lock
@@ -51,6 +51,15 @@ dependencies = [
  "yansi-term",
 ]
 
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "anstream"
 version = "0.3.2"
@@ -124,6 +133,17 @@ dependencies = [
  "critical-section",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -275,6 +295,22 @@ dependencies = [
  "libloading",
 ]
 
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim 0.8.0",
+ "term_size",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
 [[package]]
 name = "clap"
 version = "4.3.19"
@@ -295,7 +331,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim",
+ "strsim 0.10.0",
 ]
 
 [[package]]
@@ -304,7 +340,7 @@ version = "4.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "syn 2.0.28",
@@ -412,6 +448,19 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.10.0"
@@ -621,12 +670,30 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.2"
@@ -639,6 +706,15 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "home"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+dependencies = [
+ "windows-sys",
+]
+
 [[package]]
 name = "http"
 version = "0.2.9"
@@ -775,7 +851,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.2",
  "libc",
  "windows-sys",
 ]
@@ -810,7 +886,7 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.2",
  "io-lifetimes",
  "rustix",
  "windows-sys",
@@ -931,9 +1007,9 @@ name = "linux-veracruz-server"
 version = "0.3.0"
 dependencies = [
  "anyhow",
- "clap",
+ "clap 4.3.19",
  "data-encoding",
- "env_logger",
+ "env_logger 0.10.0",
  "io-utils",
  "lazy_static",
  "log",
@@ -1061,13 +1137,14 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 [[package]]
 name = "nitro-enclave"
 version = "0.2.0"
-source = "git+https://github.com/veracruz-project/nitro-enclave?tag=v0.2#8075f6f159b8b9516bd32c16892c06635de3ff53"
+source = "git+https://github.com/veracruz-project/nitro-enclave?tag=v0.3#4b102ce29bfb5a803551e864a80cab8d9b11363b"
 dependencies = [
  "anyhow",
  "err-derive",
  "nix",
  "raw-fd",
  "serde_json",
+ "vsocket",
 ]
 
 [[package]]
@@ -1085,8 +1162,8 @@ version = "0.3.0"
 dependencies = [
  "anyhow",
  "bincode",
- "clap",
- "env_logger",
+ "clap 4.3.19",
+ "env_logger 0.10.0",
  "log",
  "nitro-enclave",
  "policy-utils",
@@ -1097,16 +1174,15 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
  "bitflags",
  "cfg-if",
  "libc",
  "memoffset",
  "pin-utils",
- "static_assertions",
 ]
 
 [[package]]
@@ -1212,7 +1288,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.2",
  "libc",
 ]
 
@@ -1435,10 +1511,10 @@ dependencies = [
 [[package]]
 name = "proxy-attestation-client"
 version = "0.1.0"
-source = "git+https://github.com/veracruz-project/proxy-attestation-client?tag=v0.2#a20043511cffc094f7bb03aacdd8a7e642c9a2e8"
+source = "git+https://github.com/veracruz-project/proxy-attestation-client?tag=v0.4#03cd0abbb892ea29806ef3a902c5b7eee565234e"
 dependencies = [
  "anyhow",
- "base64 0.13.1",
+ "base64 0.21.2",
  "err-derive",
  "log",
  "reqwest",
@@ -1497,7 +1573,7 @@ dependencies = [
 [[package]]
 name = "raw-fd"
 version = "0.2.0"
-source = "git+https://github.com/veracruz-project/nitro-enclave?tag=v0.2#8075f6f159b8b9516bd32c16892c06635de3ff53"
+source = "git+https://github.com/veracruz-project/nitro-enclave?tag=v0.3#4b102ce29bfb5a803551e864a80cab8d9b11363b"
 dependencies = [
  "anyhow",
  "byteorder",
@@ -1641,9 +1717,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.23"
+version = "0.37.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0"
 dependencies = [
  "bitflags",
  "errno",
@@ -1780,6 +1856,24 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sev-veracruz-server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bincode",
+ "env_logger 0.9.3",
+ "log",
+ "policy-utils",
+ "proxy-attestation-client",
+ "raw-fd",
+ "rustix",
+ "structopt",
+ "veracruz-server",
+ "veracruz-utils",
+ "vsocket",
+]
+
 [[package]]
 name = "shlex"
 version = "1.1.0"
@@ -1882,12 +1976,42 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "913e7b03d63752f6cdd2df77da36749d82669904798fe8944b9ec3d23f159905"
 
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "structopt"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
+dependencies = [
+ "clap 2.34.0",
+ "lazy_static",
+ "structopt-derive",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -1947,6 +2071,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "term_size"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.2.0"
@@ -1963,7 +2097,7 @@ dependencies = [
  "actix-rt",
  "anyhow",
  "either",
- "env_logger",
+ "env_logger 0.10.0",
  "hex",
  "lazy_static",
  "linux-veracruz-server",
@@ -1974,12 +2108,23 @@ dependencies = [
  "policy-utils",
  "postcard",
  "reqwest",
+ "sev-veracruz-server",
  "transport-protocol",
  "veracruz-client",
  "veracruz-server",
  "veracruz-utils",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "term_size",
+ "unicode-width",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.44"
@@ -2098,6 +2243,7 @@ version = "0.3.0"
 dependencies = [
  "anyhow",
  "err-derive",
+ "home",
  "lazy_static",
  "protobuf",
  "protobuf-codegen",
@@ -2139,6 +2285,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.10"
@@ -2183,14 +2335,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
 [[package]]
 name = "veracruz-client"
 version = "0.3.0"
 dependencies = [
  "anyhow",
  "bincode",
- "clap",
- "env_logger",
+ "clap 4.3.19",
+ "env_logger 0.10.0",
  "err-derive",
  "hex",
  "log",
@@ -2209,9 +2367,9 @@ dependencies = [
  "anyhow",
  "base64 0.13.1",
  "bincode",
- "clap",
+ "clap 4.3.19",
  "data-encoding",
- "env_logger",
+ "env_logger 0.10.0",
  "err-derive",
  "hex",
  "io-utils",
@@ -2255,6 +2413,16 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "vsocket"
+version = "0.3.0"
+source = "git+https://github.com/veracruz-project/nitro-enclave?tag=v0.3#4b102ce29bfb5a803551e864a80cab8d9b11363b"
+dependencies = [
+ "anyhow",
+ "byteorder",
+ "nix",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
diff --git a/workspaces/nitro-runtime/Cargo.lock b/workspaces/nitro-runtime/Cargo.lock
index 32bc1842d..c4e5a6109 100644
--- a/workspaces/nitro-runtime/Cargo.lock
+++ b/workspaces/nitro-runtime/Cargo.lock
@@ -818,6 +818,15 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "home"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+dependencies = [
+ "windows-sys",
+]
+
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -1648,7 +1657,7 @@ dependencies = [
 [[package]]
 name = "raw-fd"
 version = "0.2.0"
-source = "git+https://github.com/veracruz-project/nitro-enclave?tag=v0.2#8075f6f159b8b9516bd32c16892c06635de3ff53"
+source = "git+https://github.com/veracruz-project/nitro-enclave?tag=v0.3#4b102ce29bfb5a803551e864a80cab8d9b11363b"
 dependencies = [
  "anyhow",
  "byteorder",
@@ -2139,6 +2148,7 @@ version = "0.3.0"
 dependencies = [
  "anyhow",
  "err-derive",
+ "home",
  "lazy_static",
  "protobuf",
  "protobuf-codegen",