diff --git a/Cargo.lock b/Cargo.lock
index 413eae6..bf3d144 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -97,7 +97,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "chiptool"
 version = "0.1.0"
-source = "git+https://github.com/embassy-rs/chiptool?rev=67c6adc50306696e664ba5f71cd4db9d6dd9c46b#67c6adc50306696e664ba5f71cd4db9d6dd9c46b"
+source = "git+https://github.com/embassy-rs/chiptool?rev=02386dc0f5cc9fc24ab6278054f05755266af59e#02386dc0f5cc9fc24ab6278054f05755266af59e"
 dependencies = [
  "anyhow",
  "clap",
@@ -711,8 +711,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 [[package]]
 name = "svd-parser"
 version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d17a2c2ef5aa450e80d714232a5932e7d8a39cac092e9e9ef8411bc833de3c4"
+source = "git+https://github.com/Dirbaio/svd.git?rev=43f95cec2f7ec987c6e7e2c3613bcbb8d4f9efdf#43f95cec2f7ec987c6e7e2c3613bcbb8d4f9efdf"
 dependencies = [
  "anyhow",
  "roxmltree",
@@ -723,8 +722,7 @@ dependencies = [
 [[package]]
 name = "svd-rs"
 version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c82f375efa1d0145467e6cc98fa0e4e1a3f3d497cece4bcdda247f4904a77d4"
+source = "git+https://github.com/Dirbaio/svd.git?rev=43f95cec2f7ec987c6e7e2c3613bcbb8d4f9efdf#43f95cec2f7ec987c6e7e2c3613bcbb8d4f9efdf"
 dependencies = [
  "once_cell",
  "regex",
diff --git a/stm32-data-gen/Cargo.toml b/stm32-data-gen/Cargo.toml
index 4eb95f4..840f6b8 100644
--- a/stm32-data-gen/Cargo.toml
+++ b/stm32-data-gen/Cargo.toml
@@ -17,7 +17,7 @@ quick-xml = { version = "0.26.0", features = ["serialize"] }
 regex = "1.7.1"
 serde = { version = "1.0.157", features = ["derive"] }
 serde_yaml = "0.9.19"
-chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "67c6adc50306696e664ba5f71cd4db9d6dd9c46b" }
+chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "02386dc0f5cc9fc24ab6278054f05755266af59e" }
 serde_json = "1.0.94"
 rayon = { version = "1.7.0", optional = true }
 stm32-data-serde = { version = "0.1.0", path = "../stm32-data-serde" }
diff --git a/stm32-metapac-gen/Cargo.toml b/stm32-metapac-gen/Cargo.toml
index fc5c430..54e674f 100644
--- a/stm32-metapac-gen/Cargo.toml
+++ b/stm32-metapac-gen/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 regex = "1.7.1"
-chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "67c6adc50306696e664ba5f71cd4db9d6dd9c46b" }
+chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "02386dc0f5cc9fc24ab6278054f05755266af59e" }
 serde = { version = "1.0.157", features = [ "derive" ] }
 serde_json = "1.0.94"
 proc-macro2 = "1.0.52"