diff --git a/Cargo.lock b/Cargo.lock
index 80ccfc5..5c281ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -208,7 +208,7 @@ dependencies = [
 
 [[package]]
 name = "codectrl"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "anyhow",
  "backtrace",
@@ -224,13 +224,39 @@ dependencies = [
  "tonic",
 ]
 
+[[package]]
+name = "codectrl-bindings-native"
+version = "0.0.0"
+source = "git+https://github.com/Authentura/codectrl-rust-protobuf-bindings?rev=943b27b6497b65f848fe9d90149704bc00ec4cec#943b27b6497b65f848fe9d90149704bc00ec4cec"
+dependencies = [
+ "prost",
+ "prost-build",
+ "serde",
+ "tonic",
+ "tonic-build",
+ "uuid",
+]
+
+[[package]]
+name = "codectrl-bindings-web"
+version = "0.0.0"
+source = "git+https://github.com/Authentura/codectrl-rust-protobuf-bindings?rev=943b27b6497b65f848fe9d90149704bc00ec4cec#943b27b6497b65f848fe9d90149704bc00ec4cec"
+dependencies = [
+ "prost",
+ "prost-build",
+ "serde",
+ "tonic",
+ "tonic-build",
+ "uuid",
+]
+
 [[package]]
 name = "codectrl-protobuf-bindings"
-version = "0.8.0"
-source = "git+https://github.com/Authentura/codectrl-rust-protobuf-bindings?tag=v0.8.2#d4bbbc63d9b9a6d73c60126978c915bfacde6822"
+version = "0.8.2"
+source = "git+https://github.com/Authentura/codectrl-rust-protobuf-bindings?rev=943b27b6497b65f848fe9d90149704bc00ec4cec#943b27b6497b65f848fe9d90149704bc00ec4cec"
 dependencies = [
- "native",
- "web",
+ "codectrl-bindings-native",
+ "codectrl-bindings-web",
 ]
 
 [[package]]
@@ -568,19 +594,6 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
-[[package]]
-name = "native"
-version = "0.0.0"
-source = "git+https://github.com/Authentura/codectrl-rust-protobuf-bindings?tag=v0.8.2#d4bbbc63d9b9a6d73c60126978c915bfacde6822"
-dependencies = [
- "prost",
- "prost-build",
- "serde",
- "tonic",
- "tonic-build",
- "uuid",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -931,16 +944,16 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.19.2"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
+checksum = "664cf6576f16c0ad68184998f3c2d4be9903ede6b291a5b5cfc97d29e0057283"
 dependencies = [
+ "autocfg",
  "bytes",
  "libc",
  "memchr",
  "mio",
  "num_cpus",
- "once_cell",
  "pin-project-lite",
  "socket2",
  "tokio-macros",
@@ -1242,19 +1255,6 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
-[[package]]
-name = "web"
-version = "0.0.0"
-source = "git+https://github.com/Authentura/codectrl-rust-protobuf-bindings?tag=v0.8.2#d4bbbc63d9b9a6d73c60126978c915bfacde6822"
-dependencies = [
- "prost",
- "prost-build",
- "serde",
- "tonic",
- "tonic-build",
- "uuid",
-]
-
 [[package]]
 name = "which"
 version = "4.2.5"
diff --git a/Cargo.toml b/Cargo.toml
index 9c1cda5..44adfdd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,11 +23,11 @@ futures-util = "0.3"
 hashbag = "0.1.9"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
-tokio = { version = "1.18", features = ["net", "rt-multi-thread", "io-util"] }
+tokio = { version = "1.20", features = ["net", "rt-multi-thread", "io-util"] }
 tonic = "0.7"
 
 [dev-dependencies]
 anyhow = "1.0"
-tokio = { version = "1.18", features = ["net", "rt-multi-thread", "io-util"] }
+tokio = { version = "1.20", features = ["net", "rt-multi-thread", "io-util"] }
 chrono = "0.4"
 rand = "0.8"