diff --git a/Cargo.lock b/Cargo.lock
index bb1a467bcba6fe..1248e6cc09ea3a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -95,15 +95,6 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
-[[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"
@@ -745,21 +736,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"
@@ -772,9 +748,9 @@ dependencies = [
  "indexmap",
  "lazy_static",
  "os_str_bytes",
- "strsim 0.10.0",
+ "strsim",
  "termcolor",
- "textwrap 0.15.0",
+ "textwrap",
 ]
 
 [[package]]
@@ -3701,7 +3677,7 @@ dependencies = [
 name = "rbpf-cli"
 version = "1.11.2"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-bpf-loader-program",
@@ -4431,7 +4407,7 @@ dependencies = [
 name = "solana-accounts-bench"
 version = "1.11.2"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rayon",
  "solana-logger 1.11.2",
@@ -4445,7 +4421,7 @@ dependencies = [
 name = "solana-accounts-cluster-bench"
 version = "1.11.2"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -4502,7 +4478,7 @@ dependencies = [
 name = "solana-banking-bench"
 version = "1.11.2"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "rand 0.7.3",
@@ -4569,7 +4545,7 @@ dependencies = [
 name = "solana-bench-streamer"
 version = "1.11.2"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "solana-net-utils",
  "solana-streamer",
@@ -4580,7 +4556,7 @@ dependencies = [
 name = "solana-bench-tps"
 version = "1.11.2"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "rayon",
@@ -4665,7 +4641,7 @@ name = "solana-cargo-build-bpf"
 version = "1.11.2"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
  "solana-sdk 1.11.2",
 ]
 
@@ -4675,7 +4651,7 @@ version = "1.11.2"
 dependencies = [
  "bzip2",
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
  "log",
  "regex",
  "serial_test",
@@ -4690,7 +4666,7 @@ name = "solana-cargo-test-bpf"
 version = "1.11.2"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
 ]
 
 [[package]]
@@ -4698,7 +4674,7 @@ name = "solana-cargo-test-sbf"
 version = "1.11.2"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
 ]
 
 [[package]]
@@ -4706,7 +4682,7 @@ name = "solana-clap-utils"
 version = "1.11.2"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4723,7 +4699,7 @@ name = "solana-clap-v3-utils"
 version = "1.11.2"
 dependencies = [
  "chrono",
- "clap 3.1.8",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4741,7 +4717,7 @@ version = "1.11.2"
 dependencies = [
  "bincode",
  "bs58",
- "clap 2.33.3",
+ "clap",
  "console",
  "const_format",
  "criterion-stats",
@@ -4802,7 +4778,7 @@ dependencies = [
  "Inflector",
  "base64 0.13.0",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "ed25519-dalek",
  "humantime",
@@ -4833,7 +4809,7 @@ dependencies = [
  "bincode",
  "bs58",
  "bytes",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "enum_dispatch",
  "futures 0.3.21",
@@ -4997,7 +4973,7 @@ name = "solana-dos"
 version = "1.11.2"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "itertools",
  "log",
  "rand 0.7.3",
@@ -5070,7 +5046,7 @@ version = "1.11.2"
 dependencies = [
  "bincode",
  "byteorder",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "serde",
@@ -5157,7 +5133,7 @@ name = "solana-genesis"
 version = "1.11.2"
 dependencies = [
  "base64 0.13.0",
- "clap 2.33.3",
+ "clap",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -5219,7 +5195,7 @@ version = "1.11.2"
 dependencies = [
  "bincode",
  "bv",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "flate2",
  "indexmap",
@@ -5267,7 +5243,7 @@ dependencies = [
  "bincode",
  "bzip2",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "crossbeam-channel",
  "ctrlc",
@@ -5297,7 +5273,7 @@ name = "solana-keygen"
 version = "1.11.2"
 dependencies = [
  "bs58",
- "clap 3.1.8",
+ "clap",
  "dirs-next",
  "num_cpus",
  "solana-clap-v3-utils",
@@ -5375,7 +5351,7 @@ dependencies = [
  "bs58",
  "bytecount",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "csv",
  "dashmap",
@@ -5438,7 +5414,7 @@ name = "solana-log-analyzer"
 version = "1.11.2"
 dependencies = [
  "byte-unit",
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-logger 1.11.2",
@@ -5477,7 +5453,7 @@ dependencies = [
 name = "solana-merkle-root-bench"
 version = "1.11.2"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.11.2",
  "solana-measure",
@@ -5515,7 +5491,7 @@ dependencies = [
 name = "solana-net-shaper"
 version = "1.11.2"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -5527,7 +5503,7 @@ name = "solana-net-utils"
 version = "1.11.2"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "nix",
@@ -5604,7 +5580,7 @@ dependencies = [
 name = "solana-poh-bench"
 version = "1.11.2"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -6065,7 +6041,7 @@ dependencies = [
 name = "solana-stake-accounts"
 version = "1.11.2"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-client",
@@ -6151,7 +6127,7 @@ dependencies = [
 name = "solana-store-tool"
 version = "1.11.2"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.11.2",
  "solana-runtime",
@@ -6189,7 +6165,7 @@ dependencies = [
 name = "solana-sys-tuner"
 version = "1.11.2"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "libc",
  "log",
  "nix",
@@ -6230,7 +6206,7 @@ version = "1.11.2"
 dependencies = [
  "bincode",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "csv",
  "ctrlc",
@@ -6260,7 +6236,7 @@ name = "solana-transaction-dos"
 version = "1.11.2"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -6321,7 +6297,7 @@ name = "solana-validator"
 version = "1.11.2"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "core_affinity",
  "crossbeam-channel",
@@ -6405,7 +6381,7 @@ dependencies = [
 name = "solana-watchtower"
 version = "1.11.2"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "humantime",
  "log",
  "solana-clap-utils",
@@ -6605,12 +6581,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"
@@ -6841,15 +6811,6 @@ dependencies = [
  "syn 1.0.93",
 ]
 
-[[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"
@@ -7518,12 +7479,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 05cddc8938940b..9d828142ea3e3f 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.11.2" }
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index c11f1a47a91431..0ec19f2b8ef201 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 f1e4c8a5c3cadd..4fb6ce339c9d5a 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.11.2" }
 solana-streamer = { path = "../streamer", version = "=1.11.2" }
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index a4e4e7c0d42456..faa4651be09b8c 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"
 rayon = "1.5.3"
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index c120e8cc25339f..82121285bd49b8 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.2" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.2", default-features = false }
diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml
index 8585efb47789b4..3bd2fa44ca0241 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.2" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.2", default-features = false }
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index 667fec840cd73a..6ee5f476e06211 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 e8978e3f74f7a5..aa04cab66eaf0f 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.25"
 criterion-stats = "0.3.0"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 1ad9bbfa1c62d6..3b3f169dfbc07b 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"
 enum_dispatch = "0.3.8"
 futures = "0.3"
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index 8db04713aa633f..ed11c7efe09d6b 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"] }
 itertools = "0.10.3"
 log = "0.4.17"
 rand = "0.7.0"
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 32974f83ac9061..23736c9fd6484e 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.138"
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index a1427fc5d28b03..2d49ac8c0f6f07 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.138"
 serde_json = "1.0.81"
 serde_yaml = "0.8.24"
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index f72abef55499a1..7100787e98d697 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 b59eeee734eeeb..4ad5a72aa534b0 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 643a780699e569..bd67a6359640d4 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.2" }
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 3147087b6946cd..c7e1ccb35b8ae1 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.11"
-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 b01c9f90dfa8c4..ca67a888b9fb55 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.138"
 serde_json = "1.0.81"
 solana-logger = { path = "../logger", version = "=1.11.2" }
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index 6d53510f2230bd..7ed5f027a83fd3 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.11.2" }
 solana-measure = { path = "../measure", version = "=1.11.2" }
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index d9cbb8b2b95f22..7df679c5d9dcfd 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.138", features = ["derive"] }
 serde_json = "1.0.81"
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index e3035812986cdf..bb9604f800e3ed 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.24.0"
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index 26cd7bd0da930f..8adc00ae55df25 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 4cfca09317f871..92222b32af9ba5 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.138"
 serde_json = "1.0.81"
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.11.2" }
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index 212b64b586cbc1..07bc2b0926ad94 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.11.2" }
 solana-runtime = { path = "..", version = "=1.11.2" }
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index 3428ba3b86c93f..88ec237f27a77f 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.14.2"
-clap = { version = "3.1.5", features = ["cargo", "env"] }
+clap = { version = "3.1.8", features = ["cargo", "env"] }
 solana-sdk = { path = "..", version = "=1.11.2" }
 
 [features]
diff --git a/sdk/cargo-build-sbf/Cargo.toml b/sdk/cargo-build-sbf/Cargo.toml
index 70c03302df4857..ba4966a9720c44 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.14.2"
-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.11.2" }
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index 4f6a587c9e7e46..39f4c2d75d65ca 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/sdk/cargo-test-sbf/Cargo.toml b/sdk/cargo-test-sbf/Cargo.toml
index 6a8c301dc17b76..f822be8506bacc 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.14.2"
-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 4327ed4f41eedc..08ea3d88f2429d 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.2" }
 solana-cli-config = { path = "../cli-config", version = "=1.11.2" }
 solana-client = { path = "../client", version = "=1.11.2" }
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index b67c1623fdac61..a252b795455124 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.126"
 log = "0.4.17"
 solana-logger = { path = "../logger", version = "=1.11.2" }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 5173c9bb2aa4a9..7a5a089d11b6a0 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 501730b3f04800..a8ab67b548aa46 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 da99a5fc8f7399..31e13300e85b8a 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 07a5ff13cb896a..56d54ff1d29c57 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.11.2" }