diff --git a/Cargo.lock b/Cargo.lock
index 1f475ec09eaae6..7ab3ea0fc0cf40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -80,15 +80,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
 
-[[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.57"
@@ -695,21 +686,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"
@@ -722,9 +698,9 @@ dependencies = [
  "indexmap",
  "lazy_static",
  "os_str_bytes",
- "strsim 0.10.0",
+ "strsim",
  "termcolor",
- "textwrap 0.15.0",
+ "textwrap",
 ]
 
 [[package]]
@@ -3425,7 +3401,7 @@ dependencies = [
 name = "rbpf-cli"
 version = "1.11.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-bpf-loader-program",
@@ -4135,7 +4111,7 @@ dependencies = [
 name = "solana-accounts-bench"
 version = "1.11.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rayon",
  "solana-logger 1.11.0",
@@ -4149,7 +4125,7 @@ dependencies = [
 name = "solana-accounts-cluster-bench"
 version = "1.11.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -4206,7 +4182,7 @@ dependencies = [
 name = "solana-banking-bench"
 version = "1.11.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "rand 0.7.3",
@@ -4271,7 +4247,7 @@ dependencies = [
 name = "solana-bench-streamer"
 version = "1.11.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "solana-net-utils",
  "solana-streamer",
@@ -4282,7 +4258,7 @@ dependencies = [
 name = "solana-bench-tps"
 version = "1.11.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "rayon",
@@ -4368,7 +4344,7 @@ version = "1.11.0"
 dependencies = [
  "bzip2",
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
  "regex",
  "serial_test",
  "solana-download-utils",
@@ -4381,7 +4357,7 @@ name = "solana-cargo-test-bpf"
 version = "1.11.0"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
 ]
 
 [[package]]
@@ -4389,7 +4365,7 @@ name = "solana-clap-utils"
 version = "1.11.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4406,7 +4382,7 @@ name = "solana-clap-v3-utils"
 version = "1.11.0"
 dependencies = [
  "chrono",
- "clap 3.1.8",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4424,7 +4400,7 @@ version = "1.11.0"
 dependencies = [
  "bincode",
  "bs58",
- "clap 2.33.3",
+ "clap",
  "console",
  "const_format",
  "criterion-stats",
@@ -4485,7 +4461,7 @@ dependencies = [
  "Inflector",
  "base64 0.13.0",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "ed25519-dalek",
  "humantime",
@@ -4516,7 +4492,7 @@ dependencies = [
  "bincode",
  "bs58",
  "bytes",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "futures 0.3.21",
  "futures-util",
@@ -4676,7 +4652,7 @@ name = "solana-dos"
 version = "1.11.0"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "log",
  "rand 0.7.3",
  "serde",
@@ -4743,7 +4719,7 @@ version = "1.11.0"
 dependencies = [
  "bincode",
  "byteorder",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "serde",
@@ -4829,7 +4805,7 @@ name = "solana-genesis"
 version = "1.11.0"
 dependencies = [
  "base64 0.13.0",
- "clap 2.33.3",
+ "clap",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -4891,7 +4867,7 @@ version = "1.11.0"
 dependencies = [
  "bincode",
  "bv",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "flate2",
  "indexmap",
@@ -4938,7 +4914,7 @@ dependencies = [
  "bincode",
  "bzip2",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "crossbeam-channel",
  "ctrlc",
@@ -4968,7 +4944,7 @@ name = "solana-keygen"
 version = "1.11.0"
 dependencies = [
  "bs58",
- "clap 3.1.8",
+ "clap",
  "dirs-next",
  "num_cpus",
  "solana-clap-v3-utils",
@@ -5042,7 +5018,7 @@ dependencies = [
  "assert_cmd",
  "bs58",
  "bytecount",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "csv",
  "dashmap",
@@ -5105,7 +5081,7 @@ name = "solana-log-analyzer"
 version = "1.11.0"
 dependencies = [
  "byte-unit",
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-logger 1.11.0",
@@ -5144,7 +5120,7 @@ dependencies = [
 name = "solana-merkle-root-bench"
 version = "1.11.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.11.0",
  "solana-measure",
@@ -5182,7 +5158,7 @@ dependencies = [
 name = "solana-net-shaper"
 version = "1.11.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -5194,7 +5170,7 @@ name = "solana-net-utils"
 version = "1.11.0"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "nix",
@@ -5271,7 +5247,7 @@ dependencies = [
 name = "solana-poh-bench"
 version = "1.11.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -5725,7 +5701,7 @@ dependencies = [
 name = "solana-stake-accounts"
 version = "1.11.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-client",
@@ -5803,7 +5779,7 @@ dependencies = [
 name = "solana-store-tool"
 version = "1.11.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.11.0",
  "solana-runtime",
@@ -5839,7 +5815,7 @@ dependencies = [
 name = "solana-sys-tuner"
 version = "1.11.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "libc",
  "log",
  "nix",
@@ -5880,7 +5856,7 @@ version = "1.11.0"
 dependencies = [
  "bincode",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "csv",
  "ctrlc",
@@ -5910,7 +5886,7 @@ name = "solana-transaction-dos"
 version = "1.11.0"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -5971,7 +5947,7 @@ name = "solana-validator"
 version = "1.11.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "core_affinity",
  "crossbeam-channel",
@@ -6054,7 +6030,7 @@ dependencies = [
 name = "solana-watchtower"
 version = "1.11.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "humantime",
  "log",
  "solana-clap-utils",
@@ -6254,12 +6230,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"
@@ -6446,15 +6416,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
 
-[[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"
@@ -7062,12 +7023,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 8a61e7440efdda..69d95340f434a8 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.14"
 rayon = "1.5.2"
 solana-logger = { path = "../logger", version = "=1.11.0" }
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index a307c22859d570..90e582a1f58cb7 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.14"
 rand = "0.7.0"
 rayon = "1.5.2"
diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
index 157d329c999176..f0cb01a7f2cd2b 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 
 [dependencies]
 crossbeam-channel = "0.5"
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
 solana-streamer = { path = "../streamer", version = "=1.11.0" }
 solana-version = { path = "../version", version = "=1.11.0" }
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index 2d1afc62b2ed7b..d1c4222dbadedb 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.14"
 rayon = "1.5.2"
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index 3fa5cd1df396d3..7b123812dd645b 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 = "6.0"
 solana-perf = { path = "../perf", version = "=1.11.0" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.0", default-features = false }
diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml
index aa56c160695503..463e9ece4f7273 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 = "6.0"
 solana-perf = { path = "../perf", version = "=1.11.0" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.0", default-features = false }
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index bd22f6df77b969..a9474020d54429 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.11", features = ["serde"] }
-clap = "2.33.0"
+clap = "3.1.8"
 console = "0.15.0"
 humantime = "2.0.1"
 indicatif = "0.16.2"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index a79aae0c859b1b..491089a216a51c 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.22"
 criterion-stats = "0.3.0"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index e137b9ab6a1dd3..1a1af6285aa133 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -16,7 +16,7 @@ base64 = "0.13.0"
 bincode = "1.3.3"
 bs58 = "0.4.0"
 bytes = "1.1.0"
-clap = "2.33.0"
+clap = "3.1.8"
 crossbeam-channel = "0.5"
 futures = "0.3"
 futures-util = "0.3.21"
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index 79d20d523ef0e4..92d4cedd9226a5 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"]}
 log = "0.4.14"
 rand = "0.7.0"
 serde = "1.0.136"
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 3225b7c0773051..12bfe6fd4c7cae 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.14"
 serde = "1.0.136"
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index 5b1e327775eb4a..a31e66e1311f2f 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.136"
 serde_json = "1.0.79"
 serde_yaml = "0.8.23"
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index b0962777310271..150f030100f6c0 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.8", features = ["rayon"] }
diff --git a/install/Cargo.toml b/install/Cargo.toml
index de3bc771cecf54..389d7bddabefe4 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.11", 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 20ca5d0b872e3a..cc2cb567604dde 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.11.0" }
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 79cfc86ae51f89..2e9e957b1a267d 100644
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-ledger-tool"
 
 [dependencies]
 bs58 = "0.4.0"
-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 28023d50af325c..9ae979f833d116 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.136"
 serde_json = "1.0.79"
 solana-logger = { path = "../logger", version = "=1.11.0" }
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index cdf2ed3bedaa40..23baa4d2c4af67 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.14"
 solana-logger = { path = "../logger", version = "=1.11.0" }
 solana-measure = { path = "../measure", version = "=1.11.0" }
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 5fd57040c09bc5..8b21f6314a4b28 100644
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 rand = "0.7.0"
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"
 solana-logger = { path = "../logger", version = "=1.11.0" }
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index d4964b000a5d29..af773298a55376 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.14"
 nix = "0.24.0"
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index 12224793d5a307..6fdf09bc68be5d 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.14"
 rand = "0.7.0"
 rayon = "1.5.2"
diff --git a/rbpf-cli/Cargo.toml b/rbpf-cli/Cargo.toml
index 0d5f6bb14d44bd..83c718ff3232ff 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.136"
 serde_json = "1.0.79"
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.11.0" }
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index 766faf22340fa1..9c369bfd67f84f 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.14" }
 solana-logger = { path = "../../logger", version = "=1.11.0" }
 solana-runtime = { path = "..", version = "=1.11.0" }
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index 888b59a1010c5c..58a5ef8eb52d0c 100644
--- a/sdk/cargo-build-bpf/Cargo.toml
+++ b/sdk/cargo-build-bpf/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 [dependencies]
 bzip2 = "0.4.3"
 cargo_metadata = "0.14.2"
-clap = { version = "3.1.5", features = ["cargo", "env"] }
+clap = { version = "3.1.8", features = ["cargo", "env"] }
 regex = "1.5.4"
 solana-download-utils = { path = "../../download-utils", version = "=1.11.0" }
 solana-sdk = { path = "..", version = "=1.11.0" }
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index 37066ce7eed07e..045ca4954c5e96 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.14.2"
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "3.1.8", features = ["cargo"] }
 
 [[bin]]
 name = "cargo-test-bpf"
diff --git a/stake-accounts/Cargo.toml b/stake-accounts/Cargo.toml
index 2b59f19bcbb7e1..1c3116b6b8c4de 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.11.0" }
 solana-cli-config = { path = "../cli-config", version = "=1.11.0" }
 solana-client = { path = "../client", version = "=1.11.0" }
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index 45b6cbe1715514..ed7c50c892e3a9 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.124"
 log = "0.4.14"
 solana-logger = { path = "../logger", version = "=1.11.0" }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index d27a38823a2cea..e90e0c88c43b4c 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 6c563491732138..31ba5487453c9d 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.14"
 rand = "0.7.0"
 rayon = "1.5.2"
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
index 0e966662afdc88..dfbda07ccfabe2 100644
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -12,7 +12,7 @@ default-run = "solana-validator"
 
 [dependencies]
 chrono = { version = "0.4.11", 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 d3acf66dd5a66f..86c0b1cf1539b0 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.14"
 solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }