diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44f1efe..8a9e50b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,13 @@
 
 - Upgrade presage (this will force relinking the device, due to incompatible changes) ([#182])
 
+### Fixed
+
+-  Use maintenance fixed branch of presage with updated root CA ([#189], [#190])
+
 [#182]: https://github.com/boxdot/gurk-rs/pull/182
+[#189]: https://github.com/boxdot/gurk-rs/pull/189
+[#190]: https://github.com/boxdot/gurk-rs/pull/190
 
 ## 0.2.5
 
diff --git a/Cargo.lock b/Cargo.lock
index eed38a6..348b4fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1310,7 +1310,7 @@ checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
 [[package]]
 name = "libsignal-protocol"
 version = "0.1.0"
-source = "git+https://github.com/signalapp/libsignal-client?tag=v0.17.0#2c32fb802d1f8d6739ade32901a3f5d84e7ec19b"
+source = "git+https://github.com/signalapp/libsignal?tag=v0.20.0#ab29fed4db04a5335f8a0d1ea03b7a83b93776d2"
 dependencies = [
  "aes",
  "aes-gcm-siv",
@@ -1338,7 +1338,7 @@ dependencies = [
 [[package]]
 name = "libsignal-service"
 version = "0.1.0"
-source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=f9b54478c5413252e810089fd9648b6351bcc3bf#f9b54478c5413252e810089fd9648b6351bcc3bf"
+source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8666ba56f47e405aaf8ed243be6e2ad1b5ad68c1#8666ba56f47e405aaf8ed243be6e2ad1b5ad68c1"
 dependencies = [
  "aes",
  "aes-gcm",
@@ -1356,11 +1356,11 @@ dependencies = [
  "libsignal-protocol",
  "log",
  "phonenumber",
- "pin-project",
  "prost 0.10.4",
  "prost-build 0.10.4",
  "rand 0.7.3",
  "serde",
+ "serde_json",
  "sha2 0.10.5",
  "thiserror",
  "url",
@@ -1371,7 +1371,7 @@ dependencies = [
 [[package]]
 name = "libsignal-service-hyper"
 version = "0.1.0"
-source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=f9b54478c5413252e810089fd9648b6351bcc3bf#f9b54478c5413252e810089fd9648b6351bcc3bf"
+source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8666ba56f47e405aaf8ed243be6e2ad1b5ad68c1#8666ba56f47e405aaf8ed243be6e2ad1b5ad68c1"
 dependencies = [
  "async-trait",
  "async-tungstenite",
@@ -1904,26 +1904,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "pin-project"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.9"
@@ -1939,7 +1919,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 [[package]]
 name = "poksho"
 version = "0.7.0"
-source = "git+https://github.com/signalapp/libsignal-client?tag=v0.17.0#2c32fb802d1f8d6739ade32901a3f5d84e7ec19b"
+source = "git+https://github.com/signalapp/libsignal?tag=v0.20.0#ab29fed4db04a5335f8a0d1ea03b7a83b93776d2"
 dependencies = [
  "curve25519-dalek",
  "hmac 0.11.0",
@@ -1981,7 +1961,7 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 [[package]]
 name = "presage"
 version = "0.3.0"
-source = "git+https://github.com/whisperfish/presage?rev=3e03d88#3e03d8882119aa370fe5c15dc9c2e31526aef0c4"
+source = "git+https://github.com/whisperfish/presage?rev=f84d958#f84d9580e894c480dd9fcecb6de4159b85e6965b"
 dependencies = [
  "async-trait",
  "base64 0.12.3",
@@ -3210,9 +3190,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
 name = "uuid"
-version = "0.8.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83"
 dependencies = [
  "getrandom 0.2.7",
  "serde",
@@ -3643,7 +3623,7 @@ dependencies = [
 [[package]]
 name = "zkgroup"
 version = "0.9.0"
-source = "git+https://github.com/signalapp/libsignal-client?tag=v0.17.0#2c32fb802d1f8d6739ade32901a3f5d84e7ec19b"
+source = "git+https://github.com/signalapp/libsignal?tag=v0.20.0#ab29fed4db04a5335f8a0d1ea03b7a83b93776d2"
 dependencies = [
  "aead",
  "aes-gcm-siv",
diff --git a/Cargo.toml b/Cargo.toml
index fbe3178..d3031a0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ debug = 0
 lto = "thin"
 
 [dependencies]
-presage = { git = "https://github.com/whisperfish/presage", rev = "3e03d88", default-features = false, features = ["sled-config-store"] }
+presage = { git = "https://github.com/whisperfish/presage", rev = "f84d958", default-features = false, features = ["sled-config-store"] }
 
 anyhow = "1.0.40"
 async-trait = "0.1.51"
@@ -48,9 +48,9 @@ textwrap = "0.14.2"
 tokio = { version = "1.5.0", default-features = false, features = ["rt-multi-thread", "macros", "net", "time"] }
 tokio-stream = "0.1.5"
 toml = "0.5.8"
-tui = {version = "0.15.0", default-features = false, features = ["crossterm"]}
+tui = { version = "0.15.0", default-features = false, features = ["crossterm"] }
 unicode-width = "0.1.8"
-uuid = "0.8.2"
+uuid = "1.2"
 whoami = "1.1.2"
 tracing = "0.1.35"
 tracing-appender = "0.2.2"
@@ -62,7 +62,7 @@ qr2term = "0.3.0"
 quickcheck = "1.0.3"
 quickcheck_macros = "1.0.0"
 tempfile = "3.2.0"
-uuid = { version = "0.8.2", features = ["v4"] }
+uuid = { version = "1.2", features = ["v4"] }
 
 # [patch."https://github.com/whisperfish/presage.git"]
 # presage = { path = "../presage" }