diff --git a/Cargo.lock b/Cargo.lock
index 8e0d13a53004f8..59191513713cbb 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"
@@ -792,21 +783,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"
@@ -819,9 +795,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.12.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-bpf-loader-program",
@@ -4534,7 +4510,7 @@ dependencies = [
 name = "solana-accounts-bench"
 version = "1.12.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rayon",
  "solana-logger 1.12.0",
@@ -4548,7 +4524,7 @@ dependencies = [
 name = "solana-accounts-cluster-bench"
 version = "1.12.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -4605,7 +4581,7 @@ dependencies = [
 name = "solana-banking-bench"
 version = "1.12.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "rand 0.7.3",
@@ -4672,7 +4648,7 @@ dependencies = [
 name = "solana-bench-streamer"
 version = "1.12.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "solana-net-utils",
  "solana-streamer",
@@ -4683,7 +4659,7 @@ dependencies = [
 name = "solana-bench-tps"
 version = "1.12.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "rand 0.7.3",
@@ -4780,7 +4756,7 @@ name = "solana-cargo-build-bpf"
 version = "1.12.0"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
  "solana-sdk 1.12.0",
 ]
 
@@ -4791,7 +4767,7 @@ dependencies = [
  "assert_cmd",
  "bzip2",
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
  "log",
  "predicates",
  "regex",
@@ -4807,7 +4783,7 @@ name = "solana-cargo-test-bpf"
 version = "1.12.0"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
 ]
 
 [[package]]
@@ -4815,7 +4791,7 @@ name = "solana-cargo-test-sbf"
 version = "1.12.0"
 dependencies = [
  "cargo_metadata",
- "clap 3.1.8",
+ "clap",
 ]
 
 [[package]]
@@ -4823,7 +4799,7 @@ name = "solana-clap-utils"
 version = "1.12.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4840,7 +4816,7 @@ name = "solana-clap-v3-utils"
 version = "1.12.0"
 dependencies = [
  "chrono",
- "clap 3.1.8",
+ "clap",
  "rpassword",
  "solana-perf",
  "solana-remote-wallet",
@@ -4858,7 +4834,7 @@ version = "1.12.0"
 dependencies = [
  "bincode",
  "bs58",
- "clap 2.33.3",
+ "clap",
  "console",
  "const_format",
  "criterion-stats",
@@ -4920,7 +4896,7 @@ dependencies = [
  "Inflector",
  "base64 0.13.0",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "ed25519-dalek",
  "humantime",
@@ -4951,7 +4927,7 @@ dependencies = [
  "bincode",
  "bs58",
  "bytes",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "enum_dispatch",
  "futures 0.3.23",
@@ -5115,7 +5091,7 @@ name = "solana-dos"
 version = "1.12.0"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "itertools",
  "log",
@@ -5190,7 +5166,7 @@ version = "1.12.0"
 dependencies = [
  "bincode",
  "byteorder",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "serde",
@@ -5300,7 +5276,7 @@ name = "solana-genesis"
 version = "1.12.0"
 dependencies = [
  "base64 0.13.0",
- "clap 2.33.3",
+ "clap",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -5362,7 +5338,7 @@ version = "1.12.0"
 dependencies = [
  "bincode",
  "bv",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "flate2",
  "indexmap",
@@ -5410,7 +5386,7 @@ dependencies = [
  "bincode",
  "bzip2",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "crossbeam-channel",
  "ctrlc",
@@ -5440,7 +5416,7 @@ name = "solana-keygen"
 version = "1.12.0"
 dependencies = [
  "bs58",
- "clap 3.1.8",
+ "clap",
  "dirs-next",
  "num_cpus",
  "solana-clap-v3-utils",
@@ -5521,7 +5497,7 @@ dependencies = [
  "bs58",
  "bytecount",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "csv",
  "dashmap 4.0.2",
@@ -5585,7 +5561,7 @@ name = "solana-log-analyzer"
 version = "1.12.0"
 dependencies = [
  "byte-unit",
- "clap 3.1.8",
+ "clap",
  "serde",
  "serde_json",
  "solana-logger 1.12.0",
@@ -5624,7 +5600,7 @@ dependencies = [
 name = "solana-merkle-root-bench"
 version = "1.12.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.12.0",
  "solana-measure",
@@ -5662,7 +5638,7 @@ dependencies = [
 name = "solana-net-shaper"
 version = "1.12.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -5674,7 +5650,7 @@ name = "solana-net-utils"
 version = "1.12.0"
 dependencies = [
  "bincode",
- "clap 3.1.8",
+ "clap",
  "crossbeam-channel",
  "log",
  "nix 0.25.0",
@@ -5751,7 +5727,7 @@ dependencies = [
 name = "solana-poh-bench"
 version = "1.12.0"
 dependencies = [
- "clap 3.1.8",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -6225,7 +6201,7 @@ dependencies = [
 name = "solana-stake-accounts"
 version = "1.12.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-client",
@@ -6312,7 +6288,7 @@ dependencies = [
 name = "solana-store-tool"
 version = "1.12.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-logger 1.12.0",
  "solana-runtime",
@@ -6353,7 +6329,7 @@ dependencies = [
 name = "solana-sys-tuner"
 version = "1.12.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "libc",
  "log",
  "nix 0.25.0",
@@ -6394,7 +6370,7 @@ version = "1.12.0"
 dependencies = [
  "bincode",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "csv",
  "ctrlc",
@@ -6424,7 +6400,7 @@ name = "solana-transaction-dos"
 version = "1.12.0"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.7.3",
  "rayon",
@@ -6484,7 +6460,7 @@ name = "solana-validator"
 version = "1.12.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "core_affinity",
  "crossbeam-channel",
@@ -6571,7 +6547,7 @@ dependencies = [
 name = "solana-watchtower"
 version = "1.12.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "humantime",
  "log",
  "solana-clap-utils",
@@ -6777,12 +6753,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"
@@ -7007,15 +6977,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"
@@ -7698,12 +7659,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 76b2dccdae3ce7..950c1fbc01161b 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.12.0" }
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index 59e08b47391967..1cbc201094e7da 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 4bac1636528c6f..ffadbd434953f8 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.12.0" }
 solana-streamer = { path = "../streamer", version = "=1.12.0" }
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index f0c71fcb6efa67..07f5f9c1412f8c 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 dc0b13c0c276c4..5d20494ae4be12 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.12.0" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.12.0", default-features = false }
diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml
index fb0d2952ddd848..58619e59710972 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.12.0" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.12.0", default-features = false }
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index 3a492dc4470657..c311666d92ba3e 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.21", 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 6fdfa258c45b60..868a2297f0b5de 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/client/Cargo.toml b/client/Cargo.toml
index bc2810459e0b20..03c44f183889ea 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.2.1"
-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 edbeea1dae038c..d151ae253fc3ba 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 248149bbda6d60..300a0ce3dbd6e3 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.143"
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index 4eaef127d9dc9a..dbcc4963e22951 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.143"
 serde_json = "1.0.83"
 serde_yaml = "0.8.26"
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index 74e01fcfaefdda..0fdd06d42f4468 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 af4cffd7de52b1..3aaf5fdcff9c19 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.21", 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 0328df2d83c0b8..830cd448c598c9 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.12.0" }
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 6c978a2e548750..83764d40717ac1 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.21"
-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 e6033a45354c1f..8f6bec2c9bf9b6 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.143"
 serde_json = "1.0.83"
 solana-logger = { path = "../logger", version = "=1.12.0" }
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index 3d0e68119b68a2..c4b856a98c6a0d 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.12.0" }
 solana-measure = { path = "../measure", version = "=1.12.0" }
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index b41c716a8ba859..b39033be71913a 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.143", features = ["derive"] }
 serde_json = "1.0.83"
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index a26760134ef7e0..d32ac5101107b2 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 bb7d50e30cad68..5adc3a0f263305 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 16cf97e9b536b8..d5d0fbf11c35cf 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.143"
 serde_json = "1.0.83"
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.12.0" }
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index 1dfd5512073c8b..4bcc072fa4b7c9 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.12.0" }
 solana-runtime = { path = "..", version = "=1.12.0" }
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index e9a611b62696ff..15e70d2f6f71c6 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.12.0" }
 
 [features]
diff --git a/sdk/cargo-build-sbf/Cargo.toml b/sdk/cargo-build-sbf/Cargo.toml
index 9cbdfc508b0617..762a2c84b80a46 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.12.0" }
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index 219a4be52a6fff..ddb8449522ca99 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 fc92994367f993..635aecddd056b7 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 b27771d2f54ebb..2bb3af309161cc 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.12.0" }
 solana-cli-config = { path = "../cli-config", version = "=1.12.0" }
 solana-client = { path = "../client", version = "=1.12.0" }
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index f1cc3c97e26b08..a4958195b7dfbb 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.12.0" }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 98f35f35664afa..ffcb23b91593a5 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 d5d5d6ac0163da..01bf53fb1d3e48 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 3d1b79478d7394..3ab8e2c1a124b3 100644
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -12,7 +12,7 @@ default-run = "solana-validator"
 
 [dependencies]
 chrono = { version = "0.4.21", 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 ffe2b050ec6c91..8ffb99c3ed6e04 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.12.0" }