diff --git a/Cargo.lock b/Cargo.lock
index ed1a2b144..717d8cd37 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,7 +23,7 @@ dependencies = [
 [[package]]
 name = "aggregator"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "ark-std",
  "env_logger 0.10.0",
@@ -419,7 +419,7 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 [[package]]
 name = "bus-mapping"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "eth-types",
  "ethers-core 0.17.0",
@@ -1122,7 +1122,7 @@ dependencies = [
 [[package]]
 name = "eth-types"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "ethers-core 0.17.0",
  "ethers-signers",
@@ -1387,7 +1387,7 @@ dependencies = [
 [[package]]
 name = "external-tracer"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "eth-types",
  "geth-utils",
@@ -1600,7 +1600,7 @@ dependencies = [
 [[package]]
 name = "gadgets"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "digest 0.7.6",
  "eth-types",
@@ -1640,7 +1640,7 @@ dependencies = [
 [[package]]
 name = "geth-utils"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "env_logger 0.9.3",
  "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)",
@@ -1738,7 +1738,7 @@ dependencies = [
 [[package]]
 name = "halo2-base"
 version = "0.2.2"
-source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#2c225864227e74b207d9f4b9e08c4d5f1afc69a1"
+source = "git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0#2c225864227e74b207d9f4b9e08c4d5f1afc69a1"
 dependencies = [
  "ff",
  "halo2_proofs",
@@ -1753,7 +1753,7 @@ dependencies = [
 [[package]]
 name = "halo2-ecc"
 version = "0.2.2"
-source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#2c225864227e74b207d9f4b9e08c4d5f1afc69a1"
+source = "git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0#2c225864227e74b207d9f4b9e08c4d5f1afc69a1"
 dependencies = [
  "ff",
  "group",
@@ -1788,7 +1788,7 @@ dependencies = [
 [[package]]
 name = "halo2-mpt-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.5#2163a9c436ed85363c954ecf7e6e1044a1b991dc"
+source = "git+https://github.com/scroll-tech/mpt-circuit.git?tag=v0.5.0#1c11b6c9b1245073a76c3ce7100b6798060f7cb8"
 dependencies = [
  "ethers-core 0.17.0",
  "halo2_proofs",
@@ -2246,7 +2246,7 @@ dependencies = [
 [[package]]
 name = "keccak256"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "env_logger 0.9.3",
  "eth-types",
@@ -2446,7 +2446,7 @@ dependencies = [
 [[package]]
 name = "mock"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "eth-types",
  "ethers-core 0.17.0",
@@ -2461,7 +2461,7 @@ dependencies = [
 [[package]]
 name = "mpt-zktrie"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "bus-mapping",
  "eth-types",
@@ -3820,7 +3820,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 [[package]]
 name = "snark-verifier"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#100127726ac210226ac1096767e0efc5230775e3"
+source = "git+https://github.com/scroll-tech/snark-verifier?tag=v0.1.1#11a09d4a37c31c659b29e2dac0ceb544a776ad7b"
 dependencies = [
  "bytes",
  "ethereum-types 0.14.1",
@@ -3844,7 +3844,7 @@ dependencies = [
 [[package]]
 name = "snark-verifier-sdk"
 version = "0.0.1"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#100127726ac210226ac1096767e0efc5230775e3"
+source = "git+https://github.com/scroll-tech/snark-verifier?tag=v0.1.1#11a09d4a37c31c659b29e2dac0ceb544a776ad7b"
 dependencies = [
  "bincode",
  "env_logger 0.10.0",
@@ -4712,7 +4712,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 [[package]]
 name = "zkevm-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911"
 dependencies = [
  "array-init",
  "bus-mapping",
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
index 07e71a9ba..fea7b5b4c 100644
--- a/prover/Cargo.toml
+++ b/prover/Cargo.toml
@@ -8,15 +8,15 @@ edition = "2021"
 [dependencies]
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
 
-aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.16" }
-bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.16" }
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.16" }
-zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.16", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] }
-mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.16" }
-mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.16" }
+aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" }
+bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" }
+zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] }
+mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" }
+mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" }
 
-snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }
-snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }
+snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.1" }
+snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.1" }
 
 anyhow = "1.0"
 blake2 = "0.10.3"
diff --git a/types/Cargo.toml b/types/Cargo.toml
index 6febf7603..63ef574e4 100644
--- a/types/Cargo.toml
+++ b/types/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.4.0"
 edition = "2021"
 
 [dependencies]
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.16" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" }
 base64 = "0.13.0"
 blake2 = "0.10.3"
 ethers-core = "0.17.0"