diff --git a/.gitignore b/.gitignore
index b153e470..8ccf3b09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,10 @@
 # Generated by Cargo
 # will have compiled files and executables
-/*/target/
-target/
+**/target
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
-/*/Cargo.lock
-Cargo.lock
+**/Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
diff --git a/async_data_factory/Cargo.toml b/async_data_factory/Cargo.toml
index 47f6d73c..f1b91312 100644
--- a/async_data_factory/Cargo.toml
+++ b/async_data_factory/Cargo.toml
@@ -3,13 +3,10 @@ name = "async_data_factory"
 version = "0.1.0"
 authors = ["fakeshadow <24548779@qq.com>"]
 edition = "2018"
-workspace = ".."
-
 
 [dependencies]
-actix-rt = "1.1.1"
-actix-web = { version = "2.0.0" }
-num_cpus = "1.13.0"
+actix-web = "3"
+num_cpus = "1.13"
 redis = { version = "0.16.0", default-features = false, features = ["tokio-rt-core"] }
 # redis_tang is an redis pool for test purpose
-redis_tang = "0.1.0"
+redis_tang = "0.1"
diff --git a/async_data_factory/src/main.rs b/async_data_factory/src/main.rs
index 007af704..0dcae4d4 100644
--- a/async_data_factory/src/main.rs
+++ b/async_data_factory/src/main.rs
@@ -3,7 +3,7 @@ use actix_web::{get, App, HttpServer};
 
 use redis_tang::{Builder, Pool, RedisManager};
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     let redis_url =
         std::env::var("REDIS_URL").unwrap_or_else(|_| String::from("redis://127.0.0.1"));
