diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock
index bf4cf7cf3a..e211d950fb 100644
--- a/src/agent/Cargo.lock
+++ b/src/agent/Cargo.lock
@@ -438,38 +438,21 @@ dependencies = [
  "atty",
  "bitflags",
  "strsim 0.8.0",
- "textwrap 0.11.0",
+ "textwrap",
  "unicode-width",
  "vec_map",
 ]
 
 [[package]]
 name = "clap"
-version = "3.2.4"
+version = "4.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d20de3739b4fb45a17837824f40aa1769cc7655d7a83e68739a77fe7b30c87a"
+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
 dependencies = [
- "atty",
- "bitflags",
- "clap_derive 3.2.4",
- "clap_lex 0.2.2",
- "indexmap",
- "once_cell",
- "strsim 0.10.0",
- "termcolor",
- "textwrap 0.15.0",
-]
-
-[[package]]
-name = "clap"
-version = "4.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2148adefda54e14492fb9bddcc600b4344c5d1a3123bd666dcb939c6f0e0e57e"
-dependencies = [
- "atty",
  "bitflags",
- "clap_derive 4.0.21",
- "clap_lex 0.3.0",
+ "clap_derive",
+ "clap_lex",
+ "is-terminal",
  "once_cell",
  "strsim 0.10.0",
  "termcolor",
@@ -477,22 +460,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026baf08b89ffbd332836002ec9378ef0e69648cbfadd68af7cd398ca5bf98f7"
-dependencies = [
- "heck 0.4.0",
- "proc-macro-error",
- "proc-macro2 1.0.47",
- "quote 1.0.9",
- "syn 1.0.103",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.0.21"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
+checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
 dependencies = [
  "heck 0.4.0",
  "proc-macro-error",
@@ -501,15 +471,6 @@ dependencies = [
  "syn 1.0.103",
 ]
 
-[[package]]
-name = "clap_lex"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
-dependencies = [
- "os_str_bytes",
-]
-
 [[package]]
 name = "clap_lex"
 version = "0.3.0"
@@ -568,7 +529,7 @@ name = "coverage"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.0.26",
+ "clap 4.1.6",
  "cobertura",
  "debuggable-module",
  "debugger",
@@ -794,7 +755,7 @@ name = "debuggable-module"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.0.26",
+ "clap 4.1.6",
  "elsa",
  "gimli",
  "goblin 0.6.0",
@@ -2168,7 +2129,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "backtrace",
- "clap 3.2.4",
+ "clap 4.1.6",
  "downcast-rs",
  "env_logger 0.9.0",
  "futures",
@@ -2214,7 +2175,7 @@ dependencies = [
  "azure_storage_blobs",
  "backoff",
  "chrono",
- "clap 2.34.0",
+ "clap 4.1.6",
  "coverage-legacy",
  "crossterm 0.22.1",
  "env_logger 0.9.0",
@@ -3600,12 +3561,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
 [[package]]
 name = "thiserror"
 version = "1.0.37"
diff --git a/src/agent/coverage/Cargo.toml b/src/agent/coverage/Cargo.toml
index 27f2fe61c5..adce719159 100644
--- a/src/agent/coverage/Cargo.toml
+++ b/src/agent/coverage/Cargo.toml
@@ -28,6 +28,6 @@ pete = "0.9"
 procfs = { version = "0.12", default-features = false, features = ["flate2"] }
 
 [dev-dependencies]
-clap = { version = "4.0", features = ["derive"] }
+clap = { version = "4.1", features = ["derive"] }
 env_logger = "0.10.0"
 pretty_assertions = "1.3.0"
diff --git a/src/agent/debuggable-module/Cargo.toml b/src/agent/debuggable-module/Cargo.toml
index 207b8af6a9..21f17f8da4 100644
--- a/src/agent/debuggable-module/Cargo.toml
+++ b/src/agent/debuggable-module/Cargo.toml
@@ -17,4 +17,4 @@ symbolic = { version = "10.1", features = ["debuginfo", "demangle", "symcache"]
 thiserror = "1.0"
 
 [dev-dependencies]
-clap = { version = "4.0", features = ["derive"] }
+clap = { version = "4.1", features = ["derive"] }
diff --git a/src/agent/onefuzz-agent/Cargo.toml b/src/agent/onefuzz-agent/Cargo.toml
index 8cf30a7da0..314415a545 100644
--- a/src/agent/onefuzz-agent/Cargo.toml
+++ b/src/agent/onefuzz-agent/Cargo.toml
@@ -25,7 +25,7 @@ storage-queue = { path = "../storage-queue" }
 tokio = { version = "1.24", features = ["full"] }
 url = { version = "2.3", features = ["serde"] }
 uuid = { version = "0.8", features = ["serde", "v4"] }
-clap = { version = "3.2.4", features = ["derive", "cargo"] }
+clap = { version = "4.1.6", features = ["derive", "cargo"] }
 reqwest-retry = { path = "../reqwest-retry" }
 onefuzz-telemetry = { path = "../onefuzz-telemetry" }
 backtrace = "0.3"
diff --git a/src/agent/onefuzz-task/Cargo.toml b/src/agent/onefuzz-task/Cargo.toml
index 5e91817ed6..3e323b7773 100644
--- a/src/agent/onefuzz-task/Cargo.toml
+++ b/src/agent/onefuzz-task/Cargo.toml
@@ -15,7 +15,7 @@ arraydeque = "0.4"
 async-trait = "0.1"
 atexit = { path = "../atexit" }
 backoff = { version = "0.4", features = ["tokio"] }
-clap = "2.34"
+clap = "4.1"
 coverage = { package = "coverage-legacy", path = "../coverage-legacy" }
 crossterm = "0.22"
 env_logger = "0.9"