diff --git a/Cargo.lock b/Cargo.lock
index 390a1b4..e2fe18a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,7 +14,7 @@ dependencies = [
  "futures-sink",
  "log",
  "pin-project 0.4.30",
- "tokio",
+ "tokio 0.2.25",
  "tokio-util",
 ]
 
@@ -119,7 +119,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "smallvec",
- "tokio",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -549,7 +549,7 @@ dependencies = [
  "serde 1.0.148",
  "serde_json",
  "shared-expiry-get",
- "tokio",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -749,7 +749,7 @@ dependencies = [
 
 [[package]]
 name = "dino-park-lookout"
-version = "0.3.4"
+version = "0.3.6"
 dependencies = [
  "actix-rt",
  "actix-web",
@@ -768,7 +768,7 @@ dependencies = [
  "serde 1.0.148",
  "serde_derive",
  "serde_json",
- "tokio",
+ "tokio 1.18.5",
  "url",
 ]
 
@@ -793,8 +793,8 @@ dependencies = [
 
 [[package]]
 name = "dino_park_gate"
-version = "0.8.4"
-source = "git+https://github.com/mozilla-iam/dino-park-gate?tag=0.8.4#0be75bc14730f65f41bb87751d8d890cd3167498"
+version = "0.8.5"
+source = "git+https://github.com/mozilla-iam/dino-park-gate?tag=0.8.5#5b4a64f7a42b0de956f55ccc9ab384ca38556c80"
 dependencies = [
  "actix-service",
  "actix-web",
@@ -1130,7 +1130,7 @@ dependencies = [
  "http",
  "indexmap",
  "slab",
- "tokio",
+ "tokio 0.2.25",
  "tokio-util",
  "tracing",
  "tracing-futures",
@@ -1244,7 +1244,7 @@ dependencies = [
  "itoa 0.4.8",
  "pin-project 1.0.12",
  "socket2",
- "tokio",
+ "tokio 0.2.25",
  "tower-service",
  "tracing",
  "want",
@@ -1259,7 +1259,7 @@ dependencies = [
  "bytes 0.5.6",
  "hyper",
  "native-tls",
- "tokio",
+ "tokio 0.2.25",
  "tokio-tls",
 ]
 
@@ -2056,7 +2056,7 @@ dependencies = [
  "serde 1.0.148",
  "serde_json",
  "serde_urlencoded",
- "tokio",
+ "tokio 0.2.25",
  "tokio-tls",
  "url",
  "wasm-bindgen",
@@ -2114,7 +2114,7 @@ dependencies = [
  "rustc_version 0.2.3",
  "serde 1.0.148",
  "serde_json",
- "tokio",
+ "tokio 0.2.25",
  "xml-rs",
 ]
 
@@ -2134,7 +2134,7 @@ dependencies = [
  "serde 1.0.148",
  "serde_json",
  "shlex",
- "tokio",
+ "tokio 0.2.25",
  "zeroize",
 ]
 
@@ -2160,7 +2160,7 @@ dependencies = [
  "serde 1.0.148",
  "sha2",
  "time 0.2.27",
- "tokio",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -2684,6 +2684,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "tokio"
+version = "1.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e050c618355082ae5a89ec63bbf897225d5ffe84c7c4e036874e4d185a5044e"
+dependencies = [
+ "pin-project-lite 0.2.9",
+]
+
 [[package]]
 name = "tokio-macros"
 version = "0.2.6"
@@ -2702,7 +2711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
 dependencies = [
  "native-tls",
- "tokio",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -2716,7 +2725,7 @@ dependencies = [
  "futures-sink",
  "log",
  "pin-project-lite 0.1.12",
- "tokio",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -2781,7 +2790,7 @@ dependencies = [
  "rand",
  "smallvec",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "url",
 ]
 
@@ -2800,7 +2809,7 @@ dependencies = [
  "resolv-conf",
  "smallvec",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "trust-dns-proto",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 9ec15ce..c9533d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,4 +23,4 @@ failure = "0.1"
 failure_derive = "0.1"
 biscuit = "0.4"
 url = "2.1"
-tokio = "0.2"
+tokio = "1.18"