@@ -14,6 +14,7 @@ async fn main() -> std::io::Result<()> {
     let pool = pool_builder(num_cpus, redis_url.as_str())
         .await
         .expect("fail to build pool");
+
     let pool = RedisWrapper(pool);
 
     HttpServer::new(move || {
diff --git a/async_db/Cargo.toml b/async_db/Cargo.toml
index c1b75985..a632bff6 100644
--- a/async_db/Cargo.toml
+++ b/async_db/Cargo.toml
@@ -3,16 +3,13 @@ name = "async_db"
 version = "2.0.0"
 authors = ["Darin Gordon <dkcdkg@gmail.com>"]
 edition = "2018"
-workspace = ".."
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
-
+actix-web = "3"
 env_logger = "0.7"
 failure = "0.1.7"
 futures = "0.3.1"
-num_cpus = "1.10.0"
+num_cpus = "1.13"
 r2d2 = "0.8.2"
 r2d2_sqlite = "0.14"
 rusqlite = "0.21"
diff --git a/async_db/src/main.rs b/async_db/src/main.rs
index 66f368fc..a5e95c02 100644
--- a/async_db/src/main.rs
+++ b/async_db/src/main.rs
@@ -48,7 +48,7 @@ async fn parallel_weather(db: web::Data<Pool>) -> Result<HttpResponse, AWError>
     Ok(HttpResponse::Ok().json(result.map_err(AWError::from)?))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/async_ex1/Cargo.toml b/async_ex1/Cargo.toml
index d98a07c9..44d96530 100644
--- a/async_ex1/Cargo.toml
+++ b/async_ex1/Cargo.toml
@@ -3,12 +3,9 @@ name = "awc_examples"
 version = "2.0.0"
 authors = ["dowwie <dkcdkg@gmail.com>"]
 edition = "2018"
-workspace = ".."
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = { version="2.0.0", features=["openssl"] }
-
+actix-web = { version = "3", features = ["openssl"] }
 env_logger = "0.7"
 futures = "0.3.1"
 serde = { version = "1.0.43", features = ["derive"] }
diff --git a/async_ex1/src/main.rs b/async_ex1/src/main.rs
index 44c83b7a..ab72bcd3 100644
--- a/async_ex1/src/main.rs
+++ b/async_ex1/src/main.rs
@@ -80,7 +80,7 @@ async fn create_something(
         .body(serde_json::to_string(&d).unwrap()))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/async_ex2/Cargo.toml b/async_ex2/Cargo.toml
index 7c35badd..421b17fd 100644
--- a/async_ex2/Cargo.toml
+++ b/async_ex2/Cargo.toml
@@ -5,8 +5,7 @@ authors = ["dowwie <dkcdkg@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = { version="2.0.0", features = ["openssl"] }
+actix-web = { version = "3", features = ["openssl"] }
 actix-service = "1.0.0"
 bytes = "0.5.3"
 env_logger = "0.7"
@@ -14,3 +13,6 @@ futures = "0.3.1"
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = "1.0.39"
 time = "0.1.42"
+
+[dev-dependencies]
+actix-rt = "1"
diff --git a/async_ex2/src/bin/main.rs b/async_ex2/src/bin/main.rs
index 03c7dfc1..9eb12ff0 100644
--- a/async_ex2/src/bin/main.rs
+++ b/async_ex2/src/bin/main.rs
@@ -2,7 +2,7 @@ use actix_web::{middleware, App, HttpServer};
 
 use async_ex2::appconfig::config_app;
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
     env_logger::init();
diff --git a/async_pg/Cargo.toml b/async_pg/Cargo.toml
index 9ea1767d..535114f3 100644
--- a/async_pg/Cargo.toml
+++ b/async_pg/Cargo.toml
@@ -3,11 +3,9 @@ name = "async_pg"
 version = "0.1.0"
 authors = ["dowwie <dkcdkg@gmail.com>"]
 edition = "2018"
-workspace = ".."
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
+actix-web = "3"
 config = "0.10.1"
 deadpool-postgres = "0.5.0"
 derive_more = "0.99.2"
diff --git a/async_pg/src/main.rs b/async_pg/src/main.rs
index 19f4f211..fd1e0896 100644
--- a/async_pg/src/main.rs
+++ b/async_pg/src/main.rs
@@ -111,7 +111,7 @@ use dotenv::dotenv;
 use handlers::add_user;
 use tokio_postgres::NoTls;
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     dotenv().ok();
 
diff --git a/awc_https/Cargo.toml b/awc_https/Cargo.toml
index 892a03a1..fb38828d 100644
--- a/awc_https/Cargo.toml
+++ b/awc_https/Cargo.toml
@@ -3,10 +3,7 @@ name = "awc_https"
 version = "0.1.0"
 authors = ["dowwie <dkcdkg@gmail.com>"]
 edition = "2018"
-workspace = ".."
-
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = { version = "2.0.0", features = ["openssl"] }
+actix-web = { version = "3", features = ["openssl"] }
 openssl = "0.10.28"
diff --git a/awc_https/src/main.rs b/awc_https/src/main.rs
index 5b3d1831..c4da375a 100644
--- a/awc_https/src/main.rs
+++ b/awc_https/src/main.rs
@@ -7,7 +7,7 @@ use openssl::ssl::{SslConnector, SslMethod};
 async fn index(_req: HttpRequest) -> HttpResponse {
     let builder = SslConnector::builder(SslMethod::tls()).unwrap();
 
-    let client = Client::build()
+    let client = Client::builder()
         .connector(Connector::new().ssl(builder.build()).finish())
         .finish();
 
@@ -31,7 +31,7 @@ async fn index(_req: HttpRequest) -> HttpResponse {
     HttpResponse::Ok().content_type("image/jpeg").body(payload)
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     let port = 3000;
 
diff --git a/basics/Cargo.toml b/basics/Cargo.toml
index be3246a5..1c69ecd3 100644
--- a/basics/Cargo.toml
+++ b/basics/Cargo.toml
@@ -2,16 +2,11 @@
 name = "basics"
 version = "2.0.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
-actix-files = "0.2.1"
-actix-session = "0.3.0"
-actix-utils = "1.0.3"
-
-futures = "0.3.1"
+actix-web = "3"
+actix-files = "0.3"
+actix-session = "0.4"
+actix-utils = "2"
 env_logger = "0.7"
-bytes = "0.5"
diff --git a/basics/src/main.rs b/basics/src/main.rs
index 2fee54f5..aa91b75d 100644
--- a/basics/src/main.rs
+++ b/basics/src/main.rs
@@ -1,17 +1,12 @@
-#[macro_use]
-extern crate actix_web;
-
-use std::{env, io};
-
 use actix_files as fs;
 use actix_session::{CookieSession, Session};
 use actix_utils::mpsc;
 use actix_web::http::{header, Method, StatusCode};
 use actix_web::{
-    error, guard, middleware, web, App, Error, HttpRequest, HttpResponse, HttpServer,
-    Result,
+    error, get, guard, middleware, web, App, Error, HttpRequest, HttpResponse,
+    HttpServer, Result,
 };
-use bytes::Bytes;
+use std::{env, io};
 
 /// favicon handler
 #[get("/favicon")]
@@ -50,21 +45,24 @@ async fn response_body(path: web::Path<String>) -> HttpResponse {
     let text = format!("Hello {}!", *path);
 
     let (tx, rx_body) = mpsc::channel();
-    let _ = tx.send(Ok::<_, Error>(Bytes::from(text)));
+    let _ = tx.send(Ok::<_, Error>(web::Bytes::from(text)));
 
     HttpResponse::Ok().streaming(rx_body)
 }
 
 /// handler with path parameters like `/user/{name}/`
-async fn with_param(req: HttpRequest, path: web::Path<(String,)>) -> HttpResponse {
+async fn with_param(
+    req: HttpRequest,
+    web::Path((name,)): web::Path<(String,)>,
+) -> HttpResponse {
     println!("{:?}", req);
 
     HttpResponse::Ok()
         .content_type("text/plain")
-        .body(format!("Hello {}!", path.0))
+        .body(format!("Hello {}!", name))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     env::set_var("RUST_LOG", "actix_web=debug,actix_server=info");
     env_logger::init();
diff --git a/casbin/Cargo.toml b/casbin/Cargo.toml
index d35661fd..66cdd222 100644
--- a/casbin/Cargo.toml
+++ b/casbin/Cargo.toml
@@ -3,10 +3,8 @@ name = "actix-casbin-example"
 version = "0.1.0"
 authors = ["Chojan Shang <psiace@outlook.com>"]
 edition = "2018"
-workspace = ".."
 
 [dependencies]
-actix-web = "2.0"
-actix-rt = "1.1.0"
+actix-web = "3"
 casbin = "0.6.0"
 loge = {version = "0.4", default-features = false, features = ["colored", "chrono"]}
diff --git a/casbin/src/main.rs b/casbin/src/main.rs
index 2394ffa6..4d7b8da8 100644
--- a/casbin/src/main.rs
+++ b/casbin/src/main.rs
@@ -24,7 +24,7 @@ async fn fail(enforcer: web::Data<RwLock<Enforcer>>, req: HttpRequest) -> HttpRe
     HttpResponse::Ok().body("Fail: alice is not data1_admin.") // In fact, it can't be displayed.
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     std::env::set_var("RUST_LOG", "info");
     std::env::set_var("LOGE_FORMAT", "target");
diff --git a/cookie-auth/Cargo.toml b/cookie-auth/Cargo.toml
index 3795ea0d..f2787e5c 100644
--- a/cookie-auth/Cargo.toml
+++ b/cookie-auth/Cargo.toml
@@ -3,11 +3,9 @@ name = "cookie-auth"
 version = "2.0.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 edition = "2018"
-workspace = ".."
 
 [dependencies]
-actix-web = "2.0.0"
-actix-identity = "0.2.0"
-actix-rt = "1.0.0"
+actix-web = "3"
+actix-identity = "0.3"
 env_logger = "0.7"
-rand = "0.7.3"
+rand = "0.7"
diff --git a/cookie-auth/src/main.rs b/cookie-auth/src/main.rs
index 9657bc89..11ce5b7b 100644
--- a/cookie-auth/src/main.rs
+++ b/cookie-auth/src/main.rs
@@ -20,7 +20,7 @@ async fn logout(id: Identity) -> HttpResponse {
     HttpResponse::Found().header("location", "/").finish()
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/cookie-session/Cargo.toml b/cookie-session/Cargo.toml
index 778df8b5..ed9a99a8 100644
--- a/cookie-session/Cargo.toml
+++ b/cookie-session/Cargo.toml
@@ -2,14 +2,9 @@
 name = "cookie-session"
 version = "1.0.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "2.0.0"
-actix-session = "0.3.0"
-actix-rt = "1.0.0"
-
-futures = "0.3.1"
-time = "0.1"
+actix-web = "3"
+actix-session = "0.4"
 env_logger = "0.7"
diff --git a/cookie-session/src/main.rs b/cookie-session/src/main.rs
index 52b20678..feed64bf 100644
--- a/cookie-session/src/main.rs
+++ b/cookie-session/src/main.rs
@@ -25,7 +25,7 @@ async fn index(session: Session, req: HttpRequest) -> Result<&'static str> {
     Ok("welcome!")
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml
index c468289c..9ced2d49 100644
--- a/diesel/Cargo.toml
+++ b/diesel/Cargo.toml
@@ -5,14 +5,10 @@ authors = [
   "Nikolay Kim <fafhrd91@gmail.com>",
   "Rob Ede <robjtede@icloud.com>",
 ]
-workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
-
-bytes = "0.5"
+actix-web = "3"
 diesel = { version = "^1.1.0", features = ["sqlite", "r2d2"] }
 dotenv = "0.15"
 env_logger = "0.7"
diff --git a/diesel/src/main.rs b/diesel/src/main.rs
index 83026d5b..e4f81aef 100644
--- a/diesel/src/main.rs
+++ b/diesel/src/main.rs
@@ -62,7 +62,7 @@ async fn add_user(
     Ok(HttpResponse::Ok().json(user))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/docker_sample/Cargo.toml b/docker_sample/Cargo.toml
index ba94f64a..75606fb2 100644
--- a/docker_sample/Cargo.toml
+++ b/docker_sample/Cargo.toml
@@ -4,8 +4,5 @@ version = "0.1.0"
 authors = ["docker_sample <docker_sample@sample.com>"]
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
\ No newline at end of file
+actix-web = "3"
diff --git a/docker_sample/src/main.rs b/docker_sample/src/main.rs
index 29de04d1..1dae3e6b 100644
--- a/docker_sample/src/main.rs
+++ b/docker_sample/src/main.rs
@@ -15,7 +15,7 @@ async fn again() -> impl Responder {
     HttpResponse::Ok().body("Hello world again!")
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     println!("Starting actix-web server");
 
diff --git a/error_handling/.gitignore b/error_handling/.gitignore
deleted file mode 100644
index 53eaa219..00000000
--- a/error_handling/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-**/*.rs.bk
diff --git a/error_handling/Cargo.toml b/error_handling/Cargo.toml
index 98380fbe..ea9de390 100644
--- a/error_handling/Cargo.toml
+++ b/error_handling/Cargo.toml
@@ -3,12 +3,9 @@ name = "error_handling"
 version = "1.0.0"
 authors = ["dowwie <dkcdkg@gmail.com>"]
 edition = "2018"
-workspace = ".."
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
 derive_more = "0.99.2"
-futures = "0.3.1"
 rand = "0.7"
 env_logger = "0.7"
diff --git a/error_handling/src/main.rs b/error_handling/src/main.rs
index dce9bb35..da6ad5c3 100644
--- a/error_handling/src/main.rs
+++ b/error_handling/src/main.rs
@@ -87,7 +87,7 @@ async fn do_something() -> Result<HttpResponse, Error> {
     Ok(HttpResponse::Ok().body("Nothing interesting happened. Try again."))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/form/Cargo.toml b/form/Cargo.toml
index d3aa62c4..d33ffe1c 100644
--- a/form/Cargo.toml
+++ b/form/Cargo.toml
@@ -3,9 +3,10 @@ name = "form-example"
 version = "1.0.0"
 authors = ["Gorm Casper <gcasper@gmail.com>"]
 edition = "2018"
-workspace = ".."
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
-serde = { version = "1.0", features = ["derive"] }
+actix-web = "3"
+serde = { version = "1", features = ["derive"] }
+
+[dev-dependencies]
+actix-rt = "1"
diff --git a/form/src/main.rs b/form/src/main.rs
index 27635ed3..0e0a76cd 100644
--- a/form/src/main.rs
+++ b/form/src/main.rs
@@ -8,7 +8,7 @@ struct AppState {
     foo: String,
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     HttpServer::new(|| {
         App::new()
diff --git a/hello-world/Cargo.toml b/hello-world/Cargo.toml
index bdb31ba3..575d8ebb 100644
--- a/hello-world/Cargo.toml
+++ b/hello-world/Cargo.toml
@@ -5,6 +5,8 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
 env_logger = "0.7"
+
+[dev-dependencies]
+actix-rt = "1"
diff --git a/hello-world/src/main.rs b/hello-world/src/main.rs
index 313cc23a..ab04c900 100644
--- a/hello-world/src/main.rs
+++ b/hello-world/src/main.rs
@@ -5,7 +5,7 @@ async fn index(req: HttpRequest) -> &'static str {
     "Hello world!"
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/http-proxy/Cargo.toml b/http-proxy/Cargo.toml
index f2e8cdc5..28cf61f6 100644
--- a/http-proxy/Cargo.toml
+++ b/http-proxy/Cargo.toml
@@ -5,9 +5,6 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rotem Yaari <vmalloc@gmail.com>"
 edition = "2018"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = { version = "2.0.0", features=["openssl"] }
+actix-web = { version = "3", features = ["openssl"] }
 clap = "2.32.0"
-futures = "0.3.1"
-failure = "0.1.3"
 url = "2.0"
diff --git a/http-proxy/src/main.rs b/http-proxy/src/main.rs
index 4f261933..611f5851 100644
--- a/http-proxy/src/main.rs
+++ b/http-proxy/src/main.rs
@@ -40,7 +40,7 @@ async fn forward(
     Ok(client_resp.body(res.body().await?))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     let matches = clap::App::new("HTTP Proxy")
         .arg(
diff --git a/json/Cargo.toml b/json/Cargo.toml
index 4028ec95..778bfc1a 100644
--- a/json/Cargo.toml
+++ b/json/Cargo.toml
@@ -2,18 +2,16 @@
 name = "json-example"
 version = "0.1.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
 actix-service = "1.0.0"
-
-bytes = "0.5.2"
 futures = "0.3.1"
 env_logger = "0.7"
-
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 json = "0.12"
+
+[dev-dependencies]
+actix-rt = "1"
diff --git a/json/src/main.rs b/json/src/main.rs
index 8537b07d..df988329 100644
--- a/json/src/main.rs
+++ b/json/src/main.rs
@@ -1,7 +1,6 @@
 use actix_web::{
     error, middleware, web, App, Error, HttpRequest, HttpResponse, HttpServer,
 };
-use bytes::{Bytes, BytesMut};
 use futures::StreamExt;
 use json::JsonValue;
 use serde::{Deserialize, Serialize};
@@ -31,7 +30,7 @@ const MAX_SIZE: usize = 262_144; // max payload size is 256k
 /// This handler manually load request payload and parse json object
 async fn index_manual(mut payload: web::Payload) -> Result<HttpResponse, Error> {
     // payload is a stream of Bytes objects
-    let mut body = BytesMut::new();
+    let mut body = web::BytesMut::new();
     while let Some(chunk) = payload.next().await {
         let chunk = chunk?;
         // limit max size of in-memory payload
@@ -47,7 +46,7 @@ async fn index_manual(mut payload: web::Payload) -> Result<HttpResponse, Error>
 }
 
 /// This handler manually load request payload and parse json-rust
-async fn index_mjsonrust(body: Bytes) -> Result<HttpResponse, Error> {
+async fn index_mjsonrust(body: web::Bytes) -> Result<HttpResponse, Error> {
     // body is loaded, now we can deserialize json-rust
     let result = json::parse(std::str::from_utf8(&body).unwrap()); // return Result
     let injson: JsonValue = match result {
@@ -59,7 +58,7 @@ async fn index_mjsonrust(body: Bytes) -> Result<HttpResponse, Error> {
         .body(injson.dump()))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/json_decode_error/Cargo.toml b/json_decode_error/Cargo.toml
index 86438444..c80a36af 100644
--- a/json_decode_error/Cargo.toml
+++ b/json_decode_error/Cargo.toml
@@ -4,9 +4,6 @@ version = "0.1.0"
 authors = ["Stig Johan Berggren <stigjb@gmail.com>"]
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
-serde = "1.0.104"
+actix-web = "3"
+serde = "1"
diff --git a/json_decode_error/src/main.rs b/json_decode_error/src/main.rs
index 7b1a2ed3..c9e11458 100644
--- a/json_decode_error/src/main.rs
+++ b/json_decode_error/src/main.rs
@@ -29,7 +29,7 @@ fn json_error_handler(err: error::JsonPayloadError, _req: &HttpRequest) -> error
     error::InternalError::from_response(err, resp).into()
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     HttpServer::new(|| {
         App::new()
diff --git a/json_error/Cargo.toml b/json_error/Cargo.toml
index c46a5d7d..1404699f 100644
--- a/json_error/Cargo.toml
+++ b/json_error/Cargo.toml
@@ -5,9 +5,7 @@ authors = ["Kai Yao <kai.b.yao@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
 failure = "0.1"
-futures = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/json_error/src/main.rs b/json_error/src/main.rs
index fcf0a011..0bf39750 100644
--- a/json_error/src/main.rs
+++ b/json_error/src/main.rs
@@ -35,7 +35,7 @@ async fn index() -> Result<web::HttpResponse, Error> {
     })
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     let ip_address = "127.0.0.1:8000";
     println!("Running server on {}", ip_address);
diff --git a/jsonrpc/Cargo.toml b/jsonrpc/Cargo.toml
index e95b7d99..964fdb72 100644
--- a/jsonrpc/Cargo.toml
+++ b/jsonrpc/Cargo.toml
@@ -3,11 +3,9 @@ name = "jsonrpc-example"
 version = "2.0.0"
 authors = ["mohanson <mohanson@outlook.com>"]
 edition = "2018"
-workspace = ".."
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
 bytes = "0.5"
 env_logger = "0.7"
 futures = "0.3.1"
diff --git a/jsonrpc/src/main.rs b/jsonrpc/src/main.rs
index c2c5644e..c3c2e3d9 100644
--- a/jsonrpc/src/main.rs
+++ b/jsonrpc/src/main.rs
@@ -6,7 +6,6 @@ use std::pin::Pin;
 use std::sync::{Arc, RwLock};
 use std::time::Duration;
 
-use actix_rt::time::delay_for;
 use actix_web::{middleware, web, App, Error, HttpResponse, HttpServer};
 use bytes::Bytes;
 use futures::{Future, FutureExt};
@@ -115,7 +114,7 @@ impl ImplNetwork for ObjNetwork {
         d: u64,
     ) -> Pin<Box<dyn Future<Output = Result<String, Box<dyn error::Error>>>>> {
         async move {
-            delay_for(Duration::from_secs(d)).await;
+            actix_web::rt::time::delay_for(Duration::from_secs(d)).await;
             Ok(String::from("pong"))
         }
         .boxed_local()
@@ -141,7 +140,7 @@ impl AppState {
     }
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "info");
     env_logger::init();
diff --git a/juniper-advanced/Cargo.toml b/juniper-advanced/Cargo.toml
index bc39e627..3156ca0d 100644
--- a/juniper-advanced/Cargo.toml
+++ b/juniper-advanced/Cargo.toml
@@ -7,9 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
-futures = "0.3.1"
+actix-web = "3"
 
 juniper = "0.14"
 
diff --git a/juniper-advanced/src/main.rs b/juniper-advanced/src/main.rs
index 7a3ab46a..c7e69585 100644
--- a/juniper-advanced/src/main.rs
+++ b/juniper-advanced/src/main.rs
@@ -13,7 +13,7 @@ mod db;
 mod handlers;
 mod schemas;
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     dotenv::dotenv().ok();
     std::env::set_var("RUST_LOG", "actix_web=info,info");
diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml
index 5cddd3a9..9f0691a8 100644
--- a/juniper/Cargo.toml
+++ b/juniper/Cargo.toml
@@ -5,8 +5,7 @@ authors = ["pyros2097 <pyros2097@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
 env_logger = "0.7.1"
 serde = "1.0.103"
 serde_json = "1.0.44"
diff --git a/juniper/src/main.rs b/juniper/src/main.rs
index fd29faa1..8d03934b 100644
--- a/juniper/src/main.rs
+++ b/juniper/src/main.rs
@@ -33,7 +33,7 @@ async fn graphql(
         .body(user))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/middleware/Cargo.toml b/middleware/Cargo.toml
index 34bc2c47..e29a10ee 100644
--- a/middleware/Cargo.toml
+++ b/middleware/Cargo.toml
@@ -5,10 +5,9 @@ authors = ["Gorm Casper <gcasper@gmail.com>", "Sven-Hendrik Haase <svenstaro@gma
 edition = "2018"
 
 [dependencies]
-actix-service = "1.0.0"
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
-bytes = "0.5"
+actix-service = "1"
+actix-web = "3"
+
 env_logger = "0.7"
 futures = "0.3.1"
-pin-project = "0.4.6"
+pin-project = "0.4"
diff --git a/middleware/README.md b/middleware/README.md
index 68a13c8b..f87dc461 100644
--- a/middleware/README.md
+++ b/middleware/README.md
@@ -1,6 +1,6 @@
 # middleware examples
 
-This example showcases a bunch of different uses of middlewares. See also the [Middleware guide](https://actix.rs/docs/middleware/)..
+This example showcases a bunch of different uses of middlewares. See also the [Middleware guide](https://actix.rs/docs/middleware/).
 
 ## Usage
 
diff --git a/middleware/src/main.rs b/middleware/src/main.rs
index de3a1b70..3c26801a 100644
--- a/middleware/src/main.rs
+++ b/middleware/src/main.rs
@@ -13,7 +13,7 @@ mod redirect;
 #[allow(dead_code)]
 mod simple;
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=debug");
     env_logger::init();
diff --git a/middleware/src/read_request_body.rs b/middleware/src/read_request_body.rs
index c18a7a40..6a34b8a7 100644
--- a/middleware/src/read_request_body.rs
+++ b/middleware/src/read_request_body.rs
@@ -4,8 +4,8 @@ use std::rc::Rc;
 use std::task::{Context, Poll};
 
 use actix_service::{Service, Transform};
+use actix_web::web::BytesMut;
 use actix_web::{dev::ServiceRequest, dev::ServiceResponse, Error, HttpMessage};
-use bytes::BytesMut;
 use futures::future::{ok, Future, Ready};
 use futures::stream::StreamExt;
 
diff --git a/middleware/src/read_response_body.rs b/middleware/src/read_response_body.rs
index 54834dce..b3103418 100644
--- a/middleware/src/read_response_body.rs
+++ b/middleware/src/read_response_body.rs
@@ -5,8 +5,8 @@ use std::task::{Context, Poll};
 
 use actix_service::{Service, Transform};
 use actix_web::body::{BodySize, MessageBody, ResponseBody};
+use actix_web::web::{Bytes, BytesMut};
 use actix_web::{dev::ServiceRequest, dev::ServiceResponse, Error};
-use bytes::{Bytes, BytesMut};
 use futures::future::{ok, Ready};
 
 pub struct Logging;
@@ -86,13 +86,16 @@ where
     }
 }
 
+#[pin_project::pin_project(PinnedDrop)]
 pub struct BodyLogger<B> {
+    #[pin]
     body: ResponseBody<B>,
     body_accum: BytesMut,
 }
 
-impl<B> Drop for BodyLogger<B> {
-    fn drop(&mut self) {
+#[pin_project::pinned_drop]
+impl<B> PinnedDrop for BodyLogger<B> {
+    fn drop(self: Pin<&mut Self>) {
         println!("response body: {:?}", self.body_accum);
     }
 }
@@ -102,10 +105,15 @@ impl<B: MessageBody> MessageBody for BodyLogger<B> {
         self.body.size()
     }
 
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
-        match self.body.poll_next(cx) {
+    fn poll_next(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Bytes, Error>>> {
+        let this = self.project();
+
+        match this.body.poll_next(cx) {
             Poll::Ready(Some(Ok(chunk))) => {
-                self.body_accum.extend_from_slice(&chunk);
+                this.body_accum.extend_from_slice(&chunk);
                 Poll::Ready(Some(Ok(chunk)))
             }
             Poll::Ready(Some(Err(e))) => Poll::Ready(Some(Err(e))),
diff --git a/multipart-async-std/Cargo.toml b/multipart-async-std/Cargo.toml
index 7f8aa5b4..d7c21eca 100644
--- a/multipart-async-std/Cargo.toml
+++ b/multipart-async-std/Cargo.toml
@@ -10,9 +10,8 @@ repository = "https://github.com/actix/examples"
 readme = "README.md"
 
 [dependencies]
+actix-web = "3"
+actix-multipart = "0.3"
 futures = "0.3.1"
-actix-multipart = "0.2.0"
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
 async-std = "1.4.0"
 sanitize-filename = "0.2"
diff --git a/multipart-async-std/src/main.rs b/multipart-async-std/src/main.rs
index 49dbf375..c1ab9886 100644
--- a/multipart-async-std/src/main.rs
+++ b/multipart-async-std/src/main.rs
@@ -38,7 +38,7 @@ fn index() -> HttpResponse {
     HttpResponse::Ok().body(html)
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
     async_std::fs::create_dir_all("./tmp").await?;
diff --git a/multipart-s3/Cargo.toml b/multipart-s3/Cargo.toml
index b2d76f57..e38d05d3 100644
--- a/multipart-s3/Cargo.toml
+++ b/multipart-s3/Cargo.toml
@@ -7,10 +7,9 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+actix-web = "3"
+actix-multipart = "0.3"
 futures = "0.3.1"
-actix-multipart = "0.2.0"
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
 rusoto_s3 = "0.43.0"
 rusoto_core = "0.43.0"
 bytes = { version = "0.5", features = ["serde"] }
diff --git a/multipart-s3/src/main.rs b/multipart-s3/src/main.rs
index 7f08f07f..2a483eda 100644
--- a/multipart-s3/src/main.rs
+++ b/multipart-s3/src/main.rs
@@ -72,7 +72,7 @@ fn index() -> HttpResponse {
     HttpResponse::Ok().body(html)
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     dotenv().ok();
     let aws_access_key_id =
diff --git a/multipart/Cargo.toml b/multipart/Cargo.toml
index feaf3d01..440aa212 100644
--- a/multipart/Cargo.toml
+++ b/multipart/Cargo.toml
@@ -10,8 +10,7 @@ repository = "https://github.com/actix/examples"
 readme = "README.md"
 
 [dependencies]
-actix-multipart = "0.2.0"
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
+actix-multipart = "0.3"
+actix-web = "3"
 futures = "0.3.1"
 sanitize-filename = "0.2"
diff --git a/multipart/src/main.rs b/multipart/src/main.rs
index a8b63273..f0d75c3b 100644
--- a/multipart/src/main.rs
+++ b/multipart/src/main.rs
@@ -10,10 +10,12 @@ async fn save_file(mut payload: Multipart) -> Result<HttpResponse, Error> {
         let content_type = field.content_disposition().unwrap();
         let filename = content_type.get_filename().unwrap();
         let filepath = format!("./tmp/{}", sanitize_filename::sanitize(&filename));
+
         // File::create is blocking operation, use threadpool
         let mut f = web::block(|| std::fs::File::create(filepath))
             .await
             .unwrap();
+
         // Field in turn is stream of *Bytes* object
         while let Some(chunk) = field.next().await {
             let data = chunk.unwrap();
@@ -38,7 +40,7 @@ fn index() -> HttpResponse {
     HttpResponse::Ok().body(html)
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
     std::fs::create_dir_all("./tmp").unwrap();
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 72ed37a4..51ffe1bb 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -3,10 +3,8 @@ name = "openssl-example"
 version = "0.2.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 edition = "2018"
-workspace = ".."
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = { version = "2.0.0", features = ["openssl"] }
+actix-web = { version = "3", features = ["openssl"] }
 env_logger = "0.7"
 openssl = "0.10"
diff --git a/openssl/src/main.rs b/openssl/src/main.rs
index ce050de7..d2c679be 100644
--- a/openssl/src/main.rs
+++ b/openssl/src/main.rs
@@ -11,7 +11,7 @@ async fn index(req: HttpRequest) -> Result<HttpResponse, Error> {
         .body("Welcome!"))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=debug");
     env_logger::init();
diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml
index 00a080bf..4550a364 100644
--- a/protobuf/Cargo.toml
+++ b/protobuf/Cargo.toml
@@ -2,7 +2,6 @@
 name = "protobuf-example"
 version = "0.2.0"
 authors = ["kingxsp <jin.hb.zh@outlook.com>, Yuki Okushi <huyuumi.dev@gmail.com>"]
-workspace = ".."
 edition = "2018"
 
 [dependencies]
@@ -11,7 +10,6 @@ env_logger = "0.7.1"
 prost = "0.6.1"
 prost-derive = "0.6.1"
 
-actix = "0.9.0"
-actix-protobuf = "0.5.0"
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
+actix = "0.10"
+actix-protobuf = "0.6"
+actix-web = "3"
diff --git a/protobuf/src/main.rs b/protobuf/src/main.rs
index 61dd729c..fdd7c8a8 100644
--- a/protobuf/src/main.rs
+++ b/protobuf/src/main.rs
@@ -8,6 +8,7 @@ use actix_web::*;
 pub struct MyObj {
     #[prost(int32, tag = "1")]
     pub number: i32,
+
     #[prost(string, tag = "2")]
     pub name: String,
 }
@@ -17,7 +18,7 @@ async fn index(msg: ProtoBuf<MyObj>) -> Result<HttpResponse> {
     HttpResponse::Ok().protobuf(msg.0) // <- send response
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=debug,actix_server=info");
     env_logger::init();
diff --git a/r2d2/Cargo.toml b/r2d2/Cargo.toml
index e924fe43..2a2db6b9 100644
--- a/r2d2/Cargo.toml
+++ b/r2d2/Cargo.toml
@@ -5,10 +5,8 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
+actix-web = "3"
 
-futures = "0.3.1"
 env_logger = "0.7"
 uuid = { version = "0.8", features = ["v4"] }
 
diff --git a/r2d2/src/main.rs b/r2d2/src/main.rs
index 4cbbb24a..4d343555 100644
--- a/r2d2/src/main.rs
+++ b/r2d2/src/main.rs
@@ -31,7 +31,7 @@ async fn index(
     Ok(res)
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=debug");
     env_logger::init();
diff --git a/redis-session/Cargo.toml b/redis-session/Cargo.toml
index 9d3934ac..5cbddc3b 100644
--- a/redis-session/Cargo.toml
+++ b/redis-session/Cargo.toml
@@ -5,14 +5,16 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>", "dowwie <dkcdkg@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
-actix-session = "0.3.0"
-actix-redis = { version = "0.8.0", features = ["web"] }
+actix-web = "3"
+actix-session = "0.4"
+actix-redis = "0.9"
 env_logger = "0.7"
-serde = { version = "^1.0", features = ["derive"] }
-actix-service = "1.0.0"
-actix-http = "1.0.0"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+actix-service = "1"
+actix-http = "2"
 rand = "0.7.3"
-serde_json = "1.0.40"
-time = "0.1.42"
+time = "0.2"
+
+[dev-dependencies]
+actix-rt = "1"
diff --git a/redis-session/src/main.rs b/redis-session/src/main.rs
index 8cd2aed1..8008743a 100644
--- a/redis-session/src/main.rs
+++ b/redis-session/src/main.rs
@@ -72,7 +72,7 @@ async fn logout(session: Session) -> Result<HttpResponse> {
     }
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info,actix_redis=info");
     env_logger::init();
@@ -308,7 +308,9 @@ mod test {
             .into_iter()
             .find(|c| c.name() == "test-session")
             .unwrap();
-        assert!(&time::now().tm_year != &cookie_4.expires().map(|t| t.tm_year).unwrap());
+
+        let now = time::OffsetDateTime::now_utc();
+        assert!(now.year() != cookie_4.expires().map(|t| t.year()).unwrap());
 
         // Step 10: GET index, including session cookie #2 in request
         //   - set-cookie actix-session will be in response (session cookie #3)
diff --git a/redis/Cargo.toml b/redis/Cargo.toml
index db64a471..8b95b1bb 100644
--- a/redis/Cargo.toml
+++ b/redis/Cargo.toml
@@ -5,11 +5,10 @@ authors = ["dowwie <dkcdkg@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix = "0.9.0"
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
-actix-redis = "0.8.0"
-futures = "0.3.1"
-redis-async = "0.6.1"
-serde = { version = "1.0.71", features = ["derive"] }
+actix = "0.10"
+actix-web = "3"
+actix-redis = "0.9"
+futures = "0.3"
+redis-async = "0.6.3"
+serde = { version = "1", features = ["derive"] }
 env_logger = "0.7"
diff --git a/redis/src/main.rs b/redis/src/main.rs
index 268facea..bedbe180 100644
--- a/redis/src/main.rs
+++ b/redis/src/main.rs
@@ -1,12 +1,9 @@
-#[macro_use]
-extern crate redis_async;
-use serde::Deserialize;
-
 use actix::prelude::*;
 use actix_redis::{Command, RedisActor};
 use actix_web::{middleware, web, App, Error as AWError, HttpResponse, HttpServer};
 use futures::future::join_all;
-use redis_async::resp::RespValue;
+use redis_async::{resp::RespValue, resp_array};
+use serde::Deserialize;
 
 #[derive(Deserialize)]
 pub struct CacheInfo {
@@ -74,7 +71,7 @@ async fn del_stuff(redis: web::Data<Addr<RedisActor>>) -> Result<HttpResponse, A
     }
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=trace,actix_redis=trace");
     env_logger::init();
diff --git a/run-in-thread/Cargo.toml b/run-in-thread/Cargo.toml
index cb00f1db..72482f09 100644
--- a/run-in-thread/Cargo.toml
+++ b/run-in-thread/Cargo.toml
@@ -6,6 +6,5 @@ edition = "2018"
 description = "Run actix-web in separate thread"
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
 env_logger = "0.7"
diff --git a/run-in-thread/src/main.rs b/run-in-thread/src/main.rs
index bcae81bc..3a0c5046 100644
--- a/run-in-thread/src/main.rs
+++ b/run-in-thread/src/main.rs
@@ -1,8 +1,7 @@
 use std::sync::mpsc;
 use std::{thread, time};
 
-use actix_rt::System;
-use actix_web::{dev::Server, middleware, web, App, HttpRequest, HttpServer};
+use actix_web::{dev::Server, middleware, rt, web, App, HttpRequest, HttpServer};
 
 async fn index(req: HttpRequest) -> &'static str {
     println!("REQ: {:?}", req);
@@ -10,7 +9,7 @@ async fn index(req: HttpRequest) -> &'static str {
 }
 
 fn run_app(tx: mpsc::Sender<Server>) -> std::io::Result<()> {
-    let mut sys = System::new("test");
+    let mut sys = rt::System::new("test");
 
     // srv is server controller type, `dev::Server`
     let srv = HttpServer::new(|| {
@@ -48,5 +47,5 @@ fn main() {
 
     println!("STOPPING SERVER");
     // init stop server and wait until server gracefully exit
-    System::new("").block_on(srv.stop(true));
+    rt::System::new("").block_on(srv.stop(true));
 }
diff --git a/rustls/Cargo.toml b/rustls/Cargo.toml
index fc7c1b83..dc97d6d7 100644
--- a/rustls/Cargo.toml
+++ b/rustls/Cargo.toml
@@ -2,7 +2,6 @@
 name = "rustls-example"
 version = "1.0.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = ".."
 edition = "2018"
 
 [[bin]]
@@ -11,7 +10,6 @@ path = "src/main.rs"
 
 [dependencies]
 env_logger = "0.7"
-rustls = "0.16"
-actix-web = { version = "2.0.0", features = ["rustls"] }
-actix-files = "0.2.1"
-actix-rt = "1.0.0"
+rustls = "0.18"
+actix-web = { version = "3", features = ["rustls"] }
+actix-files = "0.3"
diff --git a/rustls/src/main.rs b/rustls/src/main.rs
index a5be7179..b86b4e31 100644
--- a/rustls/src/main.rs
+++ b/rustls/src/main.rs
@@ -14,7 +14,7 @@ async fn index(req: HttpRequest) -> HttpResponse {
         .body("Welcome!")
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     if std::env::var("RUST_LOG").is_err() {
         std::env::set_var("RUST_LOG", "actix_web=info");
diff --git a/server-sent-events/Cargo.toml b/server-sent-events/Cargo.toml
index cf4d666e..d9629265 100644
--- a/server-sent-events/Cargo.toml
+++ b/server-sent-events/Cargo.toml
@@ -2,12 +2,10 @@
 name = "server-sent-events"
 version = "1.0.0"
 authors = ["Arve Seljebu"]
-workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
+actix-web = "3"
 env_logger = "0.7"
 futures = "0.3.1"
-tokio = "0.2"
+tokio = { version = "0.2", features = ["sync"] }
diff --git a/server-sent-events/benchmark.js b/server-sent-events/benchmark.js
index 452d75d4..68c4ad51 100644
--- a/server-sent-events/benchmark.js
+++ b/server-sent-events/benchmark.js
@@ -1,6 +1,6 @@
 const http = require('http')
 
-const n = 1000;
+const n = 100;
 let connected = 0;
 let messages = 0;
 let start = Date.now();
diff --git a/server-sent-events/src/main.rs b/server-sent-events/src/main.rs
index 3c3d8586..e0ab0309 100644
--- a/server-sent-events/src/main.rs
+++ b/server-sent-events/src/main.rs
@@ -3,13 +3,13 @@ use std::sync::Mutex;
 use std::task::{Context, Poll};
 use std::time::Duration;
 
+use actix_web::rt::time::{interval_at, Instant};
 use actix_web::web::{Bytes, Data, Path};
 use actix_web::{web, App, Error, HttpResponse, HttpServer, Responder};
 use futures::{Stream, StreamExt};
 use tokio::sync::mpsc::{channel, Receiver, Sender};
-use tokio::time::{interval_at, Instant};
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     env_logger::init();
     let data = Broadcaster::create();
@@ -39,7 +39,6 @@ async fn new_client(broadcaster: Data<Mutex<Broadcaster>>) -> impl Responder {
 
     HttpResponse::Ok()
         .header("content-type", "text/event-stream")
-        .no_chunking()
         .streaming(rx)
 }
 
@@ -74,7 +73,7 @@ impl Broadcaster {
     }
 
     fn spawn_ping(me: Data<Mutex<Self>>) {
-        actix_rt::spawn(async move {
+        actix_web::rt::spawn(async move {
             let mut task = interval_at(Instant::now(), Duration::from_secs(10));
             while let Some(_) = task.next().await {
                 me.lock().unwrap().remove_stale_clients();
diff --git a/shutdown-server/Cargo.toml b/shutdown-server/Cargo.toml
index 4eb27415..d41f056a 100644
--- a/shutdown-server/Cargo.toml
+++ b/shutdown-server/Cargo.toml
@@ -6,8 +6,7 @@ edition = "2018"
 description = "Send a request to the server to shut it down"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
+actix-web = "3"
 env_logger = "0.7"
 futures = "0.3"
-tokio = { version = "0.2.11", features = ["signal"] }
+tokio = { version = "0.2", features = ["signal"] }
diff --git a/shutdown-server/src/main.rs b/shutdown-server/src/main.rs
index f16ab51c..6ab6bdc4 100644
--- a/shutdown-server/src/main.rs
+++ b/shutdown-server/src/main.rs
@@ -15,7 +15,7 @@ async fn stop(stopper: web::Data<mpsc::Sender<()>>) -> HttpResponse {
     HttpResponse::NoContent().finish()
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_server=debug,actix_web=debug");
     env_logger::init();
diff --git a/simple-auth-server/Cargo.toml b/simple-auth-server/Cargo.toml
index 240ae958..15f56947 100644
--- a/simple-auth-server/Cargo.toml
+++ b/simple-auth-server/Cargo.toml
@@ -6,20 +6,21 @@ edition = "2018"
 workspace = ".."
 
 [dependencies]
-actix-identity = "0.2.0"
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
+actix-identity = "0.3"
+
 # FIXME: Specify the commit hash to use bindgen v0.50.
 argonautica = { git = "https://github.com/bcmyers/argonautica", rev = "67fc8d8d7d67696cd8ca7a59b92531f06b089212" }
 chrono = { version = "0.4.6", features = ["serde"] }
 derive_more = "0.99.0"
-diesel = { version = "1.4.2", features = ["postgres", "uuidv07", "r2d2", "chrono"] }
+diesel = { version = "1.4.5", features = ["postgres", "uuidv07", "r2d2", "chrono"] }
 dotenv = "0.15"
 env_logger = "0.7"
 futures = "0.3.1"
 r2d2 = "0.8"
-lazy_static = "1.3.0"
+lazy_static = "1.4.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sparkpost = "0.5.2"
 uuid = { version = "0.8", features = ["serde", "v4"] }
+time = "0.2"
diff --git a/simple-auth-server/src/main.rs b/simple-auth-server/src/main.rs
index 929ee2c5..15c131ba 100644
--- a/simple-auth-server/src/main.rs
+++ b/simple-auth-server/src/main.rs
@@ -5,6 +5,7 @@ use actix_identity::{CookieIdentityPolicy, IdentityService};
 use actix_web::{middleware, web, App, HttpServer};
 use diesel::prelude::*;
 use diesel::r2d2::{self, ConnectionManager};
+use time::Duration;
 
 mod auth_handler;
 mod email_service;
@@ -15,7 +16,7 @@ mod register_handler;
 mod schema;
 mod utils;
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     dotenv::dotenv().ok();
     std::env::set_var(
@@ -44,7 +45,7 @@ async fn main() -> std::io::Result<()> {
                     .name("auth")
                     .path("/")
                     .domain(domain.as_str())
-                    .max_age_time(chrono::Duration::days(1))
+                    .max_age_time(Duration::days(1))
                     .secure(false), // this can only be true if you have https
             ))
             .data(web::JsonConfig::default().limit(4096))
diff --git a/sqlx_todo/Cargo.toml b/sqlx_todo/Cargo.toml
index 954a1e20..b2ddb8fb 100644
--- a/sqlx_todo/Cargo.toml
+++ b/sqlx_todo/Cargo.toml
@@ -7,14 +7,12 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+actix-web = "3"
 listenfd = "0.3.3"
-actix-web = "2.0.0"
-actix-rt = "1.1.0"
 serde = "1.0.106"
 serde_json = "1.0.51"
 sqlx = { version = "0.3", features = [ "postgres" ] }
-futures = "0.3.4"
 dotenv = "0.15.0"
 env_logger = "0.7.1"
 log = "0.4.8"
-anyhow = "1.0.28"
\ No newline at end of file
+anyhow = "1.0.28"
diff --git a/sqlx_todo/src/main.rs b/sqlx_todo/src/main.rs
index 1a0f147f..4c44d5b9 100644
--- a/sqlx_todo/src/main.rs
+++ b/sqlx_todo/src/main.rs
@@ -25,7 +25,7 @@ async fn index() -> impl Responder {
     )
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> Result<()> {
     dotenv().ok();
     env_logger::init();
@@ -56,4 +56,4 @@ async fn main() -> Result<()> {
     server.run().await?;
 
     Ok(())
-}
\ No newline at end of file
+}
diff --git a/state/Cargo.toml b/state/Cargo.toml
index 6fc7de07..e3f3d124 100644
--- a/state/Cargo.toml
+++ b/state/Cargo.toml
@@ -5,7 +5,5 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
-futures = "0.3.1"
+actix-web = "3"
 env_logger = "0.7"
diff --git a/state/src/main.rs b/state/src/main.rs
index cad3a576..f984e7a4 100644
--- a/state/src/main.rs
+++ b/state/src/main.rs
@@ -48,7 +48,7 @@ async fn index(
     HttpResponse::Ok().body(body)
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/static_index/Cargo.toml b/static_index/Cargo.toml
index af5cc11e..616a23e7 100644
--- a/static_index/Cargo.toml
+++ b/static_index/Cargo.toml
@@ -2,13 +2,9 @@
 name = "static_index"
 version = "2.0.0"
 authors = ["Jose Marinez <digeratus@gmail.com>"]
-workspace = ".."
 edition = "2018"
 
 [dependencies]
-futures = "0.3.1"
+actix-web = "3"
+actix-files = "0.3"
 env_logger = "0.7"
-
-actix-web = "2.0.0"
-actix-files = "0.2.1"
-actix-rt = "1.0.0"
diff --git a/static_index/src/main.rs b/static_index/src/main.rs
index 2879da5b..fab6eea3 100644
--- a/static_index/src/main.rs
+++ b/static_index/src/main.rs
@@ -1,7 +1,7 @@
 use actix_files::Files;
 use actix_web::{middleware, App, HttpServer};
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/template_askama/Cargo.toml b/template_askama/Cargo.toml
index c8672d1d..27b7050b 100644
--- a/template_askama/Cargo.toml
+++ b/template_askama/Cargo.toml
@@ -5,8 +5,7 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
 askama = "0.9"
 
 [build-dependencies]
diff --git a/template_askama/src/main.rs b/template_askama/src/main.rs
index d78d0509..5b0e6fa5 100644
--- a/template_askama/src/main.rs
+++ b/template_askama/src/main.rs
@@ -28,7 +28,7 @@ async fn index(query: web::Query<HashMap<String, String>>) -> Result<HttpRespons
     Ok(HttpResponse::Ok().content_type("text/html").body(s))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     // start http server
     HttpServer::new(move || {
diff --git a/template_handlebars/Cargo.toml b/template_handlebars/Cargo.toml
index ddb8297b..df5ad1b6 100644
--- a/template_handlebars/Cargo.toml
+++ b/template_handlebars/Cargo.toml
@@ -5,8 +5,7 @@ authors = ["Alexandru Tiniuc <tiniuc.alexandru@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-http = "1.0.1"
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
+actix-http = "2"
+actix-web = "3"
 handlebars = { version = "3.0.0", features = ["dir_source"] }
 serde_json = "1.0"
diff --git a/template_handlebars/src/main.rs b/template_handlebars/src/main.rs
index 60f15240..3fddb492 100644
--- a/template_handlebars/src/main.rs
+++ b/template_handlebars/src/main.rs
@@ -39,7 +39,7 @@ async fn user(
     HttpResponse::Ok().body(body)
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     // Handlebars uses a repository for the compiled templates. This object must be
     // shared between the application threads, and is therefore passed to the
diff --git a/template_tera/Cargo.toml b/template_tera/Cargo.toml
index 591a577d..96f6d412 100644
--- a/template_tera/Cargo.toml
+++ b/template_tera/Cargo.toml
@@ -2,12 +2,10 @@
 name = "template-tera"
 version = "2.0.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = ".."
 edition = "2018"
 
 [dependencies]
 env_logger = "0.7"
 tera = "1.0"
-actix-http = "1.0.1"
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-http = "2"
+actix-web = "3"
diff --git a/template_tera/src/main.rs b/template_tera/src/main.rs
index 85fdd13c..75078374 100644
--- a/template_tera/src/main.rs
+++ b/template_tera/src/main.rs
@@ -26,7 +26,7 @@ async fn index(
     Ok(HttpResponse::Ok().content_type("text/html").body(s))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/template_yarte/Cargo.toml b/template_yarte/Cargo.toml
index 379dd6c1..27aa9492 100644
--- a/template_yarte/Cargo.toml
+++ b/template_yarte/Cargo.toml
@@ -5,17 +5,15 @@ authors = ["Juan Aguilar Santillana <mhpoin@gmail.com>"]
 publish = false
 edition = "2018"
 
-workspace = ".."
-
 [dependencies]
+actix-web = "3"
 env_logger = "0.7"
-
 yarte = { version = "0.8", features = ["html-min"]  }
 
-actix-rt = "1.0"
-actix-web = "2.0.0"
-
 [build-dependencies.yarte_helpers]
 version = "0.8"
 default-features = false
 features = ["config"]
+
+[dev-dependencies]
+actix-rt = "1"
diff --git a/template_yarte/src/main.rs b/template_yarte/src/main.rs
index 1a9ffba6..a4368f12 100644
--- a/template_yarte/src/main.rs
+++ b/template_yarte/src/main.rs
@@ -26,7 +26,7 @@ async fn index(
         .map_err(|_| ErrorInternalServerError("Some error message"))
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/todo/Cargo.toml b/todo/Cargo.toml
index 3022972b..1b9db82d 100644
--- a/todo/Cargo.toml
+++ b/todo/Cargo.toml
@@ -5,10 +5,10 @@ version = "2.0.0"
 edition = "2018"
 
 [dependencies]
-actix-web = "2.0.0"
-actix-files = "0.2.1"
-actix-session = "0.3.0"
-actix-rt = "1.0.0"
+actix-web = "3"
+actix-files = "0.3"
+actix-session = "0.4"
+
 dotenv = "0.15"
 env_logger = "0.7"
 futures = "0.3.1"
diff --git a/todo/src/main.rs b/todo/src/main.rs
index 9b610b06..26d94845 100644
--- a/todo/src/main.rs
+++ b/todo/src/main.rs
@@ -20,7 +20,7 @@ mod session;
 
 static SESSION_SIGNING_KEY: &[u8] = &[0; 32];
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> io::Result<()> {
     dotenv().ok();
 
diff --git a/udp-echo/Cargo.toml b/udp-echo/Cargo.toml
index 380ec0e7..f06102f5 100644
--- a/udp-echo/Cargo.toml
+++ b/udp-echo/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Anton Patrushev <apatrushev@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix = "0.9"
+actix = "0.10"
 actix-rt = "1.1"
 tokio = "0.2"
 tokio-util = { version = "0.3", features = [ "codec", "udp" ] }
diff --git a/unix-socket/Cargo.toml b/unix-socket/Cargo.toml
index 0d924f67..376ef48d 100644
--- a/unix-socket/Cargo.toml
+++ b/unix-socket/Cargo.toml
@@ -2,10 +2,8 @@
 name = "unix-socket"
 version = "1.0.0"
 authors = ["Messense Lv <messense@icloud.com>"]
-workspace = ".."
 edition = "2018"
 
 [dependencies]
 env_logger = "0.7"
-actix-web = "2.0.0"
-actix-rt = "1.0.0"
+actix-web = "3"
diff --git a/unix-socket/src/main.rs b/unix-socket/src/main.rs
index 6178b7a3..e715f5e4 100644
--- a/unix-socket/src/main.rs
+++ b/unix-socket/src/main.rs
@@ -4,7 +4,7 @@ async fn index(_req: HttpRequest) -> &'static str {
     "Hello world!"
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 #[cfg(unix)]
 async fn main() -> std::io::Result<()> {
     ::std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
diff --git a/web-cors/backend/.gitignore b/web-cors/backend/.gitignore
deleted file mode 100644
index 250b626d..00000000
--- a/web-cors/backend/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-
-/target/
-**/*.rs.bk
-Cargo.lock
\ No newline at end of file
diff --git a/web-cors/backend/Cargo.toml b/web-cors/backend/Cargo.toml
index fd9f2176..9a265639 100644
--- a/web-cors/backend/Cargo.toml
+++ b/web-cors/backend/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["krircc <krircc@aliyun.com>"]
 edition = "2018"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix-web = "2.0.0"
-actix-cors = "0.2.0"
+actix-web = "3"
+actix-cors = "0.3"
+
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 env_logger = "0.7"
diff --git a/web-cors/backend/src/main.rs b/web-cors/backend/src/main.rs
index 23fb8d87..b88f239c 100644
--- a/web-cors/backend/src/main.rs
+++ b/web-cors/backend/src/main.rs
@@ -3,7 +3,7 @@ use actix_web::{http::header, middleware::Logger, web, App, HttpServer};
 
 mod user;
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
diff --git a/websocket-autobahn/Cargo.toml b/websocket-autobahn/Cargo.toml
index 04111d71..1d27d464 100644
--- a/websocket-autobahn/Cargo.toml
+++ b/websocket-autobahn/Cargo.toml
@@ -9,8 +9,7 @@ name = "websocket-autobahn-server"
 path = "src/main.rs"
 
 [dependencies]
-actix = "0.9.0"
-actix-web = "2.0.0"
-actix-web-actors = "2.0.0"
-actix-rt = "1.0.0"
+actix = "0.10"
+actix-web = "3"
+actix-web-actors = "3"
 env_logger = "0.7"
diff --git a/websocket-autobahn/src/main.rs b/websocket-autobahn/src/main.rs
index d42dc243..5ae97b8d 100644
--- a/websocket-autobahn/src/main.rs
+++ b/websocket-autobahn/src/main.rs
@@ -43,7 +43,7 @@ impl WebSocket {
     }
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
     env_logger::init();
diff --git a/websocket-chat-broker/Cargo.toml b/websocket-chat-broker/Cargo.toml
index cf7fcbd9..137db28d 100644
--- a/websocket-chat-broker/Cargo.toml
+++ b/websocket-chat-broker/Cargo.toml
@@ -13,11 +13,11 @@ path = "src/main.rs"
 
 [dependencies]
 actix = "0.9"
-actix-broker = "0.3.0"
+actix-broker = "0.3"
 actix-files = "0.2"
-actix-rt = "1.1"
-actix-web = "2.0"
-actix-web-actors = "2.0"
+actix-rt = "1"
+actix-web = "2"
+actix-web-actors = "2"
 env_logger = "0.7"
 futures = "0.3"
 log = "0.4"
diff --git a/websocket-chat/Cargo.toml b/websocket-chat/Cargo.toml
index c11360c0..339169a2 100644
--- a/websocket-chat/Cargo.toml
+++ b/websocket-chat/Cargo.toml
@@ -9,16 +9,15 @@ name = "websocket-chat-server"
 path = "src/main.rs"
 
 [dependencies]
-actix-rt = "1.0.0"
-actix = "0.9.0"
-actix-web = "2.0.0"
-actix-web-actors = "2.0.0"
-actix-files = "0.2.1"
+actix = "0.10"
+actix-web = "3"
+actix-web-actors = "3"
+actix-files = "0.3"
 
 rand = "0.7"
-bytes = "0.5.3"
-byteorder = "1.1"
-futures = "0.3.1"
+bytes = "0.5"
+byteorder = "1.3"
+futures = "0.3"
 env_logger = "0.7"
-serde = "1.0"
-serde_json = "1.0"
+serde = "1"
+serde_json = "1"
diff --git a/websocket-chat/src/main.rs b/websocket-chat/src/main.rs
index 3b28b7fe..ef4aee3d 100644
--- a/websocket-chat/src/main.rs
+++ b/websocket-chat/src/main.rs
@@ -220,7 +220,7 @@ impl WsChatSession {
     }
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     env_logger::init();
 
diff --git a/websocket-tcp-chat/Cargo.toml b/websocket-tcp-chat/Cargo.toml
index b62b8198..06e7174d 100644
--- a/websocket-tcp-chat/Cargo.toml
+++ b/websocket-tcp-chat/Cargo.toml
@@ -13,12 +13,11 @@ name = "websocket-tcp-client"
 path = "src/client.rs"
 
 [dependencies]
-actix = "0.9.0"
-actix-web = "2.0.0"
-actix-web-actors = "2.0.0"
-actix-files = "0.2.1"
-actix-rt = "1.0.0"
-actix-codec = "0.2.0"
+actix = "0.10"
+actix-web = "3"
+actix-web-actors = "3"
+actix-files = "0.3"
+actix-codec = "0.3"
 
 rand = "0.7"
 bytes = "0.5.3"
@@ -28,4 +27,4 @@ env_logger = "0.7"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tokio = "0.2.4"
-tokio-util = "0.2.0"
+tokio-util = "0.3"
diff --git a/websocket-tcp-chat/src/client.rs b/websocket-tcp-chat/src/client.rs
index df26b160..b4d442b6 100644
--- a/websocket-tcp-chat/src/client.rs
+++ b/websocket-tcp-chat/src/client.rs
@@ -8,7 +8,7 @@ use tokio_util::codec::FramedRead;
 
 mod codec;
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() {
     // Connect to server
     let addr = net::SocketAddr::from_str("127.0.0.1:12345").unwrap();
@@ -38,7 +38,11 @@ async fn main() {
 }
 
 struct ChatClient {
-    framed: actix::io::FramedWrite<WriteHalf<TcpStream>, codec::ClientChatCodec>,
+    framed: actix::io::FramedWrite<
+        codec::ChatRequest,
+        WriteHalf<TcpStream>,
+        codec::ClientChatCodec,
+    >,
 }
 
 #[derive(Message)]
diff --git a/websocket-tcp-chat/src/codec.rs b/websocket-tcp-chat/src/codec.rs
index 56f4717e..098e71e0 100644
--- a/websocket-tcp-chat/src/codec.rs
+++ b/websocket-tcp-chat/src/codec.rs
@@ -65,8 +65,7 @@ impl Decoder for ChatCodec {
     }
 }
 
-impl Encoder for ChatCodec {
-    type Item = ChatResponse;
+impl Encoder<ChatResponse> for ChatCodec {
     type Error = io::Error;
 
     fn encode(
@@ -110,8 +109,7 @@ impl Decoder for ClientChatCodec {
     }
 }
 
-impl Encoder for ClientChatCodec {
-    type Item = ChatRequest;
+impl Encoder<ChatRequest> for ClientChatCodec {
     type Error = io::Error;
 
     fn encode(
diff --git a/websocket-tcp-chat/src/main.rs b/websocket-tcp-chat/src/main.rs
index b85e4436..542f8862 100644
--- a/websocket-tcp-chat/src/main.rs
+++ b/websocket-tcp-chat/src/main.rs
@@ -219,7 +219,7 @@ impl WsChatSession {
     }
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     env_logger::init();
 
diff --git a/websocket-tcp-chat/src/session.rs b/websocket-tcp-chat/src/session.rs
index 1481db9c..4ddcf05f 100644
--- a/websocket-tcp-chat/src/session.rs
+++ b/websocket-tcp-chat/src/session.rs
@@ -31,7 +31,7 @@ pub struct ChatSession {
     /// joined room
     room: String,
     /// Framed wrapper
-    framed: actix::io::FramedWrite<WriteHalf<TcpStream>, ChatCodec>,
+    framed: actix::io::FramedWrite<ChatResponse, WriteHalf<TcpStream>, ChatCodec>,
 }
 
 impl Actor for ChatSession {
@@ -136,7 +136,7 @@ impl Handler<Message> for ChatSession {
 impl ChatSession {
     pub fn new(
         addr: Addr<ChatServer>,
-        framed: actix::io::FramedWrite<WriteHalf<TcpStream>, ChatCodec>,
+        framed: actix::io::FramedWrite<ChatResponse, WriteHalf<TcpStream>, ChatCodec>,
     ) -> ChatSession {
         ChatSession {
             id: 0,
@@ -176,7 +176,7 @@ pub fn tcp_server(_s: &str, server: Addr<ChatServer>) {
     // Create server listener
     let addr = net::SocketAddr::from_str("127.0.0.1:12345").unwrap();
 
-    actix_rt::spawn(async move {
+    actix_web::rt::spawn(async move {
         let server = server.clone();
         let mut listener = TcpListener::bind(&addr).await.unwrap();
         let mut incoming = listener.incoming();
diff --git a/websocket/Cargo.toml b/websocket/Cargo.toml
index 7a256871..40d5c41c 100644
--- a/websocket/Cargo.toml
+++ b/websocket/Cargo.toml
@@ -13,13 +13,12 @@ name = "websocket-client"
 path = "src/client.rs"
 
 [dependencies]
-actix = "0.9.0"
-actix-codec = "0.2.0"
-actix-web = "2.0.0"
-actix-web-actors = "2.0.0"
-actix-files = "0.2.1"
-actix-rt = "1.0.0"
-awc = "1.0.1"
+actix = "0.10"
+actix-codec = "0.3"
+actix-web = "3"
+actix-web-actors = "3"
+actix-files = "0.3"
+awc = "2"
 env_logger = "0.7"
 futures = "0.3.1"
 bytes = "0.5.3"
diff --git a/websocket/src/main.rs b/websocket/src/main.rs
index efa05fa4..04763475 100644
--- a/websocket/src/main.rs
+++ b/websocket/src/main.rs
@@ -95,7 +95,7 @@ impl MyWebSocket {
     }
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
     env_logger::init();