diff --git a/Cargo.lock b/Cargo.lock
index 0612acee16de..61a487bc4f75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1716,6 +1716,12 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c429fffa658f288669529fc26565f728489a2e39bc7b24a428aaaf51355182e"
 
+[[package]]
+name = "ioctl-sys"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c"
+
 [[package]]
 name = "ipconfig"
 version = "0.3.2"
@@ -1743,6 +1749,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ipnetwork"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "iprange"
 version = "0.6.7"
@@ -2140,7 +2155,7 @@ dependencies = [
  "futures",
  "http 0.2.12",
  "hyper 0.14.28",
- "ipnetwork",
+ "ipnetwork 0.16.0",
  "libc",
  "log",
  "mullvad-fs",
@@ -2265,7 +2280,7 @@ name = "mullvad-jni"
 version = "0.0.0"
 dependencies = [
  "futures",
- "ipnetwork",
+ "ipnetwork 0.16.0",
  "jnix",
  "log",
  "log-panics",
@@ -2352,7 +2367,7 @@ version = "0.0.0"
 dependencies = [
  "chrono",
  "intersection-derive",
- "ipnetwork",
+ "ipnetwork 0.16.0",
  "itertools 0.12.1",
  "log",
  "mullvad-types",
@@ -2391,7 +2406,7 @@ dependencies = [
  "chrono",
  "clap",
  "intersection-derive",
- "ipnetwork",
+ "ipnetwork 0.16.0",
  "log",
  "once_cell",
  "regex",
@@ -2820,14 +2835,12 @@ dependencies = [
 [[package]]
 name = "pfctl"
 version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27590368dee28aa01e3024b639818a6bf0ad31635d9eca000aad63021a59284d"
+source = "git+https://github.com/mullvad/pfctl-rs?branch=remove-error-chain#c6a87e2dad3bd0ded0115273a88dcb53936237d0"
 dependencies = [
  "derive_builder",
- "errno 0.2.8",
  "error-chain",
- "ioctl-sys",
- "ipnetwork",
+ "ioctl-sys 0.8.0",
+ "ipnetwork 0.20.0",
  "libc",
 ]
 
@@ -3883,7 +3896,7 @@ dependencies = [
  "hickory-proto",
  "hickory-server",
  "inotify 0.10.2",
- "ipnetwork",
+ "ipnetwork 0.16.0",
  "jnix",
  "libc",
  "log",
@@ -4008,7 +4021,7 @@ version = "0.0.0"
 dependencies = [
  "bitflags 2.5.0",
  "futures",
- "ipnetwork",
+ "ipnetwork 0.16.0",
  "libc",
  "log",
  "netlink-packet-route",
@@ -4040,7 +4053,7 @@ dependencies = [
  "cfg-if",
  "duct",
  "futures",
- "ipnetwork",
+ "ipnetwork 0.16.0",
  "jnix",
  "log",
  "nix 0.23.2",
@@ -4078,7 +4091,7 @@ name = "talpid-types"
 version = "0.0.0"
 dependencies = [
  "base64 0.22.0",
- "ipnetwork",
+ "ipnetwork 0.16.0",
  "jnix",
  "log",
  "serde",
@@ -4109,7 +4122,7 @@ dependencies = [
  "futures",
  "hex",
  "internet-checksum",
- "ipnetwork",
+ "ipnetwork 0.16.0",
  "libc",
  "log",
  "maybenot",
@@ -4480,7 +4493,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "futures-core",
- "ioctl-sys",
+ "ioctl-sys 0.6.0",
  "libc",
  "thiserror",
  "tokio",
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 66b22563df62..f8036a33993a 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -48,7 +48,7 @@ duct = "0.13"
 [target.'cfg(target_os = "macos")'.dependencies]
 async-trait = "0.1"
 duct = "0.13"
-pfctl = "0.4.6"
+pfctl = { git = "https://github.com/mullvad/pfctl-rs", branch = "remove-error-chain" }
 subslice = "0.2"
 system-configuration = "0.5.1"
 hickory-proto = "0.24.1"