diff --git a/Cargo.lock b/Cargo.lock
index 3a6177ff4d49c1..798b0584527a8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -104,15 +104,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.58"
@@ -793,21 +784,6 @@ dependencies = [
  "libloading",
 ]
 
-[[package]]
-name = "clap"
-version = "2.33.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim 0.8.0",
- "textwrap 0.11.0",
- "unicode-width",
- "vec_map",
-]
-
 [[package]]
 name = "clap"
 version = "3.1.8"
@@ -820,9 +796,9 @@ dependencies = [
  "indexmap",
  "lazy_static",
  "os_str_bytes",
- "strsim 0.10.0",
+ "strsim",
  "termcolor",
- "textwrap 0.15.0",
+ "textwrap",
 ]
 
 [[package]]
@@ -3802,7 +3778,7 @@ dependencies = [
 name = "rbpf-cli"
 version = "1.15.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-bpf-loader-program",
@@ -4531,7 +4507,7 @@ dependencies = [
 name = "solana-accounts-bench"
 version = "1.15.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rayon",
  "solana-logger 1.15.0",
@@ -4545,7 +4521,7 @@ dependencies = [
 name = "solana-accounts-cluster-bench"
 version = "1.15.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -4603,7 +4579,7 @@ dependencies = [
 name = "solana-banking-bench"
 version = "1.15.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "rand 0.7.3",
@@ -4671,7 +4647,7 @@ dependencies = [
 name = "solana-bench-streamer"
 version = "1.15.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "solana-net-utils",
  "solana-streamer",
@@ -4682,7 +4658,7 @@ dependencies = [
 name = "solana-bench-tps"
 version = "1.15.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "rand 0.7.3",
@@ -4784,7 +4760,7 @@ name = "solana-cargo-build-bpf"
 version = "1.15.0"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
  "solana-sdk 1.15.0",
 ]
 
@@ -4795,7 +4771,7 @@ dependencies = [
  "assert_cmd",
  "bzip2",
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
  "log",
  "predicates",
  "regex",
@@ -4811,7 +4787,7 @@ name = "solana-cargo-test-bpf"
 version = "1.15.0"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
 ]
 
 [[package]]
@@ -4819,7 +4795,7 @@ name = "solana-cargo-test-sbf"
 version = "1.15.0"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
 ]
 
 [[package]]
@@ -4827,7 +4803,7 @@ name = "solana-clap-utils"
 version = "1.15.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4844,7 +4820,7 @@ name = "solana-clap-v3-utils"
 version = "1.15.0"
 dependencies = [
  "chrono",
- "clap 3.1.8",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4862,7 +4838,7 @@ version = "1.15.0"
 dependencies = [
  "bincode",
  "bs58",
- "clap 2.33.3",
+ "clap",
  "console",
  "const_format",
  "criterion-stats",
@@ -4928,7 +4904,7 @@ dependencies = [
  "Inflector",
  "base64 0.13.0",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "ed25519-dalek",
  "humantime",
@@ -5084,7 +5060,7 @@ name = "solana-dos"
 version = "1.15.0"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "itertools",
  "log",
@@ -5161,7 +5137,7 @@ version = "1.15.0"
 dependencies = [
  "bincode",
  "byteorder",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "serde",
@@ -5271,7 +5247,7 @@ name = "solana-genesis"
 version = "1.15.0"
 dependencies = [
  "base64 0.13.0",
- "clap 2.33.3",
+ "clap",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -5333,7 +5309,7 @@ version = "1.15.0"
 dependencies = [
  "bincode",
  "bv",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "flate2",
  "indexmap",
@@ -5382,7 +5358,7 @@ dependencies = [
  "bincode",
  "bzip2",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "crossbeam-channel",
  "ctrlc",
@@ -5412,7 +5388,7 @@ name = "solana-keygen"
 version = "1.15.0"
 dependencies = [
  "bs58",
- "clap 3.1.8",
+ "clap",
  "dirs-next",
  "num_cpus",
  "solana-clap-v3-utils",
@@ -5493,7 +5469,7 @@ dependencies = [
  "bs58",
  "bytecount",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "csv",
  "dashmap 4.0.2",
@@ -5562,7 +5538,7 @@ name = "solana-log-analyzer"
 version = "1.15.0"
 dependencies = [
  "byte-unit",
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-logger 1.15.0",
@@ -5601,7 +5577,7 @@ dependencies = [
 name = "solana-merkle-root-bench"
 version = "1.15.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.15.0",
  "solana-measure",
@@ -5639,7 +5615,7 @@ dependencies = [
 name = "solana-net-shaper"
 version = "1.15.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -5651,7 +5627,7 @@ name = "solana-net-utils"
 version = "1.15.0"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "nix 0.25.0",
@@ -5728,7 +5704,7 @@ dependencies = [
 name = "solana-poh-bench"
 version = "1.15.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -6048,7 +6024,7 @@ name = "solana-rpc-client-nonce-utils"
 version = "1.15.0"
 dependencies = [
  "anyhow",
- "clap 2.33.3",
+ "clap",
  "futures 0.3.23",
  "serde_json",
  "solana-account-decoder",
@@ -6297,7 +6273,7 @@ dependencies = [
 name = "solana-stake-accounts"
 version = "1.15.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-remote-wallet",
@@ -6385,7 +6361,7 @@ dependencies = [
 name = "solana-store-tool"
 version = "1.15.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.15.0",
  "solana-runtime",
@@ -6427,7 +6403,7 @@ dependencies = [
 name = "solana-sys-tuner"
 version = "1.15.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "libc",
  "log",
  "nix 0.25.0",
@@ -6484,7 +6460,7 @@ version = "1.15.0"
 dependencies = [
  "bincode",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "csv",
  "ctrlc",
@@ -6552,7 +6528,7 @@ name = "solana-transaction-dos"
 version = "1.15.0"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -6611,7 +6587,7 @@ name = "solana-validator"
 version = "1.15.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "core_affinity",
  "crossbeam-channel",
@@ -6700,7 +6676,7 @@ dependencies = [
 name = "solana-watchtower"
 version = "1.15.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "humantime",
  "log",
  "solana-clap-utils",
@@ -6908,12 +6884,6 @@ dependencies = [
  "tokio",
 ]
 
-[[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"
@@ -7138,15 +7108,6 @@ dependencies = [
  "syn 1.0.98",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.15.0"
@@ -7829,12 +7790,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.9.3"
diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml
index a23017d0315180..454bcd08f26e0a 100644
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.1.8"
 log = "0.4.17"
 rayon = "1.5.3"
 solana-logger = { path = "../logger", version = "=1.15.0" }
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index 39c36afc9dfb52..9bd76c957fbfd9 100644
--- a/accounts-cluster-bench/Cargo.toml
+++ b/accounts-cluster-bench/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.1.8"
 log = "0.4.17"
 rand = "0.7.0"
 rayon = "1.5.3"
diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
index 3e67f504d35f41..439558b6cd9342 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 crossbeam-channel = "0.5"
 solana-net-utils = { path = "../net-utils", version = "=1.15.0" }
 solana-streamer = { path = "../streamer", version = "=1.15.0" }
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index 90d5f4a5a27898..13295d984e763a 100644
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.1.8"
 crossbeam-channel = "0.5"
 log = "0.4.17"
 rand = "0.7.0"
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index 977756134d3a93..7ad8961ea03c3c 100644
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 chrono = "0.4"
-clap = "2.33.0"
+clap = "3.1.8"
 rpassword = "7.0"
 solana-perf = { path = "../perf", version = "=1.15.0" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.15.0", default-features = false }
diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml
index 66c9f07510dd5e..6ff9f0e28d51a6 100644
--- a/clap-v3-utils/Cargo.toml
+++ b/clap-v3-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 chrono = "0.4"
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 rpassword = "7.0"
 solana-perf = { path = "../perf", version = "=1.15.0" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.15.0", default-features = false }
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index f4d0f751de3045..d7c6d4d8b49e54 100644
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@@ -13,7 +13,7 @@ documentation = "https://docs.rs/solana-cli-output"
 Inflector = "0.11.4"
 base64 = "0.13.0"
 chrono = { version = "0.4.22", features = ["serde"] }
-clap = "2.33.0"
+clap = "3.1.8"
 console = "0.15.0"
 humantime = "2.0.1"
 indicatif = "0.17.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 39adabfe9df366..be71996622a6f1 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-cli"
 [dependencies]
 bincode = "1.3.3"
 bs58 = "0.4.0"
-clap = "2.33.1"
+clap = "3.1.8"
 console = "0.15.0"
 const_format = "0.2.26"
 criterion-stats = "0.3.0"
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index ed07884a46bb99..3834e89ef055eb 100644
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -11,7 +11,7 @@ description = "Tool to send various requests to cluster in order to evaluate the
 
 [dependencies]
 bincode = "1.3.3"
-clap = { version = "3.1.5", features = ["derive", "cargo"] }
+clap = { version = "3.1.8", features = ["derive", "cargo"] }
 crossbeam-channel = "0.5.6"
 itertools = "0.10.3"
 log = "0.4.17"
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index cc63438491cfd7..32fd50b06bd55a 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2021"
 [dependencies]
 bincode = "1.3.3"
 byteorder = "1.4.3"
-clap = "2.33"
+clap = "3.1"
 crossbeam-channel = "0.5"
 log = "0.4.17"
 serde = "1.0.144"
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index fd63a7ce807356..4e960829f174d6 100644
--- a/genesis/Cargo.toml
+++ b/genesis/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-genesis"
 
 [dependencies]
 base64 = "0.13.0"
-clap = "2.33.1"
+clap = "3.1.8"
 serde = "1.0.144"
 serde_json = "1.0.83"
 serde_yaml = "0.8.26"
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index b06a78e7eccf83..79d49868814757 100644
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-gossip"
 [dependencies]
 bincode = "1.3.3"
 bv = { version = "0.11.1", features = ["serde"] }
-clap = "2.33.1"
+clap = "3.1.8"
 crossbeam-channel = "0.5"
 flate2 = "1.0"
 indexmap = { version = "1.9", features = ["rayon"] }
diff --git a/install/Cargo.toml b/install/Cargo.toml
index 9d058cf1c3abd6..66c23f9764fcf9 100644
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@@ -14,7 +14,7 @@ atty = "0.2.11"
 bincode = "1.3.3"
 bzip2 = "0.4.3"
 chrono = { version = "0.4.22", features = ["serde"] }
-clap = { version = "2.33.1" }
+clap = { version = "3.1.8" }
 console = "0.15.0"
 crossbeam-channel = "0.5"
 ctrlc = { version = "3.2.2", features = ["termination"] }
diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
index 8b836773d867de..45586c2e488ab1 100644
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 bs58 = "0.4.0"
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 dirs-next = "2.0.0"
 num_cpus = "1.13.1"
 solana-clap-v3-utils = { path = "../clap-v3-utils", version = "=1.15.0" }
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 5c91d530643c11..13185af01fede9 100644
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-ledger-tool"
 [dependencies]
 bs58 = "0.4.0"
 chrono = "0.4.22"
-clap = "2.33.1"
+clap = "3.1.8"
 crossbeam-channel = "0.5"
 csv = "1.1.6"
 dashmap = "4.0.2"
diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml
index 1e652cc94b47f2..01e26dacabeb37 100644
--- a/log-analyzer/Cargo.toml
+++ b/log-analyzer/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 byte-unit = "4.0.14"
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 serde = "1.0.144"
 serde_json = "1.0.83"
 solana-logger = { path = "../logger", version = "=1.15.0" }
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index 7f92e2588616f3..a5633c467c29f3 100644
--- a/merkle-root-bench/Cargo.toml
+++ b/merkle-root-bench/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.1.8"
 log = "0.4.17"
 solana-logger = { path = "../logger", version = "=1.15.0" }
 solana-measure = { path = "../measure", version = "=1.15.0" }
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 3d02fea4eafb32..9b53f5149f1966 100644
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 rand = "0.7.0"
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.83"
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index dab2f2832502e2..a3016f1136bc8d 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 crossbeam-channel = "0.5"
 log = "0.4.17"
 nix = "0.25.0"
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index 003a9c152e61e5..db17dadbdfdc0d 100644
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-poh-bench"
 publish = false
 
 [dependencies]
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 log = "0.4.17"
 rand = "0.7.0"
 rayon = "1.5.3"
diff --git a/rbpf-cli/Cargo.toml b/rbpf-cli/Cargo.toml
index 5d00b001c88a68..454fe4a1bf9f4b 100644
--- a/rbpf-cli/Cargo.toml
+++ b/rbpf-cli/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 serde = "1.0.144"
 serde_json = "1.0.83"
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.15.0" }
diff --git a/rpc-client-nonce-utils/Cargo.toml b/rpc-client-nonce-utils/Cargo.toml
index ae986654e7f9c9..fe65be86e628b7 100644
--- a/rpc-client-nonce-utils/Cargo.toml
+++ b/rpc-client-nonce-utils/Cargo.toml
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-nonce-client"
 edition = "2021"
 
 [dependencies]
-clap = "2.33.0"
+clap = "3.1.8"
 solana-clap-utils = { path = "../clap-utils", version = "=1.15.0" }
 solana-rpc-client = { path = "../rpc-client", version = "=1.15.0", default-features = false }
 solana-sdk = { path = "../sdk", version = "=1.15.0" }
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index c9242a12ce3a8f..a2381d776bce12 100644
--- a/runtime/store-tool/Cargo.toml
+++ b/runtime/store-tool/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.1.8"
 log = { version = "0.4.17" }
 solana-logger = { path = "../../logger", version = "=1.15.0" }
 solana-runtime = { path = "..", version = "=1.15.0" }
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index 6b30bb1c82a3b0..9cc7a273881bdc 100644
--- a/sdk/cargo-build-bpf/Cargo.toml
+++ b/sdk/cargo-build-bpf/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 cargo_metadata = "0.15.0"
-clap = { version = "3.1.5", features = ["cargo", "env"] }
+clap = { version = "3.1.8", features = ["cargo", "env"] }
 solana-sdk = { path = "..", version = "=1.15.0" }
 
 [features]
diff --git a/sdk/cargo-build-sbf/Cargo.toml b/sdk/cargo-build-sbf/Cargo.toml
index b439241142354f..9b06b02ae42fde 100644
--- a/sdk/cargo-build-sbf/Cargo.toml
+++ b/sdk/cargo-build-sbf/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 [dependencies]
 bzip2 = "0.4.3"
 cargo_metadata = "0.15.0"
-clap = { version = "3.1.5", features = ["cargo", "env"] }
+clap = { version = "3.1.8", features = ["cargo", "env"] }
 log = { version = "0.4.14", features = ["std"] }
 regex = "1.5.6"
 solana-download-utils = { path = "../../download-utils", version = "=1.15.0" }
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index a7588cf32e798e..6c95ee25f87071 100644
--- a/sdk/cargo-test-bpf/Cargo.toml
+++ b/sdk/cargo-test-bpf/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 cargo_metadata = "0.15.0"
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 
 [[bin]]
 name = "cargo-test-bpf"
diff --git a/sdk/cargo-test-sbf/Cargo.toml b/sdk/cargo-test-sbf/Cargo.toml
index 8928829dcbd918..d4ca77648884ea 100644
--- a/sdk/cargo-test-sbf/Cargo.toml
+++ b/sdk/cargo-test-sbf/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 cargo_metadata = "0.15.0"
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 
 [[bin]]
 name = "cargo-test-sbf"
diff --git a/stake-accounts/Cargo.toml b/stake-accounts/Cargo.toml
index 4371840c647682..7bfa4b131b83ec 100644
--- a/stake-accounts/Cargo.toml
+++ b/stake-accounts/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-stake-accounts"
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.1.8"
 solana-clap-utils = { path = "../clap-utils", version = "=1.15.0" }
 solana-cli-config = { path = "../cli-config", version = "=1.15.0" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.15.0" }
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index f4a8aa87e84bf6..c415ad85e3bd9a 100644
--- a/sys-tuner/Cargo.toml
+++ b/sys-tuner/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-sys-tuner"
 publish = true
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.1.8"
 libc = "0.2.131"
 log = "0.4.17"
 solana-logger = { path = "../logger", version = "=1.15.0" }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index c3264c5e749be8..c7967e6c5ef42e 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-tokens"
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-clap = "2.33.0"
+clap = "3.1.8"
 console = "0.15.0"
 csv = "1.1.6"
 ctrlc = { version = "3.2.2", features = ["termination"] }
diff --git a/transaction-dos/Cargo.toml b/transaction-dos/Cargo.toml
index ce8f4ee7997c4c..e09b69e723b945 100644
--- a/transaction-dos/Cargo.toml
+++ b/transaction-dos/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 
 [dependencies]
 bincode = "1.3.3"
-clap = "2.33.1"
+clap = "3.1.8"
 log = "0.4.17"
 rand = "0.7.0"
 rayon = "1.5.3"
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
index a5cb0c3ebd2b41..29cff03d1eaf01 100644
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -12,7 +12,7 @@ default-run = "solana-validator"
 
 [dependencies]
 chrono = { version = "0.4.22", features = ["serde"] }
-clap = "2.33.1"
+clap = "3.1.8"
 console = "0.15.0"
 core_affinity = "0.5.10"
 crossbeam-channel = "0.5"
diff --git a/watchtower/Cargo.toml b/watchtower/Cargo.toml
index fa0ef474209651..f17e55ee3f7242 100644
--- a/watchtower/Cargo.toml
+++ b/watchtower/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-watchtower"
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.1.8"
 humantime = "2.0.1"
 log = "0.4.17"
 solana-clap-utils = { path = "../clap-utils", version = "=1.15.0" }