diff --git a/Cargo.lock b/Cargo.lock
index 4fe44d24fc57dd..c251fc88c386c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -59,15 +59,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.38"
@@ -683,49 +674,17 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "3.0.0-rc.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "9d358d5dcd274692e60df775bd452f66341a49ab90cc6cc1084c4350a3f914d9"
 dependencies = [
- "ansi_term",
  "atty",
  "bitflags",
- "strsim 0.8.0",
- "textwrap 0.11.0",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "clap"
-version = "3.0.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
-dependencies = [
- "atty",
- "bitflags",
- "clap_derive",
  "indexmap",
- "lazy_static",
  "os_str_bytes",
- "strsim 0.10.0",
+ "strsim",
  "termcolor",
- "textwrap 0.12.1",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.0.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2 1.0.24",
- "quote 1.0.9",
- "syn 1.0.67",
+ "textwrap",
 ]
 
 [[package]]
@@ -2780,9 +2739,12 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "2.4.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "ouroboros"
@@ -3497,7 +3459,7 @@ dependencies = [
 name = "rbpf-cli"
 version = "1.8.0"
 dependencies = [
- "clap 3.0.0-beta.2",
+ "clap",
  "serde",
  "serde_json",
  "solana-bpf-loader-program",
@@ -4138,7 +4100,7 @@ dependencies = [
 name = "solana-accounts-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rayon",
  "solana-logger 1.8.0",
@@ -4152,7 +4114,7 @@ dependencies = [
 name = "solana-accounts-cluster-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rand 0.7.3",
  "rayon",
@@ -4178,7 +4140,7 @@ dependencies = [
 name = "solana-banking-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log 0.4.14",
  "rand 0.7.3",
@@ -4241,7 +4203,7 @@ dependencies = [
 name = "solana-bench-streamer"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-logger 1.8.0",
  "solana-net-utils",
@@ -4253,7 +4215,7 @@ dependencies = [
 name = "solana-bench-tps"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rayon",
  "serde_json",
@@ -4299,7 +4261,7 @@ version = "1.8.0"
 dependencies = [
  "bzip2",
  "cargo_metadata",
- "clap 2.33.3",
+ "clap",
  "regex",
  "serial_test",
  "solana-download-utils",
@@ -4312,7 +4274,7 @@ name = "solana-cargo-test-bpf"
 version = "1.8.0"
 dependencies = [
  "cargo_metadata",
- "clap 2.33.3",
+ "clap",
 ]
 
 [[package]]
@@ -4320,7 +4282,7 @@ name = "solana-clap-utils"
 version = "1.8.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "rpassword",
  "solana-remote-wallet",
  "solana-sdk",
@@ -4337,7 +4299,7 @@ version = "1.8.0"
 dependencies = [
  "bincode",
  "bs58 0.4.0",
- "clap 2.33.3",
+ "clap",
  "console",
  "const_format",
  "criterion-stats",
@@ -4392,7 +4354,7 @@ dependencies = [
  "Inflector",
  "base64 0.13.0",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "humantime",
  "indicatif",
@@ -4415,7 +4377,7 @@ dependencies = [
  "base64 0.13.0",
  "bincode",
  "bs58 0.4.0",
- "clap 2.33.3",
+ "clap",
  "indicatif",
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -4551,7 +4513,7 @@ name = "solana-dos"
 version = "1.8.0"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rand 0.7.3",
  "solana-client",
@@ -4620,7 +4582,7 @@ version = "1.8.0"
 dependencies = [
  "bincode",
  "byteorder",
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "serde",
  "serde_derive",
@@ -4700,7 +4662,7 @@ name = "solana-genesis"
 version = "1.8.0"
 dependencies = [
  "base64 0.12.3",
- "clap 2.33.3",
+ "clap",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -4732,7 +4694,7 @@ version = "1.8.0"
 dependencies = [
  "bincode",
  "bv",
- "clap 2.33.3",
+ "clap",
  "flate2",
  "indexmap",
  "itertools 0.10.1",
@@ -4777,7 +4739,7 @@ dependencies = [
  "bincode",
  "bzip2",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "ctrlc",
  "dirs-next",
@@ -4806,7 +4768,7 @@ name = "solana-keygen"
 version = "1.8.0"
 dependencies = [
  "bs58 0.4.0",
- "clap 2.33.3",
+ "clap",
  "dirs-next",
  "num_cpus",
  "solana-clap-utils",
@@ -4875,7 +4837,7 @@ dependencies = [
  "assert_cmd",
  "bs58 0.4.0",
  "bytecount",
- "clap 2.33.3",
+ "clap",
  "csv",
  "histogram",
  "itertools 0.10.1",
@@ -4935,7 +4897,7 @@ name = "solana-log-analyzer"
 version = "1.8.0"
 dependencies = [
  "byte-unit",
- "clap 2.33.3",
+ "clap",
  "serde",
  "serde_json",
  "solana-logger 1.8.0",
@@ -4974,7 +4936,7 @@ dependencies = [
 name = "solana-merkle-root-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "solana-logger 1.8.0",
  "solana-measure",
@@ -5011,7 +4973,7 @@ dependencies = [
 name = "solana-net-shaper"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -5024,7 +4986,7 @@ name = "solana-net-utils"
 version = "1.8.0"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "nix",
  "rand 0.7.3",
@@ -5114,7 +5076,7 @@ dependencies = [
 name = "solana-poh-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rand 0.7.3",
  "rayon",
@@ -5285,7 +5247,7 @@ dependencies = [
 name = "solana-replica-node"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log 0.4.14",
  "rand 0.7.3",
@@ -5515,7 +5477,7 @@ dependencies = [
 name = "solana-stake-accounts"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-client",
@@ -5589,7 +5551,7 @@ dependencies = [
 name = "solana-store-tool"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "solana-logger 1.8.0",
  "solana-runtime",
@@ -5615,7 +5577,7 @@ dependencies = [
 name = "solana-sys-tuner"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "libc",
  "log 0.4.14",
  "nix",
@@ -5632,7 +5594,7 @@ version = "1.8.0"
 dependencies = [
  "bincode",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "csv",
  "ctrlc",
@@ -5692,7 +5654,7 @@ name = "solana-validator"
 version = "1.8.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "core_affinity",
  "fd-lock",
@@ -5768,7 +5730,7 @@ dependencies = [
 name = "solana-watchtower"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "humantime",
  "log 0.4.14",
  "solana-clap-utils",
@@ -5910,12 +5872,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
-[[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"
@@ -6089,21 +6045,9 @@ dependencies = [
 
 [[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.12.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
-dependencies = [
- "unicode-width",
-]
+checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
 
 [[package]]
 name = "thiserror"
@@ -6786,12 +6730,6 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 
-[[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.1.5"
diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml
index d7dc82cb43a09e..6dc0436583664f 100644
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -16,7 +16,7 @@ solana-runtime = { path = "../runtime", version = "=1.8.0" }
 solana-measure = { path = "../measure", version = "=1.8.0" }
 solana-sdk = { path = "../sdk", version = "=1.8.0" }
 solana-version = { path = "../version", version = "=1.8.0" }
-clap = "2.33.1"
+clap = "3.0.0-rc"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index 06f4ea12540afb..58ce7f59858fdf 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.0.0-rc"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml
index 034944e6d140e0..55d6b10ac31aa5 100644
--- a/banking-bench/Cargo.toml
+++ b/banking-bench/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-rc"
 crossbeam-channel = "0.5"
 log = "0.4.14"
 rand = "0.7.0"
diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
index 9f55c8262ebb56..8fc7b34a132625 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-rc"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
 solana-streamer = { path = "../streamer", version = "=1.8.0" }
 solana-logger = { path = "../logger", version = "=1.8.0" }
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index df054c20513724..b64419615ffb90 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.0.0-rc"
 log = "0.4.14"
 rayon = "1.5.1"
 serde_json = "1.0.67"
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index dbc72bad73a288..a4c5373e099932 100644
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-clap-utils"
 edition = "2018"
 
 [dependencies]
-clap = "2.33.0"
+clap = "3.0.0-rc"
 rpassword = "5.0"
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.0" }
 solana-sdk = { path = "../sdk", version = "=1.8.0" }
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index e1588d31a79f7b..77e2a011750b67 100644
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-cli-output"
 [dependencies]
 base64 = "0.13.0"
 chrono = { version = "0.4.11", features = ["serde"] }
-clap = "2.33.0"
+clap = "3.0.0-rc"
 console = "0.14.1"
 humantime = "2.0.1"
 Inflector = "0.11.4"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index dbf17631f1db65..8bf50cf0c8a275 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.0.0-rc"
 criterion-stats = "0.3.0"
 ctrlc = { version = "3.1.9", features = ["termination"] }
 console = "0.14.1"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 46b1e949e71189..d74f494b9d57ea 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 base64 = "0.13.0"
 bincode = "1.3.3"
 bs58 = "0.4.0"
-clap = "2.33.0"
+clap = "3.0.0-rc"
 indicatif = "0.16.2"
 jsonrpc-core = "18.0.0"
 log = "0.4.14"
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index 94702f36da5d8f..e6cdff0b953797 100644
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 
 [dependencies]
 bincode = "1.3.3"
-clap = "2.33.1"
+clap = "3.0.0-rc"
 log = "0.4.14"
 rand = "0.7.0"
 solana-core = { path = "../core", version = "=1.8.0" }
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 49b5f160a51d12..cc089bf2bde628 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 bincode = "1.3.3"
 byteorder = "1.4.3"
-clap = "2.33"
+clap = "3.0"
 log = "0.4.14"
 serde = "1.0.130"
 serde_derive = "1.0.103"
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index 9a1df387f3626f..192e4f9d8a675e 100644
--- a/genesis/Cargo.toml
+++ b/genesis/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-genesis"
 
 [dependencies]
 base64 = "0.12.3"
-clap = "2.33.1"
+clap = "3.0.0-rc"
 serde = "1.0.130"
 serde_json = "1.0.67"
 serde_yaml = "0.8.21"
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index 80a7219ab75a1a..2b9977d1d43f7d 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.0.0-rc"
 flate2 = "1.0"
 indexmap = { version = "1.7", features = ["rayon"] }
 itertools = "0.10.1"
diff --git a/install/Cargo.toml b/install/Cargo.toml
index 848b6b5ff23b18..9b7a7a3772fb61 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.0.0-rc" }
 console = "0.14.1"
 ctrlc = { version = "3.1.9", features = ["termination"] }
 dirs-next = "2.0.0"
diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
index d3d7f4dd7b2f8c..71cff46a42c912 100644
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 bs58 = "0.4.0"
-clap = "2.33"
+clap = "3.0"
 dirs-next = "2.0.0"
 num_cpus = "1.13.0"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 50c784a7936085..12d14b52b491c8 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"
 bytecount = "0.6.2"
-clap = "2.33.1"
+clap = "3.0.0-rc"
 csv = "1.1.6"
 histogram = "*"
 itertools = "0.10.1"
diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml
index 013ccf0376ca91..701a8d6cbfbcfa 100644
--- a/log-analyzer/Cargo.toml
+++ b/log-analyzer/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 byte-unit = "4.0.12"
-clap = "2.33.1"
+clap = "3.0.0-rc"
 serde = "1.0.130"
 serde_json = "1.0.67"
 solana-logger = { path = "../logger", version = "=1.8.0" }
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index beab0f0b414665..fab0f7b0210bec 100644
--- a/merkle-root-bench/Cargo.toml
+++ b/merkle-root-bench/Cargo.toml
@@ -15,7 +15,7 @@ solana-runtime = { path = "../runtime", version = "=1.8.0" }
 solana-measure = { path = "../measure", version = "=1.8.0" }
 solana-sdk = { path = "../sdk", version = "=1.8.0" }
 solana-version = { path = "../version", version = "=1.8.0" }
-clap = "2.33.1"
+clap = "3.0.0-rc"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 9203bc14b72139..b45151911ea7d9 100644
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-rc"
 serde = "1.0.130"
 serde_json = "1.0.67"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index dd50e5dd8595ff..8457fadbb6842d 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.3.3"
-clap = "2.33.1"
+clap = "3.0.0-rc"
 log = "0.4.14"
 nix = "0.20.0"
 rand = "0.7.0"
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index b03e226b13b3f5..9529567fcaacab 100644
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-poh-bench"
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-rc"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
diff --git a/rbpf-cli/Cargo.toml b/rbpf-cli/Cargo.toml
index 9f8c19de9d1388..fb22fbd88ed350 100644
--- a/rbpf-cli/Cargo.toml
+++ b/rbpf-cli/Cargo.toml
@@ -9,7 +9,7 @@ keywords = ["BPF", "eBPF", "interpreter", "JIT"]
 edition = "2018"
 
 [dependencies]
-clap = "3.0.0-beta.2"
+clap = "3.0.0-rc.5"
 serde = "1.0.130"
 serde_json = "1.0.67"
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.8.0" }
diff --git a/replica-node/Cargo.toml b/replica-node/Cargo.toml
index e69202922b05ae..1a31545cf6c24e 100644
--- a/replica-node/Cargo.toml
+++ b/replica-node/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-validator"
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-rc"
 crossbeam-channel = "0.5"
 log = "0.4.14"
 rand = "0.7.0"
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index c6141bcf600feb..3c004a95d09ee1 100644
--- a/runtime/store-tool/Cargo.toml
+++ b/runtime/store-tool/Cargo.toml
@@ -14,7 +14,7 @@ log = { version = "0.4.14" }
 solana-logger = { path = "../../logger", version = "=1.8.0" }
 solana-version = { path = "../../version", version = "=1.8.0" }
 solana-runtime = { path = "..", version = "=1.8.0" }
-clap = "2.33.1"
+clap = "3.0.0-rc"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index 77ca163982e83f..94ebfeb0d1812c 100644
--- a/sdk/cargo-build-bpf/Cargo.toml
+++ b/sdk/cargo-build-bpf/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 bzip2 = "0.4.3"
-clap = "2.33.3"
+clap = "3.0.0-rc"
 regex = "1.5.4"
 cargo_metadata = "0.14.0"
 solana-sdk = { path = "..", version = "=1.8.0" }
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index 8a6dbcb72e371c..c05aea4926ea14 100644
--- a/sdk/cargo-test-bpf/Cargo.toml
+++ b/sdk/cargo-test-bpf/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
-clap = "2.33.3"
+clap = "3.0.0-rc"
 cargo_metadata = "0.14.0"
 
 [[bin]]
diff --git a/stake-accounts/Cargo.toml b/stake-accounts/Cargo.toml
index e8b4c12ddaef9a..f2648933fc7ae6 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.0.0-rc"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
 solana-cli-config = { path = "../cli-config", version = "=1.8.0" }
 solana-client = { path = "../client", version = "=1.8.0" }
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index 83c70dd1219a1a..0578ffa186ff68 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.0.0-rc"
 log = "0.4.14"
 libc = "0.2.101"
 solana-logger = { path = "../logger", version = "=1.8.0" }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index da31cf02533777..3c8a62d6b63939 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.0.0-rc"
 console = "0.14.1"
 csv = "1.1.6"
 ctrlc = { version = "3.1.9", features = ["termination"] }
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
index 361befdc0f8f6e..10799fdadf41f7 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.0.0-rc"
 console = "0.14.1"
 core_affinity = "0.5.10"
 fd-lock = "3.0.0"
diff --git a/watchtower/Cargo.toml b/watchtower/Cargo.toml
index f9061450ae9e48..2061c3e760a9e7 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.0.0-rc"
 log = "0.4.14"
 humantime = "2.0.1"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }