diff --git a/Cargo.lock b/Cargo.lock
index 4a49d51481..7dc8f42013 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -848,8 +848,8 @@ dependencies = [
 name = "ckb-fixed-hash-core"
 version = "0.114.0-pre"
 dependencies = [
+ "ckb_schemars",
  "faster-hex",
- "schemars",
  "serde",
  "serde_json",
  "thiserror",
@@ -944,11 +944,11 @@ name = "ckb-jsonrpc-types"
 version = "0.114.0-pre"
 dependencies = [
  "ckb-types",
+ "ckb_schemars",
  "faster-hex",
  "lazy_static",
  "proptest",
  "regex",
- "schemars",
  "serde",
  "serde_json",
 ]
@@ -1373,13 +1373,13 @@ dependencies = [
  "ckb-util",
  "ckb-verification",
  "ckb-verification-traits",
+ "ckb_schemars",
  "futures-util",
  "itertools 0.11.0",
  "jsonrpc-core",
  "jsonrpc-utils",
  "pretty_assertions",
  "reqwest",
- "schemars",
  "serde",
  "serde_json",
  "tempfile",
@@ -1393,7 +1393,7 @@ name = "ckb-rpc-gen"
 version = "0.114.0-pre"
 dependencies = [
  "ckb-rpc",
- "schemars",
+ "ckb_schemars",
  "serde_json",
  "tera",
 ]
@@ -1753,6 +1753,30 @@ dependencies = [
  "paste",
 ]
 
+[[package]]
+name = "ckb_schemars"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "160bd7cb5051a4bd6fe80a3c3e794cd26864dba70360d0e5ea34e21a71d7e4a3"
+dependencies = [
+ "ckb_schemars_derive",
+ "dyn-clone",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "ckb_schemars_derive"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4003e04a097903cf2d96d20f5c587c5f744cdef972ce8029bd30a4674634c9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "clang-sys"
 version = "1.6.1"
@@ -4380,28 +4404,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "schemars"
-version = "0.8.15"
-source = "git+https://github.com/chenyukang/schemars?branch=fix-derive#14f903b40cd7ae1e6e3c707179af7e82d6ae8ae1"
-dependencies = [
- "dyn-clone",
- "schemars_derive",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.15"
-source = "git+https://github.com/chenyukang/schemars?branch=fix-derive#14f903b40cd7ae1e6e3c707179af7e82d6ae8ae1"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
diff --git a/devtools/doc/rpc-gen/Cargo.toml b/devtools/doc/rpc-gen/Cargo.toml
index 5b7621249c..d71f1ed21c 100644
--- a/devtools/doc/rpc-gen/Cargo.toml
+++ b/devtools/doc/rpc-gen/Cargo.toml
@@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb"
 
 [dependencies]
 ckb-rpc ={ path = "../../../rpc", version = "= 0.114.0-pre" }
-schemars = { git = "https://github.com/chenyukang/schemars", branch = "fix-derive" }
+schemars = { version = "0.8.16", package = "ckb_schemars" }
 serde_json = "~1.0"
 tera = "1"
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 70a9d2933d..9493c673bb 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -49,7 +49,7 @@ tower-http = { version = "0.3.5", features = ["timeout", "cors"] }
 async-stream = "0.3.3"
 ckb-async-runtime = { path = "../util/runtime", version = "= 0.114.0-pre" }
 # issue tracking: https://github.com/GREsau/schemars/pull/251
-schemars = { git = "https://github.com/chenyukang/schemars", branch = "fix-derive" }
+schemars = { version = "0.8.16", package = "ckb_schemars" }
 
 [dev-dependencies]
 reqwest = { version = "=0.11.20", features = ["blocking", "json"] }
diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml
index 74f83e2582..9d94a821f7 100644
--- a/util/fixed-hash/core/Cargo.toml
+++ b/util/fixed-hash/core/Cargo.toml
@@ -12,7 +12,8 @@ repository = "https://github.com/nervosnetwork/ckb"
 thiserror = "1.0.22"
 serde = { version = "1.0", features = ["derive"] }
 faster-hex = "0.6"
-schemars = { git = "https://github.com/chenyukang/schemars", branch = "fix-derive"}
+schemars = { version = "0.8.16", package = "ckb_schemars" }
+
 
 
 [dev-dependencies]
diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml
index b4d52cecea..b1c816e029 100644
--- a/util/jsonrpc-types/Cargo.toml
+++ b/util/jsonrpc-types/Cargo.toml
@@ -13,7 +13,8 @@ ckb-types = { path = "../types", version = "= 0.114.0-pre" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 faster-hex = "0.6"
-schemars = { git = "https://github.com/chenyukang/schemars", branch = "fix-derive"}
+schemars = { version = "0.8.16", package = "ckb_schemars" }
+
 
 [dev-dependencies]
 proptest = "1.0"