diff --git a/Cargo.lock b/Cargo.lock
index ea72f572da..1e2a72d13d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -384,9 +384,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
 [[package]]
 name = "bzip2"
@@ -4892,8 +4892,7 @@ checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 [[package]]
 name = "uniffi"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8c6dec3fc6645f71a16a3fa9ff57991028153bd194ca97f4b55e610c73ce66a"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "anyhow",
  "camino",
@@ -4921,8 +4920,7 @@ dependencies = [
 [[package]]
 name = "uniffi_bindgen"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "anyhow",
  "askama",
@@ -4947,8 +4945,7 @@ dependencies = [
 [[package]]
 name = "uniffi_build"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b78fd9271a4c2e85bd2c266c5a9ede1fac676eb39fd77f636c27eaf67426fd5f"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "anyhow",
  "camino",
@@ -4958,8 +4955,7 @@ dependencies = [
 [[package]]
 name = "uniffi_core"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0ef62e69762fbb9386dcb6c87cd3dd05d525fa8a3a579a290892e60ddbda47e"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "anyhow",
  "bytes",
@@ -4970,8 +4966,7 @@ dependencies = [
 [[package]]
 name = "uniffi_internal_macros"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "anyhow",
  "indexmap 2.5.0",
@@ -4983,8 +4978,7 @@ dependencies = [
 [[package]]
 name = "uniffi_macros"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db9d12529f1223d014fd501e5f29ca0884d15d6ed5ddddd9f506e55350327dc3"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "camino",
  "fs-err",
@@ -5000,8 +4994,7 @@ dependencies = [
 [[package]]
 name = "uniffi_meta"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -5012,8 +5005,7 @@ dependencies = [
 [[package]]
 name = "uniffi_pipeline"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "anyhow",
  "heck",
@@ -5025,8 +5017,7 @@ dependencies = [
 [[package]]
 name = "uniffi_udl"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "anyhow",
  "textwrap",
@@ -5389,8 +5380,7 @@ dependencies = [
 [[package]]
 name = "weedle2"
 version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "998d2c24ec099a87daf9467808859f9d82b61f1d9c9701251aea037f514eae0e"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
 dependencies = [
  "nom",
 ]
diff --git a/components/ads-client/Cargo.toml b/components/ads-client/Cargo.toml
index e423dd3159..58e1c0496e 100644
--- a/components/ads-client/Cargo.toml
+++ b/components/ads-client/Cargo.toml
@@ -23,7 +23,7 @@ serde = "1"
 serde_json = "1"
 thiserror = "2"
 once_cell = "1.5"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 url = { version = "2", features = ["serde"] }
 uuid = { version = "1.3", features = ["v4"] }
 viaduct = { path = "../viaduct" }
@@ -35,4 +35,4 @@ mockito = { version = "0.31", default-features = false }
 viaduct-dev = { path = "../support/viaduct-dev" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
diff --git a/components/as-ohttp-client/Cargo.toml b/components/as-ohttp-client/Cargo.toml
index e78ede4516..4d843f4a54 100644
--- a/components/as-ohttp-client/Cargo.toml
+++ b/components/as-ohttp-client/Cargo.toml
@@ -10,7 +10,7 @@ exclude = ["/ios"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 thiserror = "2"
 parking_lot = "0.12"
 rusqlite = { version = "0.37.0", features = ["bundled"] }
@@ -18,4 +18,4 @@ bhttp = "0.7.2"
 ohttp = { version = "0.7.2", default-features = false, features = ["client", "server", "app-svc", "external-sqlite"] }
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/components/autofill/Cargo.toml b/components/autofill/Cargo.toml
index 6e49d4ed15..138b510e6a 100644
--- a/components/autofill/Cargo.toml
+++ b/components/autofill/Cargo.toml
@@ -23,7 +23,7 @@ sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"
 sync15 = { path = "../sync15", features = ["sync-engine"] }
 thiserror = "2"
 types = { path = "../support/types" }
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 url = { version = "2.2", features = ["serde"] }
 
 [dev-dependencies]
@@ -32,4 +32,4 @@ nss = { path = "../support/rc_crypto/nss" }
 error-support = { path = "../support/error", features=["testing"] }
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/components/context_id/Cargo.toml b/components/context_id/Cargo.toml
index fe1e093df7..463f294116 100644
--- a/components/context_id/Cargo.toml
+++ b/components/context_id/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MPL-2.0"
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
 
 [dependencies]
 chrono = "0.4"
@@ -15,7 +15,7 @@ parking_lot = "0.12"
 serde = "1"
 serde_json = "1"
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 url = "2"
 uuid = { version = "1.3", features = ["v4"]}
 viaduct = { path = "../viaduct" }
diff --git a/components/crashtest/Cargo.toml b/components/crashtest/Cargo.toml
index 0e334cf0df..fa718d2e10 100644
--- a/components/crashtest/Cargo.toml
+++ b/components/crashtest/Cargo.toml
@@ -9,7 +9,7 @@ exclude = ["/android", "/ios"]
 [dependencies]
 log = "0.4"
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/components/example/Cargo.toml b/components/example/Cargo.toml
index 6cf6ed1caa..64fdc7fa34 100644
--- a/components/example/Cargo.toml
+++ b/components/example/Cargo.toml
@@ -12,7 +12,7 @@ license = "MPL-2.0"
 [dependencies]
 # UniFFI is a dependency for any shared Rust component, make the version match what the other
 # components are using.
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 # app-services support crates that you probably want to use.
 error-support = { path = "../support/error" }
 interrupt-support = { path = "../support/interrupt" }
diff --git a/components/filter_adult/Cargo.toml b/components/filter_adult/Cargo.toml
index a651e995fa..44a0326722 100644
--- a/components/filter_adult/Cargo.toml
+++ b/components/filter_adult/Cargo.toml
@@ -11,7 +11,7 @@ error-support = { path = "../support/error" }
 md-5 = "0.10"
 regex = "1"
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 
 [[bin]]
 name = "import-site-list"
diff --git a/components/fxa-client/Cargo.toml b/components/fxa-client/Cargo.toml
index ab6756f996..de28485d87 100644
--- a/components/fxa-client/Cargo.toml
+++ b/components/fxa-client/Cargo.toml
@@ -25,12 +25,12 @@ error-support = { path = "../support/error" }
 thiserror = "2"
 anyhow = "1.0"
 sync-guid = { path = "../support/guid", features = ["random"] }
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 payload-support = { path = "../support/payload" }
 nss = { path = "../support/rc_crypto/nss" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
 
 [dev-dependencies]
 viaduct-dev = { path = "../support/viaduct-dev"}
diff --git a/components/init_rust_components/Cargo.toml b/components/init_rust_components/Cargo.toml
index fc1cada208..19760c6acd 100644
--- a/components/init_rust_components/Cargo.toml
+++ b/components/init_rust_components/Cargo.toml
@@ -12,6 +12,6 @@ keydb = ["nss/keydb"]
 ohttp = ["dep:viaduct", "viaduct/ohttp"]
 
 [dependencies]
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 nss = { path = "../support/rc_crypto/nss" }
 viaduct = { path = "../viaduct", optional = true }
diff --git a/components/logins/Cargo.toml b/components/logins/Cargo.toml
index 66baf391cd..a105216ef0 100644
--- a/components/logins/Cargo.toml
+++ b/components/logins/Cargo.toml
@@ -29,12 +29,12 @@ rusqlite = { version = "0.37.0", features = ["limits", "unlock_notify"] }
 sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"] }
 thiserror = "2"
 anyhow = "1.0"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 async-trait = { version = "0.1", optional = true }
 futures = { version = "0.3", optional = true, features = ["executor"] }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
 
 [dev-dependencies]
 error-support = { path = "../support/error", features = ["testing"] }
diff --git a/components/merino/Cargo.toml b/components/merino/Cargo.toml
index 1d4985e45b..39cbed67c8 100644
--- a/components/merino/Cargo.toml
+++ b/components/merino/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 url = "2"
@@ -13,4 +13,4 @@ error-support = { path = "../support/error" }
 thiserror = "2"
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
diff --git a/components/nimbus/Cargo.toml b/components/nimbus/Cargo.toml
index c68dfa7641..f50ac2cdec 100644
--- a/components/nimbus/Cargo.toml
+++ b/components/nimbus/Cargo.toml
@@ -32,7 +32,7 @@ uuid = { version = "1.3", features = ["serde", "v4"]}
 sha2 = "^0.10"
 hex = "0.4"
 once_cell = "1"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 chrono = { version = "0.4", features = ["serde"]}
 icu_segmenter = "2"
 error-support = { path = "../support/error" }
@@ -42,7 +42,7 @@ regex = { version = "1.9", optional = true }
 firefox-versioning = { path = "../support/firefox-versioning", optional = true }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
 
 [dev-dependencies]
 error-support = { path = "../support/error", features = ["testing"] }
diff --git a/components/places/Cargo.toml b/components/places/Cargo.toml
index 0a98eae3d9..301e7d80f0 100644
--- a/components/places/Cargo.toml
+++ b/components/places/Cargo.toml
@@ -33,7 +33,7 @@ error-support = { path = "../support/error" }
 sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"]}
 thiserror = "2"
 anyhow = "1.0"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 
 [dev-dependencies]
 error-support = { path = "../support/error", features = ["testing"] }
@@ -41,4 +41,4 @@ tempfile = "3.1"
 sql-support = { path = "../support/sql" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/components/push/Cargo.toml b/components/push/Cargo.toml
index fb5f847049..d06985324f 100644
--- a/components/push/Cargo.toml
+++ b/components/push/Cargo.toml
@@ -19,11 +19,11 @@ error-support = { path = "../support/error" }
 sql-support = { path = "../support/sql" }
 rc_crypto = { path = "../support/rc_crypto", features = ["ece"] }
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 types = { path = "../support/types" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
 
 [dev-dependencies]
 error-support = { path = "../support/error", features = ["testing"] }
diff --git a/components/relay/Cargo.toml b/components/relay/Cargo.toml
index efd29a8174..10532bc048 100644
--- a/components/relay/Cargo.toml
+++ b/components/relay/Cargo.toml
@@ -12,7 +12,7 @@ serde_json = "1"
 thiserror = "2"
 url = "2"
 viaduct = { path = "../viaduct" }
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 
 [dev-dependencies]
 expect-test = "1.4"
@@ -20,4 +20,4 @@ mockito = { version = "0.31", default-features = false}
 viaduct-dev = { path = "../support/viaduct-dev"}
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/components/relevancy/Cargo.toml b/components/relevancy/Cargo.toml
index a680a904df..7f264a0402 100644
--- a/components/relevancy/Cargo.toml
+++ b/components/relevancy/Cargo.toml
@@ -21,13 +21,13 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_path_to_error = "0.1"
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 url = "2.5"
 remote_settings = { path = "../remote_settings"}
 base64 = "0.21.2"
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
 
 [lib]
 
diff --git a/components/remote_settings/Cargo.toml b/components/remote_settings/Cargo.toml
index ed975992bc..c8f90f91f0 100644
--- a/components/remote_settings/Cargo.toml
+++ b/components/remote_settings/Cargo.toml
@@ -15,7 +15,7 @@ signatures = ["dep:canonical_json", "dep:rc_crypto"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 thiserror = "2"
 serde = { version = "1", features=["derive"] }
 serde_json = "1"
@@ -35,7 +35,7 @@ canonical_json = { version = "0.5", optional = true }
 rc_crypto = { path = "../support/rc_crypto", optional = true }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
 
 [dev-dependencies]
 expect-test = "1.4"
diff --git a/components/search/Cargo.toml b/components/search/Cargo.toml
index deb4399825..5fb4bbe995 100644
--- a/components/search/Cargo.toml
+++ b/components/search/Cargo.toml
@@ -14,11 +14,11 @@ remote_settings = { path = "../remote_settings" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 firefox-versioning = { path = "../support/firefox-versioning" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
 
 [dev-dependencies]
 error-support = { path = "../support/error", features = ["testing"] }
diff --git a/components/suggest/Cargo.toml b/components/suggest/Cargo.toml
index 1d984f493d..18fd0bcc79 100644
--- a/components/suggest/Cargo.toml
+++ b/components/suggest/Cargo.toml
@@ -28,7 +28,7 @@ sql-support = { path = "../support/sql" }
 viaduct = { path = "../viaduct" }
 tempfile = { version = "3.2.0", optional = true }
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 url = { version = "2.1", features = ["serde"] }
 
 [dev-dependencies]
@@ -39,7 +39,7 @@ itertools = "0.14"
 rc_crypto = { path = "../support/rc_crypto" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
 
 [features]
 # Required for the benchmarks to work, wasted bytes otherwise.
diff --git a/components/support/error/Cargo.toml b/components/support/error/Cargo.toml
index de26a2ba2a..00f19b779f 100644
--- a/components/support/error/Cargo.toml
+++ b/components/support/error/Cargo.toml
@@ -16,10 +16,10 @@ log = { version = "0.4" }
 parking_lot = { version = ">=0.11,<=0.12" }
 tracing = { version = "0.1", optional = true }
 tracing-support = { path = "../tracing" }
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
 
 [features]
 backtrace = ["dep:backtrace"]
diff --git a/components/support/interrupt/Cargo.toml b/components/support/interrupt/Cargo.toml
index 814489a7f1..46314a3519 100644
--- a/components/support/interrupt/Cargo.toml
+++ b/components/support/interrupt/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 lazy_static = "1.4"
 parking_lot = ">=0.11,<=0.12"
 rusqlite = { version = "0.37.0", features = ["functions", "limits", "bundled", "unlock_notify"] }
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
diff --git a/components/support/nimbus-fml/Cargo.toml b/components/support/nimbus-fml/Cargo.toml
index 39991f9ee3..c103241ba2 100644
--- a/components/support/nimbus-fml/Cargo.toml
+++ b/components/support/nimbus-fml/Cargo.toml
@@ -23,7 +23,7 @@ name = "nimbus_fml"
 name = "nimbus-fml"
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"], optional = true }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"], optional = true }
 
 [dev-dependencies]
 tempfile = "3"
@@ -44,7 +44,7 @@ heck = "0.5"
 icu_segmenter = "2"
 url = { version = "2", features = ["serde"] }
 glob = "0.3.0"
-uniffi = { version = "0.31", optional = true }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", optional = true }
 cfg-if = "1.0.0"
 lazy_static = "1.4"
 sha2 = "^0.10"
diff --git a/components/support/rust-log-forwarder/Cargo.toml b/components/support/rust-log-forwarder/Cargo.toml
index 95bfd6d0f0..138593ba09 100644
--- a/components/support/rust-log-forwarder/Cargo.toml
+++ b/components/support/rust-log-forwarder/Cargo.toml
@@ -7,7 +7,7 @@ license = "MPL-2.0"
 exclude = ["/android", "/ios"]
 
 [dependencies]
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 error-support = { path = "../error", default-features = false }
 tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
 tracing-support = { path = "../tracing" }
@@ -16,4 +16,4 @@ tracing-support = { path = "../tracing" }
 tracing = "0.1"
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/components/support/tracing/Cargo.toml b/components/support/tracing/Cargo.toml
index 8a244ecf51..fdc4a8b3fe 100644
--- a/components/support/tracing/Cargo.toml
+++ b/components/support/tracing/Cargo.toml
@@ -9,10 +9,10 @@ parking_lot = "0.12"
 serde_json = "1"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 
 [dev-dependencies]
 tracing-subscriber = { version = "0.3", default-features = false }
 
 [build-dependencies]
-uniffi = { version = "0.31", features = ["build"] }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["build"] }
diff --git a/components/support/viaduct-hyper/Cargo.toml b/components/support/viaduct-hyper/Cargo.toml
index a1b5f832fe..e32d80fe0a 100644
--- a/components/support/viaduct-hyper/Cargo.toml
+++ b/components/support/viaduct-hyper/Cargo.toml
@@ -15,5 +15,5 @@ viaduct = { path = "../../viaduct" }
 hyper = { version = "0.14", features = ["client", "http1", "http2", "tcp"] }
 hyper-tls = { version = "0.5", features = ["vendored"] }
 tokio = { version = "1", features = ["rt-multi-thread"] }
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 url = "2"
diff --git a/components/sync15/Cargo.toml b/components/sync15/Cargo.toml
index e64268cb0b..235b03faad 100644
--- a/components/sync15/Cargo.toml
+++ b/components/sync15/Cargo.toml
@@ -59,7 +59,7 @@ serde_json = "1"
 serde_path_to_error = "0.1"
 sync-guid = { path = "../support/guid", features = ["random"] }
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 url = { version = "2", optional = true }
 viaduct = { path = "../viaduct", optional = true }
 
@@ -68,4 +68,4 @@ error-support = { path = "../support/error", features = ["testing"] }
 nss = { path = "../support/rc_crypto/nss" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/components/sync_manager/Cargo.toml b/components/sync_manager/Cargo.toml
index e4c0aba5c6..e6247ccd99 100644
--- a/components/sync_manager/Cargo.toml
+++ b/components/sync_manager/Cargo.toml
@@ -23,7 +23,7 @@ serde_derive = "1"
 serde_json = "1"
 parking_lot = ">=0.11,<=0.12"
 interrupt-support = { path = "../support/interrupt" }
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/components/tabs/Cargo.toml b/components/tabs/Cargo.toml
index ab0e747a3a..e57956f6de 100644
--- a/components/tabs/Cargo.toml
+++ b/components/tabs/Cargo.toml
@@ -20,7 +20,7 @@ sql-support = { path = "../support/sql" }
 sync-guid = { path = "../support/guid", features = ["random"] }
 sync15 = { path = "../sync15", features = ["sync-engine"] }
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 url = "2"
 types = { path = "../support/types" }
 
@@ -29,4 +29,4 @@ error-support = { path = "../support/error", features=["testing"] }
 tempfile = "3.1"
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/components/viaduct/Cargo.toml b/components/viaduct/Cargo.toml
index 2c56132f6d..3e7624b77c 100644
--- a/components/viaduct/Cargo.toml
+++ b/components/viaduct/Cargo.toml
@@ -21,7 +21,7 @@ pollster = "0.3.0"
 prost = "0.13"
 ffi-support = "0.4"
 thiserror = "2"
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 bhttp = { version = "0.7.2", optional = true }
 ohttp = { version = "0.7.2", features = ["client", "server", "app-svc", "external-sqlite"], default-features = false, optional = true }
 
diff --git a/components/webext-storage/Cargo.toml b/components/webext-storage/Cargo.toml
index 86ab35b089..423ac262bb 100644
--- a/components/webext-storage/Cargo.toml
+++ b/components/webext-storage/Cargo.toml
@@ -24,7 +24,7 @@ serde_derive = "1"
 sql-support = { path = "../support/sql" }
 sync15 = {path = "../../components/sync15", features=["sync-engine"]}
 sync-guid = { path = "../support/guid", features = ["rusqlite_support", "random"] }
-uniffi = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 url = { version = "2.1", features = ["serde"] }
 
 [dev-dependencies]
@@ -36,4 +36,4 @@ sql-support = { path = "../support/sql" }
 serde_json = { version = "1", features = ["preserve_order"] }
 
 [build-dependencies]
-uniffi = { version = "0.31", features=["build"]}
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features=["build"]}
diff --git a/tools/embedded-uniffi-bindgen/Cargo.toml b/tools/embedded-uniffi-bindgen/Cargo.toml
index 367a2c9300..21a3b478d7 100644
--- a/tools/embedded-uniffi-bindgen/Cargo.toml
+++ b/tools/embedded-uniffi-bindgen/Cargo.toml
@@ -15,5 +15,5 @@ glob = "0.3"
 toml = "0.5"
 clap = {version = "4.2", default-features = false, features = ["std", "derive"]}
 serde = { version = "1", features = ["derive"] }
-uniffi_bindgen = { version = "0.31" }
-uniffi_pipeline = { version = "0.31" }
+uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
+uniffi_pipeline = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
diff --git a/tools/uniffi-bindgen-library-mode/Cargo.toml b/tools/uniffi-bindgen-library-mode/Cargo.toml
index 6ead2cd818..bc55ff0a1a 100644
--- a/tools/uniffi-bindgen-library-mode/Cargo.toml
+++ b/tools/uniffi-bindgen-library-mode/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-uniffi = { version = "0.31", features = ["cli"] }
-uniffi_bindgen = { version = "0.31" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666", features = ["cli"] }
+uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
 clap = {version = "4.2", default-features = false, features = ["std", "derive"]}
 cargo_metadata = "0.19"
 camino = "1"