diff --git a/Cargo.lock b/Cargo.lock
index 56239f59258e..9c2ce5de0fd5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,7 +40,7 @@ dependencies = [
  "diem-workspace-hack",
  "mirai-annotations",
  "proptest",
- "rand 0.7.3",
+ "rand 0.8.4",
 ]
 
 [[package]]
@@ -272,7 +272,7 @@ dependencies = [
  "once_cell",
  "pin-project 1.0.2",
  "proptest",
- "rand 0.7.3",
+ "rand 0.8.4",
  "regex",
  "reqwest",
  "serde",
@@ -807,7 +807,7 @@ dependencies = [
  "network-builder",
  "num_cpus",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.4",
  "regex",
  "reqwest",
  "rusoto_autoscaling",
@@ -940,7 +940,7 @@ dependencies = [
  "num-traits",
  "once_cell",
  "proptest",
- "rand 0.7.3",
+ "rand 0.8.4",
  "safety-rules",
  "schemadb",
  "serde",
@@ -1343,7 +1343,7 @@ dependencies = [
  "get_if_addrs",
  "log",
  "mirai-annotations",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "serde_yaml",
  "thiserror",
@@ -1374,7 +1374,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "proptest-derive",
- "rand 0.7.3",
+ "rand 0.8.4",
  "rand_core 0.5.1",
  "ripemd160",
  "serde",
@@ -1414,7 +1414,7 @@ dependencies = [
  "diem-workspace-hack",
  "libc",
  "move-core-types",
- "rand 0.7.3",
+ "rand 0.8.4",
  "static_assertions",
  "transaction-builder",
 ]
@@ -1519,7 +1519,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "proptest-derive",
- "rand 0.7.3",
+ "rand 0.8.4",
  "rusty-fork",
  "safety-rules",
  "serde_json",
@@ -1554,7 +1554,7 @@ dependencies = [
  "diemdb",
  "executor",
  "generate-key",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "storage-interface",
  "structopt 0.3.21",
@@ -1606,7 +1606,7 @@ dependencies = [
  "num-traits",
  "proptest",
  "proptest-derive",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "thiserror",
 ]
@@ -1645,7 +1645,7 @@ dependencies = [
  "network",
  "once_cell",
  "proptest",
- "rand 0.7.3",
+ "rand 0.8.4",
  "reqwest",
  "scratchpad",
  "serde",
@@ -1672,7 +1672,7 @@ dependencies = [
  "diem-workspace-hack",
  "futures 0.3.8",
  "hex",
- "rand 0.7.3",
+ "rand 0.8.4",
  "reqwest",
  "serde",
  "serde_json",
@@ -1725,7 +1725,7 @@ dependencies = [
  "executor-types",
  "futures 0.3.8",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "storage-interface",
  "thiserror",
@@ -1812,7 +1812,7 @@ dependencies = [
  "network",
  "once_cell",
  "proptest",
- "rand 0.7.3",
+ "rand 0.8.4",
  "rayon",
  "serde",
  "serde_json",
@@ -1880,7 +1880,7 @@ dependencies = [
  "diem-secure-storage",
  "diem-workspace-hack",
  "move-core-types",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "thiserror",
 ]
@@ -2044,7 +2044,7 @@ dependencies = [
  "diem-vault-client",
  "diem-workspace-hack",
  "enum_dispatch",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "serde_json",
  "thiserror",
@@ -2118,7 +2118,7 @@ version = "0.1.0"
 dependencies = [
  "diem-workspace-hack",
  "hex",
- "rand 0.7.3",
+ "rand 0.8.4",
 ]
 
 [[package]]
@@ -2185,7 +2185,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "proptest-derive",
- "rand 0.7.3",
+ "rand 0.8.4",
  "regex",
  "serde",
  "serde_bytes",
@@ -2272,7 +2272,7 @@ dependencies = [
  "hmac 0.10.1",
  "mirai-annotations",
  "pbkdf2",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "sha2",
  "thiserror",
@@ -2354,7 +2354,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "proptest-derive",
- "rand 0.7.3",
+ "rand 0.8.4",
  "schemadb",
  "serde",
  "storage-interface",
@@ -2658,7 +2658,7 @@ dependencies = [
  "executor",
  "executor-test-helpers",
  "executor-types",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "storage-client",
  "thiserror",
@@ -2695,7 +2695,7 @@ dependencies = [
  "move-core-types",
  "once_cell",
  "proptest",
- "rand 0.7.3",
+ "rand 0.8.4",
  "scratchpad",
  "serde",
  "serde_json",
@@ -2720,7 +2720,7 @@ dependencies = [
  "executor",
  "executor-types",
  "itertools 0.9.0",
- "rand 0.7.3",
+ "rand 0.8.4",
  "rayon",
  "storage-client",
  "storage-interface",
@@ -2744,7 +2744,7 @@ dependencies = [
  "diemdb",
  "executor",
  "executor-types",
- "rand 0.7.3",
+ "rand 0.8.4",
  "storage-interface",
  "storage-service",
  "tempfile",
@@ -3036,7 +3036,7 @@ dependencies = [
  "diem-workspace-hack",
  "move-core-types",
  "network",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "serde-reflection",
  "serde_yaml",
@@ -3051,7 +3051,7 @@ dependencies = [
  "diem-crypto",
  "diem-temppath",
  "diem-workspace-hack",
- "rand 0.7.3",
+ "rand 0.8.4",
 ]
 
 [[package]]
@@ -3766,7 +3766,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "proptest-derive",
- "rand 0.7.3",
+ "rand 0.8.4",
  "vm",
  "vm-genesis",
 ]
@@ -4037,7 +4037,7 @@ dependencies = [
  "ir-to-bytecode",
  "move-core-types",
  "move-ir-types",
- "rand 0.7.3",
+ "rand 0.8.4",
  "vm",
 ]
 
@@ -4086,7 +4086,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "proptest-derive",
- "rand 0.7.3",
+ "rand 0.8.4",
  "ref-cast",
  "regex",
  "serde",
@@ -4233,7 +4233,7 @@ dependencies = [
  "num 0.3.1",
  "once_cell",
  "pretty",
- "rand 0.7.3",
+ "rand 0.8.4",
  "regex",
  "serde",
  "serde_json",
@@ -4443,7 +4443,7 @@ dependencies = [
  "pin-project 1.0.2",
  "proptest",
  "proptest-derive",
- "rand 0.7.3",
+ "rand 0.8.4",
  "rand_core 0.5.1",
  "serde",
  "serde_bytes",
@@ -4476,7 +4476,7 @@ dependencies = [
  "netcore",
  "network",
  "network-simple-onchain-discovery",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "subscription-service",
  "tokio 0.2.22",
@@ -5251,7 +5251,7 @@ dependencies = [
  "rand_isaac",
  "rand_jitter",
  "rand_os",
- "rand_pcg 0.1.2",
+ "rand_pcg",
  "rand_xorshift 0.1.1",
  "winapi 0.3.9",
 ]
@@ -5267,7 +5267,18 @@ dependencies = [
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
- "rand_pcg 0.2.1",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.3",
+ "rand_hc 0.3.1",
 ]
 
 [[package]]
@@ -5290,6 +5301,16 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.3",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.3.1"
@@ -5314,6 +5335,15 @@ dependencies = [
  "getrandom 0.1.15",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+dependencies = [
+ "getrandom 0.2.0",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.1.0"
@@ -5332,6 +5362,15 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
+dependencies = [
+ "rand_core 0.6.3",
+]
+
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
@@ -5376,15 +5415,6 @@ dependencies = [
  "rand_core 0.4.2",
 ]
 
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
@@ -5845,7 +5875,7 @@ dependencies = [
  "diem-workspace-hack",
  "once_cell",
  "proptest",
- "rand 0.7.3",
+ "rand 0.8.4",
  "rand_core 0.5.1",
  "serde",
  "tempfile",
@@ -5949,7 +5979,7 @@ dependencies = [
  "diem-types",
  "diem-workspace-hack",
  "hex",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde_yaml",
  "structopt 0.3.21",
  "thiserror",
@@ -6319,7 +6349,7 @@ dependencies = [
  "num 0.3.1",
  "num-traits",
  "once_cell",
- "rand 0.7.3",
+ "rand 0.8.4",
  "regex",
  "rust_decimal",
  "rusty-fork",
@@ -6343,7 +6373,7 @@ dependencies = [
  "netcore",
  "network",
  "network-builder",
- "rand 0.7.3",
+ "rand 0.8.4",
  "tokio 0.2.22",
  "tokio-util",
 ]
@@ -6434,7 +6464,7 @@ dependencies = [
  "network-builder",
  "once_cell",
  "proptest",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "storage-interface",
  "storage-service",
@@ -6589,7 +6619,7 @@ dependencies = [
  "futures 0.3.8",
  "itertools 0.9.0",
  "proptest",
- "rand 0.7.3",
+ "rand 0.8.4",
  "storage-client",
  "storage-interface",
  "tokio 0.2.22",
@@ -6679,7 +6709,7 @@ dependencies = [
  "diem-workspace-hack",
  "hex",
  "move-core-types",
- "rand 0.7.3",
+ "rand 0.8.4",
  "serde",
  "serde_json",
  "structopt 0.3.21",
@@ -6814,7 +6844,7 @@ dependencies = [
  "move-vm-runtime",
  "move-vm-types",
  "num_cpus",
- "rand 0.7.3",
+ "rand 0.8.4",
  "structopt 0.3.21",
  "vm",
 ]
@@ -7431,7 +7461,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "proptest-derive",
- "rand 0.7.3",
+ "rand 0.8.4",
  "transaction-builder",
  "vm",
 ]
@@ -7452,7 +7482,7 @@ dependencies = [
  "executor-test-helpers",
  "fail",
  "move-core-types",
- "rand 0.7.3",
+ "rand 0.8.4",
  "scratchpad",
  "storage-interface",
  "storage-service",
diff --git a/client/diem-dev/Cargo.toml b/client/diem-dev/Cargo.toml
index 10b610611857..0e50a76b2acf 100644
--- a/client/diem-dev/Cargo.toml
+++ b/client/diem-dev/Cargo.toml
@@ -21,7 +21,7 @@ move-core-types = { path = "../../language/move-core/types", version = "0.1.0" }
 transaction-builder = { path = "../../language/transaction-builder", version = "0.1.0" }
 
 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.4"
 
 [build-dependencies]
 bindgen = "0.54.0"
diff --git a/client/json-rpc/Cargo.toml b/client/json-rpc/Cargo.toml
index 855835a4ec45..9711247c2777 100644
--- a/client/json-rpc/Cargo.toml
+++ b/client/json-rpc/Cargo.toml
@@ -14,7 +14,7 @@ anyhow = "1.0.36"
 async-trait = "0.1.42"
 futures = "0.3.8"
 hex = "0.4.2"
-rand = "0.7.3"
+rand = "0.8.4"
 reqwest = { version = "0.10.10", features = ["blocking", "json"], default_features = false }
 serde = { version = "1.0.117", default-features = false }
 serde_json = "1.0.60"
diff --git a/client/swiss-knife/Cargo.toml b/client/swiss-knife/Cargo.toml
index 5f152f15e39b..f655d49dd5ba 100644
--- a/client/swiss-knife/Cargo.toml
+++ b/client/swiss-knife/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 structopt = "0.3.21"
-rand = "0.7.3"
+rand = "0.8.4"
 hex = "0.4.2"
 serde_json = "1.0.60"
 serde = { version = "1.0.117", features = ["derive"] }
diff --git a/common/temppath/Cargo.toml b/common/temppath/Cargo.toml
index 05b396b93e3d..8944bd648d58 100644
--- a/common/temppath/Cargo.toml
+++ b/common/temppath/Cargo.toml
@@ -12,4 +12,4 @@ edition = "2018"
 [dependencies]
 hex = "0.4.2"
 diem-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
-rand = "0.7.3"
+rand = "0.8.4"
diff --git a/config/Cargo.toml b/config/Cargo.toml
index d18659ea5d97..f8d10b5563d9 100644
--- a/config/Cargo.toml
+++ b/config/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 get_if_addrs = { version = "0.5.3", default-features = false }
 log = { version = "0.4.11", features = ["serde"] }
 mirai-annotations = "1.10.1"
-rand = "0.7.3"
+rand = "0.8.4"
 serde = { version = "1.0.117", features = ["rc"], default-features = false }
 serde_yaml = "0.8.14"
 thiserror = "1.0.22"
diff --git a/config/generate-key/Cargo.toml b/config/generate-key/Cargo.toml
index 809b7b11f0b4..72163396d443 100644
--- a/config/generate-key/Cargo.toml
+++ b/config/generate-key/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-rand = "0.7.3"
+rand = "0.8.4"
 
 bcs = "0.1.2"
 diem-crypto = { path = "../../crypto/crypto/", version = "0.1.0"}
diff --git a/config/management/genesis/Cargo.toml b/config/management/genesis/Cargo.toml
index aeb54069555c..765b7c4ba2e9 100644
--- a/config/management/genesis/Cargo.toml
+++ b/config/management/genesis/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.36"
-rand = "0.7.3"
+rand = "0.8.4"
 serde = { version = "1.0.117", features = ["rc"], default-features = false }
 structopt = "0.3.21"
 thiserror = "1.0.22"
diff --git a/config/management/network-address-encryption/Cargo.toml b/config/management/network-address-encryption/Cargo.toml
index 74d3981342ff..6bef14c51abd 100644
--- a/config/management/network-address-encryption/Cargo.toml
+++ b/config/management/network-address-encryption/Cargo.toml
@@ -24,4 +24,4 @@ diem-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.
 move-core-types = { path = "../../../language/move-core/types", version = "0.1.0" }
 
 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.4"
diff --git a/config/seed-peer-generator/Cargo.toml b/config/seed-peer-generator/Cargo.toml
index 82886fe0b1a4..96919798142e 100644
--- a/config/seed-peer-generator/Cargo.toml
+++ b/config/seed-peer-generator/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.36"
 hex = "0.4.2"
-rand = "0.7.3"
+rand = "0.8.4"
 serde_yaml = "0.8.14"
 structopt = "0.3.21"
 thiserror = "1.0.22"
diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
index 8e16bb239c1a..e10696af3afa 100644
--- a/consensus/Cargo.toml
+++ b/consensus/Cargo.toml
@@ -22,7 +22,7 @@ num-derive = { version = "0.3.3", default-features = false }
 num-traits = { version = "0.2.14", default-features = false }
 once_cell = "1.4.1"
 proptest = { version = "0.10.1", optional = true }
-rand = { version = "0.7.3", default-features = false }
+rand = { version = "0.8.4", default-features = false }
 serde = { version = "1.0.117", default-features = false }
 serde_json = "1.0.60"
 termion = { version = "1.5.5", default-features = false }
diff --git a/consensus/safety-rules/Cargo.toml b/consensus/safety-rules/Cargo.toml
index ed196e04eb99..d1bcb1be5837 100644
--- a/consensus/safety-rules/Cargo.toml
+++ b/consensus/safety-rules/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 once_cell = "1.4.1"
-rand = { version = "0.7.3", default-features = false }
+rand = { version = "0.8.4", default-features = false }
 proptest = { version = "0.10.1", optional = true }
 rand_core = "0.5.1"
 
diff --git a/crypto/crypto/Cargo.toml b/crypto/crypto/Cargo.toml
index df29d1bde45c..dc15ad9f2435 100644
--- a/crypto/crypto/Cargo.toml
+++ b/crypto/crypto/Cargo.toml
@@ -23,7 +23,7 @@ once_cell = "1.4.1"
 mirai-annotations = "1.10.1"
 proptest = { version = "0.10.1", optional = true }
 proptest-derive = { version = "0.2.0", optional = true }
-rand = "0.7.3"
+rand = "0.8.4"
 rand_core = { version = "0.5.1", default-features = false }
 serde = { version = "1.0.117", features = ["derive"] }
 serde_bytes = "0.11.5"
diff --git a/execution/execution-correctness/Cargo.toml b/execution/execution-correctness/Cargo.toml
index fa2617173441..89df390a4564 100644
--- a/execution/execution-correctness/Cargo.toml
+++ b/execution/execution-correctness/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.36"
-rand = { version = "0.7.3", default-features = false }
+rand = { version = "0.8.4", default-features = false }
 
 consensus-types = { path = "../../consensus/consensus-types", version = "0.1.0", default-features = false }
 executor = { path = "../executor", version = "0.1.0" }
diff --git a/execution/executor-benchmark/Cargo.toml b/execution/executor-benchmark/Cargo.toml
index eaf70a497e2d..99c260eb42a9 100644
--- a/execution/executor-benchmark/Cargo.toml
+++ b/execution/executor-benchmark/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 itertools = { version = "0.9.0", default-features = false }
-rand = "0.7.3"
+rand = "0.8.4"
 rayon = "1.5.0"
 structopt = "0.3.21"
 
diff --git a/execution/executor-test-helpers/Cargo.toml b/execution/executor-test-helpers/Cargo.toml
index e787173d7b66..87df928a5b7b 100644
--- a/execution/executor-test-helpers/Cargo.toml
+++ b/execution/executor-test-helpers/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.36"
-rand = "0.7.3"
+rand = "0.8.4"
 tempfile = "3.1.0"
 
 executor = { path = "../executor", version = "0.1.0" }
diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml
index 736e139cd6eb..1eaf6b444ad7 100644
--- a/execution/executor/Cargo.toml
+++ b/execution/executor/Cargo.toml
@@ -38,7 +38,7 @@ proptest = { version = "0.10.1", optional = true }
 
 [dev-dependencies]
 proptest = "0.10.1"
-rand = "0.7.3"
+rand = "0.8.4"
 
 compiled-stdlib = { path = "../../language/stdlib/compiled",  version = "0.1.0" }
 compiler = { path = "../../language/compiler", version = "0.1.0" }
diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml
index 919a7f5d6494..8b341c54c78d 100644
--- a/json-rpc/Cargo.toml
+++ b/json-rpc/Cargo.toml
@@ -16,7 +16,7 @@ futures = "0.3.8"
 hex = "0.4.2"
 hyper = "0.13.9"
 once_cell = "1.4.1"
-rand = "0.7.3"
+rand = "0.8.4"
 serde_json = "1.0.60"
 serde = { version = "1.0.117", default-features = false }
 tokio = { version = "0.2.22", features = ["full"] }
@@ -44,7 +44,7 @@ storage-interface = { path = "../storage/storage-interface", version = "0.1.0" }
 [dev-dependencies]
 proptest = "0.10.1"
 reqwest = { version = "0.10.10", features = ["blocking", "json"], default_features = false }
-rand = { version = "0.7.3" }
+rand = { version = "0.8.4" }
 
 generate-key = { path = "../config/generate-key", version = "0.1.0" }
 diemdb = { path = "../storage/diemdb", version = "0.1.0", features = ["fuzzing"] }
diff --git a/language/move-core/types/Cargo.toml b/language/move-core/types/Cargo.toml
index 2b207dc8a8a6..69ba4ac6843f 100644
--- a/language/move-core/types/Cargo.toml
+++ b/language/move-core/types/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.36"
 hex = "0.4.2"
-rand = "0.7.3"
+rand = "0.8.4"
 proptest = { version = "0.10.1", default-features = false, optional = true }
 mirai-annotations = "1.10.1"
 proptest-derive = { version = "0.2.0", default-features = false, optional = true }
diff --git a/language/move-prover/Cargo.toml b/language/move-prover/Cargo.toml
index 4e33302d4981..62cc4ef0df80 100644
--- a/language/move-prover/Cargo.toml
+++ b/language/move-prover/Cargo.toml
@@ -34,7 +34,7 @@ itertools = "0.9.0"
 log = "0.4.11"
 num = "0.3.0"
 pretty = "0.10.0"
-rand = "0.7.3"
+rand = "0.8.4"
 regex = "1.4.2"
 serde = { version = "1.0.117", features = ["derive"] }
 serde_json = "1.0.60"
diff --git a/language/testing-infra/e2e-tests/Cargo.toml b/language/testing-infra/e2e-tests/Cargo.toml
index bcfc3946b704..e1f86d20a3c8 100644
--- a/language/testing-infra/e2e-tests/Cargo.toml
+++ b/language/testing-infra/e2e-tests/Cargo.toml
@@ -16,7 +16,7 @@ bcs = "0.1.2"
 compiler = { path = "../../compiler", version = "0.1.0" }
 once_cell = "1.4.1"
 diem-crypto = { path = "../../../crypto/crypto", version = "0.1.0", features = ["fuzzing"] }
-rand = "0.7.3"
+rand = "0.8.4"
 diem-state-view = { path = "../../../storage/state-view", version = "0.1.0" }
 diem-types = { path = "../../../types", version = "0.1.0", features = ["fuzzing"] }
 move-core-types = { path = "../../move-core/types", version = "0.1.0" }
diff --git a/language/testing-infra/module-generation/Cargo.toml b/language/testing-infra/module-generation/Cargo.toml
index 62ecac172751..0b2a90e24328 100644
--- a/language/testing-infra/module-generation/Cargo.toml
+++ b/language/testing-infra/module-generation/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-rand = "0.7.3"
+rand = "0.8.4"
 
 bytecode-verifier = { path = "../../bytecode-verifier", version = "0.1.0" }
 ir-to-bytecode = { path = "../../compiler/ir-to-bytecode", version = "0.1.0" }
diff --git a/language/testing-infra/test-generation/Cargo.toml b/language/testing-infra/test-generation/Cargo.toml
index 723d96e40022..5a2247e2afb1 100644
--- a/language/testing-infra/test-generation/Cargo.toml
+++ b/language/testing-infra/test-generation/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-rand = "0.7.3"
+rand = "0.8.4"
 num_cpus = "1.13.0"
 mirai-annotations = "1.10.1"
 structopt = "0.3.21"
diff --git a/language/tools/vm-genesis/Cargo.toml b/language/tools/vm-genesis/Cargo.toml
index 50eff50af14d..de244c0e3628 100644
--- a/language/tools/vm-genesis/Cargo.toml
+++ b/language/tools/vm-genesis/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.36"
 once_cell = "1.4.1"
-rand = "0.7.3"
+rand = "0.8.4"
 
 bytecode-verifier = { path = "../../bytecode-verifier", version = "0.1.0" }
 bcs = "0.1.2"
diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml
index 2693838da700..a51fe2374df8 100644
--- a/mempool/Cargo.toml
+++ b/mempool/Cargo.toml
@@ -34,7 +34,7 @@ diem-types = { path = "../types", version = "0.1.0" }
 diem-workspace-hack = { path = "../common/workspace-hack", version = "0.1.0" }
 mirai-annotations = "1.10.1"
 network = { path = "../network", version = "0.1.0" }
-rand = "0.7.3"
+rand = "0.8.4"
 netcore = { path = "../network/netcore", version = "0.1.0" }
 serde_json = "1.0.60"
 storage-interface = { path = "../storage/storage-interface", version = "0.1.0" }
diff --git a/network/Cargo.toml b/network/Cargo.toml
index 29b6e8894291..cbbf61611077 100644
--- a/network/Cargo.toml
+++ b/network/Cargo.toml
@@ -19,7 +19,7 @@ once_cell = "1.4.1"
 pin-project = "1.0.2"
 proptest = { version = "0.10.1", default-features = true, optional = true }
 proptest-derive = { version = "0.2.0", optional = true }
-rand = { version = "0.7.3", features = ["small_rng"] }
+rand = { version = "0.8.4", features = ["small_rng"] }
 rand_core = { version = "0.5.1", optional = true }
 serde = { version = "1.0.117", default-features = false }
 serde_bytes = "0.11.5"
diff --git a/network/builder/Cargo.toml b/network/builder/Cargo.toml
index 295c386fcb07..7cc229e30ae9 100644
--- a/network/builder/Cargo.toml
+++ b/network/builder/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.8"
-rand = "0.7.3"
+rand = "0.8.4"
 serde = { version = "1.0.117", default-features = false }
 tokio = { version = "0.2.22", features = ["full"] }
 tokio-retry = "0.2.0"
diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml
index 21e30f8edc60..5c339508e880 100644
--- a/network/socket-bench-server/Cargo.toml
+++ b/network/socket-bench-server/Cargo.toml
@@ -24,4 +24,4 @@ memsocket = { path = "../../network/memsocket", version = "0.1.0" }
 netcore = { path = "../../network/netcore", version = "0.1.0", features = ["fuzzing", "testing"] }
 network = { path = "../../network", version = "0.1.0", features = ["testing", "fuzzing"] }
 network-builder = { path = "../../network/builder", version = "0.1.0"}
-rand = "0.7.3"
+rand = "0.8.4"
diff --git a/secure/key-manager/Cargo.toml b/secure/key-manager/Cargo.toml
index b878f1fab1fb..8287f749f373 100644
--- a/secure/key-manager/Cargo.toml
+++ b/secure/key-manager/Cargo.toml
@@ -31,7 +31,7 @@ transaction-builder-generated = { path = "../../client/transaction-builder", ver
 [dev-dependencies]
 anyhow = "1.0.36"
 futures = "0.3.8"
-rand = "0.7.3"
+rand = "0.8.4"
 tokio = { version = "0.2.22", features = ["full"] }
 
 executor = { path = "../../execution/executor", version = "0.1.0" }
diff --git a/secure/storage/Cargo.toml b/secure/storage/Cargo.toml
index ae4993b215b3..7e4475a2c31e 100644
--- a/secure/storage/Cargo.toml
+++ b/secure/storage/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 base64 = "0.13.0"
 chrono = "0.4.19"
 enum_dispatch = "0.3.4"
-rand = "0.7.3"
+rand = "0.8.4"
 serde = { version = "1.0.117", features = ["rc"], default-features = false }
 serde_json = "1.0.60"
 thiserror = "1.0.22"
@@ -31,7 +31,7 @@ diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0"
 [dev-dependencies]
 diem-crypto = { path = "../../crypto/crypto", version = "0.1.0", features = ["fuzzing"] }
 diem-crypto-derive = { path = "../../crypto/crypto-derive", version = "0.1.0" }
-rand = "0.7.3"
+rand = "0.8.4"
 
 [features]
 fuzzing = ["diem-crypto/fuzzing"]
diff --git a/state-synchronizer/Cargo.toml b/state-synchronizer/Cargo.toml
index 0f7b0b070c2f..0abe94b5f9ec 100644
--- a/state-synchronizer/Cargo.toml
+++ b/state-synchronizer/Cargo.toml
@@ -15,7 +15,7 @@ fail = "0.4.0"
 futures = "0.3.8"
 serde = { version = "1.0.117", default-features = false }
 once_cell = "1.4.1"
-rand = "0.7.3"
+rand = "0.8.4"
 tokio = { version = "0.2.22", features = ["full"] }
 itertools = { version = "0.9.0", default-features = false }
 proptest = { version = "0.10.1", optional = true }
diff --git a/storage/accumulator/Cargo.toml b/storage/accumulator/Cargo.toml
index 71cda3e3854e..7c9d33e06f57 100644
--- a/storage/accumulator/Cargo.toml
+++ b/storage/accumulator/Cargo.toml
@@ -18,7 +18,7 @@ diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0"
 proptest = { version = "0.10.1", optional = true }
 
 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.4"
 proptest = "0.10.1"
 
 diem-crypto = { path = "../../crypto/crypto", version = "0.1.0", features = ["fuzzing"] }
diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml
index 8052425d1c83..874c1bc361cc 100644
--- a/storage/backup/backup-cli/Cargo.toml
+++ b/storage/backup/backup-cli/Cargo.toml
@@ -19,7 +19,7 @@ itertools = "0.9.0"
 num_cpus = "1.13.0"
 once_cell = "1.4.1"
 pin-project = "1.0.2"
-rand = "0.7.3"
+rand = "0.8.4"
 regex = "1.4.2"
 reqwest = { version = "0.10.10", features = ["stream"], default-features = false }
 serde = { version = "1.0.117", features = ["derive"] }
diff --git a/storage/diemdb/Cargo.toml b/storage/diemdb/Cargo.toml
index 80a02792ab7a..a27c5194c6cd 100644
--- a/storage/diemdb/Cargo.toml
+++ b/storage/diemdb/Cargo.toml
@@ -41,7 +41,7 @@ storage-interface = { path = "../storage-interface", version = "0.1.0" }
 [dev-dependencies]
 proptest = "0.10.1"
 proptest-derive = "0.2.0"
-rand = "0.7.3"
+rand = "0.8.4"
 
 diem-jellyfish-merkle = { path = "../jellyfish-merkle", version = "0.1.0", features = ["fuzzing"] }
 diem-proptest-helpers = { path = "../../common/proptest-helpers", version = "0.1.0" }
diff --git a/storage/jellyfish-merkle/Cargo.toml b/storage/jellyfish-merkle/Cargo.toml
index 1f0317ec9ca5..0eead36c3aa2 100644
--- a/storage/jellyfish-merkle/Cargo.toml
+++ b/storage/jellyfish-merkle/Cargo.toml
@@ -17,7 +17,7 @@ num-derive = "0.3.3"
 num-traits = "0.2.14"
 proptest = { version = "0.10.1", optional = true }
 proptest-derive = { version = "0.2.0", optional = true }
-rand = {version = "0.7.3", optional = true }
+rand = {version = "0.8.4", optional = true }
 serde = { version = "1.0.117", features = ["derive"] }
 thiserror = "1.0.22"
 
@@ -30,7 +30,7 @@ diem-types = { path = "../../types", version = "0.1.0" }
 diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
 
 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.4"
 proptest = "0.10.1"
 proptest-derive = "0.2.0"
 
diff --git a/storage/storage-service/Cargo.toml b/storage/storage-service/Cargo.toml
index 44abd0346a5f..501beeb8b74f 100644
--- a/storage/storage-service/Cargo.toml
+++ b/storage/storage-service/Cargo.toml
@@ -24,7 +24,7 @@ diem-secure-net = { path = "../../secure/net", version = "0.1.0" }
 storage-interface = { path = "../storage-interface", version = "0.1.0" }
 diem-types = { path = "../../types", version = "0.1.0" }
 diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
-rand = { version = "0.7.3", optional = true }
+rand = { version = "0.8.4", optional = true }
 storage-client = { path = "../storage-client", version = "0.1.0", optional = true }
 proptest = { version = "0.10.1", optional = true }
 
diff --git a/testsuite/cli/diem-wallet/Cargo.toml b/testsuite/cli/diem-wallet/Cargo.toml
index 4a4908e51e4c..1811362a45ea 100644
--- a/testsuite/cli/diem-wallet/Cargo.toml
+++ b/testsuite/cli/diem-wallet/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.36"
-rand = "0.7.3"
+rand = "0.8.4"
 hex = "0.4.2"
 hmac = "0.10.1"
 byteorder = "1.3.4"
diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml
index 137448b6f0e1..2ad76094d531 100644
--- a/testsuite/cluster-test/Cargo.toml
+++ b/testsuite/cluster-test/Cargo.toml
@@ -15,7 +15,7 @@ flate2 = { version = "1.0.19", features = ["rust_backend"], default-features = f
 hex = "0.4.2"
 itertools = "0.9.0"
 once_cell = "1.4.1"
-rand = "0.7.3"
+rand = "0.8.4"
 regex = { version = "1.4.2", default-features = false, features = ["std", "perf"] }
 reqwest = { version = "0.10.10", features = ["blocking", "json"] }
 serde_json = "1.0.60"
diff --git a/testsuite/diem-fuzzer/Cargo.toml b/testsuite/diem-fuzzer/Cargo.toml
index 649ca92559a9..14580028d4b0 100644
--- a/testsuite/diem-fuzzer/Cargo.toml
+++ b/testsuite/diem-fuzzer/Cargo.toml
@@ -20,7 +20,7 @@ rusty-fork = { version = "0.3.0", default-features = false }
 serde_json = "1.0.60"
 sha-1 = { version = "0.9.2", default-features = false }
 structopt = "0.3.21"
-rand = "0.7.3"
+rand = "0.8.4"
 ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false }
 
 bcs = "0.1.2"
diff --git a/testsuite/generate-format/Cargo.toml b/testsuite/generate-format/Cargo.toml
index dee932e65a55..2bb2401625bc 100644
--- a/testsuite/generate-format/Cargo.toml
+++ b/testsuite/generate-format/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-rand = "0.7.3"
+rand = "0.8.4"
 serde = { version = "1.0.117", features = ["derive"] }
 serde-reflection = "0.3.2"
 serde_yaml = "0.8.14"
diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml
index 2124a605e1dc..62c184533665 100644
--- a/testsuite/smoke-test/Cargo.toml
+++ b/testsuite/smoke-test/Cargo.toml
@@ -15,7 +15,7 @@ hex = "0.4.2"
 once_cell = "1.4.1"
 num = "0.3.0"
 num-traits = "0.2.14"
-rand = "0.7.3"
+rand = "0.8.4"
 regex = "1.4.2"
 rust_decimal = "1.8.1"
 rusty-fork = "0.3.0"
diff --git a/types/Cargo.toml b/types/Cargo.toml
index a57729c27d59..a2472545ef51 100644
--- a/types/Cargo.toml
+++ b/types/Cargo.toml
@@ -19,7 +19,7 @@ once_cell = "1.4.1"
 mirai-annotations = "1.10.1"
 proptest = { version = "0.10.1", default-features = false, optional = true }
 proptest-derive = { version = "0.2.0", default-features = false, optional = true }
-rand = "0.7.3"
+rand = "0.8.4"
 serde = { version = "1.0.117", default-features = false }
 serde_json = "1.0.60"
 serde_bytes = "0.11.5"
diff --git a/vm-validator/Cargo.toml b/vm-validator/Cargo.toml
index eea90c4a1a04..94689116fbac 100644
--- a/vm-validator/Cargo.toml
+++ b/vm-validator/Cargo.toml
@@ -20,7 +20,7 @@ diem-vm = { path = "../language/diem-vm", version = "0.1.0" }
 diem-workspace-hack = { path = "../common/workspace-hack", version = "0.1.0" }
 
 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.4"
 
 executor = { path = "../execution/executor", version = "0.1.0" }
 executor-test-helpers = { path = "../execution/executor-test-helpers", version = "0.1.0" }