diff --git a/Cargo.lock b/Cargo.lock
index c6ac2a1e01c24c..83ddb7f2a99158 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.58"
@@ -784,21 +775,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"
@@ -811,9 +787,9 @@ dependencies = [
  "indexmap",
  "lazy_static",
  "os_str_bytes",
- "strsim 0.10.0",
+ "strsim",
  "termcolor",
- "textwrap 0.15.0",
+ "textwrap",
 ]
 
 [[package]]
@@ -3785,7 +3761,7 @@ dependencies = [
 name = "rbpf-cli"
 version = "1.11.4"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-bpf-loader-program",
@@ -4526,7 +4502,7 @@ dependencies = [
 name = "solana-accounts-bench"
 version = "1.11.4"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rayon",
  "solana-logger 1.11.4",
@@ -4540,7 +4516,7 @@ dependencies = [
 name = "solana-accounts-cluster-bench"
 version = "1.11.4"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -4597,7 +4573,7 @@ dependencies = [
 name = "solana-banking-bench"
 version = "1.11.4"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "rand 0.7.3",
@@ -4664,7 +4640,7 @@ dependencies = [
 name = "solana-bench-streamer"
 version = "1.11.4"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "solana-net-utils",
  "solana-streamer",
@@ -4675,7 +4651,7 @@ dependencies = [
 name = "solana-bench-tps"
 version = "1.11.4"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "rayon",
@@ -4771,7 +4747,7 @@ name = "solana-cargo-build-bpf"
 version = "1.11.4"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
  "solana-sdk 1.11.4",
 ]
 
@@ -4781,7 +4757,7 @@ version = "1.11.4"
 dependencies = [
  "bzip2",
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
  "log",
  "regex",
  "serial_test",
@@ -4796,7 +4772,7 @@ name = "solana-cargo-test-bpf"
 version = "1.11.4"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
 ]
 
 [[package]]
@@ -4804,7 +4780,7 @@ name = "solana-cargo-test-sbf"
 version = "1.11.4"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
 ]
 
 [[package]]
@@ -4812,7 +4788,7 @@ name = "solana-clap-utils"
 version = "1.11.4"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4829,7 +4805,7 @@ name = "solana-clap-v3-utils"
 version = "1.11.4"
 dependencies = [
  "chrono",
- "clap 3.1.8",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4847,7 +4823,7 @@ version = "1.11.4"
 dependencies = [
  "bincode",
  "bs58",
- "clap 2.33.3",
+ "clap",
  "console",
  "const_format",
  "criterion-stats",
@@ -4908,7 +4884,7 @@ dependencies = [
  "Inflector",
  "base64 0.13.0",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "ed25519-dalek",
  "humantime",
@@ -4939,7 +4915,7 @@ dependencies = [
  "bincode",
  "bs58",
  "bytes",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "enum_dispatch",
  "futures 0.3.21",
@@ -5103,7 +5079,7 @@ name = "solana-dos"
 version = "1.11.4"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "itertools",
  "log",
  "rand 0.7.3",
@@ -5176,7 +5152,7 @@ version = "1.11.4"
 dependencies = [
  "bincode",
  "byteorder",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "serde",
@@ -5274,7 +5250,7 @@ name = "solana-genesis"
 version = "1.11.4"
 dependencies = [
  "base64 0.13.0",
- "clap 2.33.3",
+ "clap",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -5336,7 +5312,7 @@ version = "1.11.4"
 dependencies = [
  "bincode",
  "bv",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "flate2",
  "indexmap",
@@ -5384,7 +5360,7 @@ dependencies = [
  "bincode",
  "bzip2",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "crossbeam-channel",
  "ctrlc",
@@ -5414,7 +5390,7 @@ name = "solana-keygen"
 version = "1.11.4"
 dependencies = [
  "bs58",
- "clap 3.1.8",
+ "clap",
  "dirs-next",
  "num_cpus",
  "solana-clap-v3-utils",
@@ -5492,7 +5468,7 @@ dependencies = [
  "bs58",
  "bytecount",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "csv",
  "dashmap",
@@ -5555,7 +5531,7 @@ name = "solana-log-analyzer"
 version = "1.11.4"
 dependencies = [
  "byte-unit",
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-logger 1.11.4",
@@ -5594,7 +5570,7 @@ dependencies = [
 name = "solana-merkle-root-bench"
 version = "1.11.4"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.11.4",
  "solana-measure",
@@ -5632,7 +5608,7 @@ dependencies = [
 name = "solana-net-shaper"
 version = "1.11.4"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -5644,7 +5620,7 @@ name = "solana-net-utils"
 version = "1.11.4"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "nix",
@@ -5721,7 +5697,7 @@ dependencies = [
 name = "solana-poh-bench"
 version = "1.11.4"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -6187,7 +6163,7 @@ dependencies = [
 name = "solana-stake-accounts"
 version = "1.11.4"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-client",
@@ -6273,7 +6249,7 @@ dependencies = [
 name = "solana-store-tool"
 version = "1.11.4"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.11.4",
  "solana-runtime",
@@ -6312,7 +6288,7 @@ dependencies = [
 name = "solana-sys-tuner"
 version = "1.11.4"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "libc",
  "log",
  "nix",
@@ -6353,7 +6329,7 @@ version = "1.11.4"
 dependencies = [
  "bincode",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "csv",
  "ctrlc",
@@ -6383,7 +6359,7 @@ name = "solana-transaction-dos"
 version = "1.11.4"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -6444,7 +6420,7 @@ name = "solana-validator"
 version = "1.11.4"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "core_affinity",
  "crossbeam-channel",
@@ -6528,7 +6504,7 @@ dependencies = [
 name = "solana-watchtower"
 version = "1.11.4"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "humantime",
  "log",
  "solana-clap-utils",
@@ -6728,12 +6704,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"
@@ -6964,15 +6934,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"
@@ -7649,12 +7610,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 32d993d03be952..1754f5039a126f 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.4" }
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index df76f5b313debc..ca590fc8a265d7 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 39e7623bf64603..d7c6b8f16fc64f 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.4" }
 solana-streamer = { path = "../streamer", version = "=1.11.4" }
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index 4c492d7323beaa..ad22f615ef0fd2 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 da849e4966e109..e861ba74f9e8cb 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.4" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.4", default-features = false }
diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml
index 64831ac528a40f..f591f2df367dbf 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.4" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.4", default-features = false }
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index e428fd0325b991..788f58cddcd7b8 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 175cde9683a04e..b1f1d9313957e5 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 f7415208fa34e8..68d2d4b22973bc 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 b32c70b750cdc7..7f616226d9d1aa 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 55653aaa3d5148..3ab31c72d8d9c5 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 ca6e9c08794812..87bea3ac4aed86 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 904c0b5b2ae2d9..5b6a52a5749674 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 7d974bb174610d..59ddc1bbbb59fa 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 f5d0d40a0535a8..dd03edff406fe4 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.4" }
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index bd4063d881e8a9..b573f4e322d280 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 bbbfc2c5a3921b..65225a83f21b67 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.4" }
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index 57063abc93b3ee..e821049e47c82e 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.4" }
 solana-measure = { path = "../measure", version = "=1.11.4" }
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 848f68f06542db..9a25b1e63a6d05 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 06962cf398ef29..d42281e42923de 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.2"
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index 8ace8bd0824a46..ad3c466cdf0a41 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 658e00314e1ba2..25b5e22399a3eb 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.4" }
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index 6d91a0695ae5b9..4f761dd4096961 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.4" }
 solana-runtime = { path = "..", version = "=1.11.4" }
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index 4e962f74d7921b..8a283109a43fec 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.4" }
 
 [features]
diff --git a/sdk/cargo-build-sbf/Cargo.toml b/sdk/cargo-build-sbf/Cargo.toml
index f8eacf31a4fb18..3ec97303d3134e 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.4" }
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index b9836026127826..75e96bb5fb6b5f 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 d57fad56d8159d..621cc8763933d5 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 d786300297346d..c72d8a7395bd4b 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.4" }
 solana-cli-config = { path = "../cli-config", version = "=1.11.4" }
 solana-client = { path = "../client", version = "=1.11.4" }
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index 7fd38cbd87768b..3f1535a3c313ea 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.4" }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 4f64862d26abd9..aed7dcae9aa1b9 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 e8072050e89123..c4688c27002815 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 52d14194c91c8e..2d46d277d0eef2 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 1380746e29ccb1..eaafe6fc2fa189 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.4" }