diff --git a/Cargo.toml b/Cargo.toml
index e3fd1679316..c157a6518c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,8 +17,8 @@ members = [
 ]
 
 [patch.crates-io]
-mio = { git = "https://github.com/vn971/mio", branch = "raoul/sgx-port-0.8.9" }
-enclave-runner = { git = "https://github.com/vn971/rust-sgx", branch = "vas/async-usercalls-scratch" }
-sgxs = { git = "https://github.com/vn971/rust-sgx", branch = "vas/async-usercalls-scratch" }
-sgx-isa = { git = "https://github.com/vn971/rust-sgx", branch = "vas/async-usercalls-scratch" }
-sgxs-loaders = { git = "https://github.com/vn971/rust-sgx", branch = "vas/async-usercalls-scratch" }
+mio = { git = "https://github.com/fortanix/mio", branch = "raoul/sgx-port-0.8.9" }
+enclave-runner = { git = "https://github.com/fortanix/rust-sgx", branch = "master" }
+sgxs = { git = "https://github.com/fortanix/rust-sgx", branch = "master" }
+sgx-isa = { git = "https://github.com/fortanix/rust-sgx", branch = "master" }
+sgxs-loaders = { git = "https://github.com/fortanix/rust-sgx", branch = "master" }
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index fba32746a88..f77d2e9cdb2 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -179,7 +179,7 @@ features = ["full", "test-util"]
 
 # set number of threads so tests can run properly
 [package.metadata.fortanix-sgx]
-threads=100
-heap-size=0x4000000
-stack-size=0x40000
+threads = 100
+heap-size = 0x4000000
+stack-size = 0x40000
 runner = "enclave-runner"