diff --git a/Cargo.lock b/Cargo.lock
index c72b90930d7cf9..9ea24e0c2d3b89 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -66,7 +66,7 @@ dependencies = [
 name = "agave-cargo-registry"
 version = "1.19.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "flate2",
  "hex",
  "hyper",
@@ -109,7 +109,7 @@ dependencies = [
  "bincode",
  "bzip2",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "crossbeam-channel",
  "ctrlc",
@@ -144,7 +144,7 @@ dependencies = [
  "bs58",
  "bytecount",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "csv",
  "dashmap",
@@ -194,7 +194,7 @@ version = "1.19.0"
 dependencies = [
  "agave-geyser-plugin-interface",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "core_affinity",
  "crossbeam-channel",
@@ -258,7 +258,7 @@ dependencies = [
 name = "agave-watchtower"
 version = "1.19.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "humantime",
  "log",
  "solana-clap-utils",
@@ -352,12 +352,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
-name = "ansi_term"
-version = "0.11.0"
+name = "anstream"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
 dependencies = [
- "winapi 0.3.9",
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
 ]
 
 [[package]]
@@ -366,6 +372,34 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
 
+[[package]]
+name = "anstyle-parse"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.80"
@@ -1338,38 +1372,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 1.3.2",
- "strsim 0.8.0",
- "textwrap 0.11.0",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "clap"
-version = "3.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_derive",
- "clap_lex 0.2.4",
- "indexmap 1.9.3",
- "once_cell",
- "strsim 0.10.0",
- "termcolor",
- "textwrap 0.16.0",
-]
-
 [[package]]
 name = "clap"
 version = "4.3.21"
@@ -1377,6 +1379,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
 dependencies = [
  "clap_builder",
+ "clap_derive",
+ "once_cell",
 ]
 
 [[package]]
@@ -1385,37 +1389,36 @@ version = "4.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
 dependencies = [
+ "anstream",
  "anstyle",
- "clap_lex 0.5.0",
+ "clap_lex",
+ "once_cell",
+ "strsim",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "4.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 dependencies = [
  "heck",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
-name = "clap_lex"
-version = "0.5.0"
+name = "colorchoice"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "combine"
@@ -1559,7 +1562,7 @@ dependencies = [
  "anes",
  "cast 0.3.0",
  "ciborium",
- "clap 4.3.21",
+ "clap",
  "criterion-plot",
  "is-terminal",
  "itertools",
@@ -1739,7 +1742,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
+ "strsim",
  "syn 2.0.52",
 ]
 
@@ -3788,12 +3791,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
-
 [[package]]
 name = "parity-tokio-ipc"
 version = "0.9.0"
@@ -5338,7 +5335,7 @@ dependencies = [
 name = "solana-accounts-bench"
 version = "1.19.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rayon",
  "solana-accounts-db",
@@ -5352,7 +5349,7 @@ dependencies = [
 name = "solana-accounts-cluster-bench"
 version = "1.19.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.8.5",
  "rayon",
@@ -5480,7 +5477,7 @@ dependencies = [
 name = "solana-banking-bench"
 version = "1.19.0"
 dependencies = [
- "clap 3.2.23",
+ "clap",
  "crossbeam-channel",
  "log",
  "rand 0.8.5",
@@ -5548,7 +5545,7 @@ dependencies = [
 name = "solana-bench-streamer"
 version = "1.19.0"
 dependencies = [
- "clap 3.2.23",
+ "clap",
  "crossbeam-channel",
  "solana-net-utils",
  "solana-streamer",
@@ -5559,7 +5556,7 @@ dependencies = [
 name = "solana-bench-tps"
 version = "1.19.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "rand 0.8.5",
@@ -5679,7 +5676,7 @@ dependencies = [
  "assert_cmd",
  "bzip2",
  "cargo_metadata",
- "clap 3.2.23",
+ "clap",
  "itertools",
  "log",
  "predicates",
@@ -5702,7 +5699,7 @@ name = "solana-cargo-test-sbf"
 version = "1.19.0"
 dependencies = [
  "cargo_metadata",
- "clap 3.2.23",
+ "clap",
  "itertools",
  "log",
  "solana-logger",
@@ -5714,7 +5711,7 @@ version = "1.19.0"
 dependencies = [
  "assert_matches",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "rpassword",
  "solana-remote-wallet",
  "solana-sdk",
@@ -5731,7 +5728,7 @@ version = "1.19.0"
 dependencies = [
  "assert_matches",
  "chrono",
- "clap 3.2.23",
+ "clap",
  "rpassword",
  "solana-remote-wallet",
  "solana-sdk",
@@ -5750,7 +5747,7 @@ dependencies = [
  "assert_matches",
  "bincode",
  "bs58",
- "clap 2.33.3",
+ "clap",
  "console",
  "const_format",
  "criterion-stats",
@@ -5819,7 +5816,7 @@ dependencies = [
  "Inflector",
  "base64 0.21.7",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "ed25519-dalek",
  "humantime",
@@ -6060,7 +6057,7 @@ name = "solana-dos"
 version = "1.19.0"
 dependencies = [
  "bincode",
- "clap 3.2.23",
+ "clap",
  "crossbeam-channel",
  "itertools",
  "log",
@@ -6136,7 +6133,7 @@ version = "1.19.0"
 dependencies = [
  "bincode",
  "byteorder",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log",
  "serde",
@@ -6192,7 +6189,7 @@ version = "1.19.0"
 dependencies = [
  "base64 0.21.7",
  "bincode",
- "clap 2.33.3",
+ "clap",
  "itertools",
  "serde",
  "serde_json",
@@ -6254,7 +6251,7 @@ dependencies = [
  "assert_matches",
  "bincode",
  "bv",
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "flate2",
  "indexmap 2.2.5",
@@ -6303,7 +6300,7 @@ name = "solana-keygen"
 version = "1.19.0"
 dependencies = [
  "bs58",
- "clap 3.2.23",
+ "clap",
  "dirs-next",
  "num_cpus",
  "solana-clap-v3-utils",
@@ -6441,7 +6438,7 @@ name = "solana-log-analyzer"
 version = "1.19.0"
 dependencies = [
  "byte-unit",
- "clap 3.2.23",
+ "clap",
  "serde",
  "serde_json",
  "solana-logger",
@@ -6473,7 +6470,7 @@ version = "1.19.0"
 name = "solana-merkle-root-bench"
 version = "1.19.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-accounts-db",
  "solana-logger",
@@ -6511,7 +6508,7 @@ dependencies = [
 name = "solana-net-shaper"
 version = "1.19.0"
 dependencies = [
- "clap 3.2.23",
+ "clap",
  "rand 0.8.5",
  "serde",
  "serde_json",
@@ -6523,7 +6520,7 @@ name = "solana-net-utils"
 version = "1.19.0"
 dependencies = [
  "bincode",
- "clap 3.2.23",
+ "clap",
  "crossbeam-channel",
  "log",
  "nix 0.26.4",
@@ -6611,7 +6608,7 @@ dependencies = [
 name = "solana-poh-bench"
 version = "1.19.0"
 dependencies = [
- "clap 3.2.23",
+ "clap",
  "log",
  "rayon",
  "solana-entry",
@@ -6933,7 +6930,7 @@ name = "solana-rpc-client-nonce-utils"
 version = "1.19.0"
 dependencies = [
  "anyhow",
- "clap 2.33.3",
+ "clap",
  "futures 0.3.30",
  "serde_json",
  "solana-account-decoder",
@@ -7164,7 +7161,7 @@ dependencies = [
 name = "solana-stake-accounts"
 version = "1.19.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-remote-wallet",
@@ -7245,7 +7242,7 @@ dependencies = [
 name = "solana-store-tool"
 version = "1.19.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log",
  "solana-accounts-db",
  "solana-logger",
@@ -7369,7 +7366,7 @@ dependencies = [
  "assert_matches",
  "bincode",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "csv",
  "ctrlc",
@@ -7422,7 +7419,7 @@ name = "solana-transaction-dos"
 version = "1.19.0"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log",
  "rand 0.8.5",
  "rayon",
@@ -7636,7 +7633,7 @@ name = "solana-zk-keygen"
 version = "1.19.0"
 dependencies = [
  "bs58",
- "clap 3.2.23",
+ "clap",
  "dirs-next",
  "num_cpus",
  "solana-clap-v3-utils",
@@ -7970,12 +7967,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"
@@ -8234,21 +8225,6 @@ dependencies = [
  "test-case-core",
 ]
 
-[[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.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
 [[package]]
 name = "thiserror"
 version = "1.0.57"
@@ -8859,6 +8835,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -8871,12 +8853,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.4"
diff --git a/Cargo.toml b/Cargo.toml
index 27376370297e26..5235910eb40fd7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -173,7 +173,7 @@ cargo_metadata = "0.15.4"
 cc = "1.0.83"
 chrono = { version = "0.4.34", default-features = false }
 chrono-humanize = "0.2.3"
-clap = "2.33.1"
+clap = "4.3.21"
 console = "0.15.8"
 console_error_panic_hook = "0.1.7"
 console_log = "0.2.2"
diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml
index ed791d94499a0f..d4eebbc3767ac9 100644
--- a/banking-bench/Cargo.toml
+++ b/banking-bench/Cargo.toml
@@ -9,7 +9,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-clap = { version = "3.1.8", features = ["derive"] }
+clap = { version = "4.3.21", features = ["derive"] }
 crossbeam-channel = { workspace = true }
 log = { workspace = true }
 rand = { workspace = true }
diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
index 2af7ec8f39be94..dba4adfe9bab14 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -9,7 +9,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "4.3.21", features = ["cargo"] }
 crossbeam-channel = { workspace = true }
 solana-net-utils = { workspace = true }
 solana-streamer = { workspace = true }
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index c51dc0f1d4b060..9941526d83d333 100644
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 chrono = { workspace = true, features = ["default"] }
-clap = "2.33.0"
+clap = "4.3.21"
 rpassword = { workspace = true }
 solana-remote-wallet = { workspace = true }
 solana-sdk = { workspace = true }
diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml
index 85cc2092ec07a9..be2cd7b5194d36 100644
--- a/clap-v3-utils/Cargo.toml
+++ b/clap-v3-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 chrono = { workspace = true, features = ["default"] }
-clap = { version = "3.2.23", features = ["cargo"] }
+clap = { version = "4.3.21", features = ["cargo"] }
 rpassword = { workspace = true }
 solana-remote-wallet = { workspace = true }
 solana-sdk = { workspace = true }
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index b397c6d498b0de..e5f907d25c49a0 100644
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@@ -13,7 +13,7 @@ edition = { workspace = true }
 Inflector = { workspace = true }
 base64 = { workspace = true }
 chrono = { workspace = true, features = ["default", "serde"] }
-clap = "2.33.0"
+clap = "4.3.21"
 console = { workspace = true }
 humantime = { workspace = true }
 indicatif = { workspace = true }
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index 179fc40bf84820..d591706bb7621c 100644
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -11,7 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 bincode = { workspace = true }
-clap = { version = "3.1.5", features = ["derive", "cargo"] }
+clap = { version = "4.3.21", features = ["derive", "cargo"] }
 crossbeam-channel = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
index 0d36a5213a929c..7fd3792216de08 100644
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@@ -11,7 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 bs58 = { workspace = true }
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "4.3.21", features = ["cargo"] }
 dirs-next = { workspace = true }
 num_cpus = { workspace = true }
 solana-clap-v3-utils = { workspace = true }
diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml
index 21df3661ddd0ea..4aae07af6ce816 100644
--- a/log-analyzer/Cargo.toml
+++ b/log-analyzer/Cargo.toml
@@ -11,7 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 byte-unit = { workspace = true }
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "4.3.21", features = ["cargo"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 solana-logger = { workspace = true }
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 8e6a46853fc3aa..adf6353001f3ac 100644
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -10,7 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "4.3.21", features = ["cargo"] }
 rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index 0d8a82f7a994cd..d755f75b8966bb 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 bincode = { workspace = true }
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "4.3.21", features = ["cargo"] }
 crossbeam-channel = { workspace = true }
 log = { workspace = true }
 nix = { workspace = true }
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index fb44c0cb81d966..b79e0ecb4afd78 100644
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@@ -10,7 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "4.3.21", features = ["cargo"] }
 log = { workspace = true }
 rayon = { workspace = true }
 solana-entry = { workspace = true }
diff --git a/rpc-client-nonce-utils/Cargo.toml b/rpc-client-nonce-utils/Cargo.toml
index 476616a0b1211e..b4b7cd68d6ff60 100644
--- a/rpc-client-nonce-utils/Cargo.toml
+++ b/rpc-client-nonce-utils/Cargo.toml
@@ -10,7 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-clap = "2.33.0"
+clap = "4.3.21"
 solana-clap-utils = { workspace = true }
 solana-rpc-client = { workspace = true }
 solana-sdk = { workspace = true }
diff --git a/sdk/cargo-build-sbf/Cargo.toml b/sdk/cargo-build-sbf/Cargo.toml
index 36ce44d0d5c7d3..bee4c0717662b1 100644
--- a/sdk/cargo-build-sbf/Cargo.toml
+++ b/sdk/cargo-build-sbf/Cargo.toml
@@ -12,7 +12,7 @@ edition = { workspace = true }
 [dependencies]
 bzip2 = { workspace = true }
 cargo_metadata = { workspace = true }
-clap = { version = "3.1.5", features = ["cargo", "env"] }
+clap = { version = "4.3.21", features = ["cargo", "env"] }
 itertools = { workspace = true }
 log = { workspace = true, features = ["std"] }
 regex = { workspace = true }
diff --git a/sdk/cargo-test-sbf/Cargo.toml b/sdk/cargo-test-sbf/Cargo.toml
index 201e90e0f78b77..960a7fd759ad22 100644
--- a/sdk/cargo-test-sbf/Cargo.toml
+++ b/sdk/cargo-test-sbf/Cargo.toml
@@ -11,7 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 cargo_metadata = { workspace = true }
-clap = { version = "3.1.5", features = ["cargo"] }
+clap = { version = "4.3.21", features = ["cargo"] }
 itertools = { workspace = true }
 log = { workspace = true, features = ["std"] }
 solana-logger = { workspace = true }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 37e675c521af5f..8bc1c2f52cad68 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -11,7 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 chrono = { workspace = true, features = ["default", "serde"] }
-clap = "2.33.0"
+clap = "4.3.21"
 console = { workspace = true }
 csv = { workspace = true }
 ctrlc = { workspace = true, features = ["termination"] }
diff --git a/zk-keygen/Cargo.toml b/zk-keygen/Cargo.toml
index 0a1602045e6b01..4e3d532a855ebe 100644
--- a/zk-keygen/Cargo.toml
+++ b/zk-keygen/Cargo.toml
@@ -17,7 +17,7 @@ edition = { workspace = true }
 
 [dependencies]
 bs58 = { workspace = true }
-clap = { version = "3.1.5", features = ["cargo", "derive"] }
+clap = { version = "4.3.21", features = ["cargo", "derive"] }
 dirs-next = { workspace = true }
 num_cpus = { workspace = true }
 solana-clap-v3-utils = { workspace = true }