diff --git a/Cargo.toml b/Cargo.toml
index b1aa79527..db983bf63 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,13 +31,13 @@ members = [
   ".",
   "awc",
   "actix-http",
-  "actix-cors",
-  "actix-files",
-  "actix-framed",
-  "actix-session",
-  "actix-identity",
-  "actix-multipart",
-  "actix-web-actors",
+  #"actix-cors",
+  #"actix-files",
+  #"actix-framed",
+  #"actix-session",
+  #"actix-identity",
+  #"actix-multipart",
+  #"actix-web-actors",
   "actix-web-codegen",
   "test-server",
 ]
@@ -125,17 +125,27 @@ actix-http = { path = "actix-http" }
 actix-http-test = { path = "test-server" }
 actix-web-codegen = { path = "actix-web-codegen" }
 # actix-web-actors = { path = "actix-web-actors" }
-actix-session = { path = "actix-session" }
-actix-files = { path = "actix-files" }
-actix-multipart = { path = "actix-multipart" }
+# actix-session = { path = "actix-session" }
+# actix-files = { path = "actix-files" }
+# actix-multipart = { path = "actix-multipart" }
 awc = { path = "awc" }
 
-actix-codec = { path = "../actix-net/actix-codec" }
-actix-connect = { path = "../actix-net/actix-connect" }
-actix-rt = { path = "../actix-net/actix-rt" }
-actix-server = { path = "../actix-net/actix-server" }
-actix-server-config = { path = "../actix-net/actix-server-config" }
-actix-service = { path = "../actix-net/actix-service" }
-actix-testing = { path = "../actix-net/actix-testing" }
-actix-threadpool = { path = "../actix-net/actix-threadpool" }
-actix-utils = { path = "../actix-net/actix-utils" }
+actix-codec = { git = "https://github.com/actix/actix-net.git" }
+actix-connect = { git = "https://github.com/actix/actix-net.git" }
+actix-rt = { git = "https://github.com/actix/actix-net.git" }
+actix-server = { git = "https://github.com/actix/actix-net.git" }
+actix-server-config = { git = "https://github.com/actix/actix-net.git" }
+actix-service = { git = "https://github.com/actix/actix-net.git" }
+actix-testing = { git = "https://github.com/actix/actix-net.git" }
+actix-threadpool = { git = "https://github.com/actix/actix-net.git" }
+actix-utils = {  git = "https://github.com/actix/actix-net.git" }
+
+# actix-codec = { path = "../actix-net/actix-codec" }
+# actix-connect = { path = "../actix-net/actix-connect" }
+# actix-rt = { path = "../actix-net/actix-rt" }
+# actix-server = { path = "../actix-net/actix-server" }
+# actix-server-config = { path = "../actix-net/actix-server-config" }
+# actix-service = { path = "../actix-net/actix-service" }
+# actix-testing = { path = "../actix-net/actix-testing" }
+# actix-threadpool = { path = "../actix-net/actix-threadpool" }
+# actix-utils = { path = "../actix-net/actix-utils" }
diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml
index 57aa5833a..56b6fabd9 100644
--- a/actix-cors/Cargo.toml
+++ b/actix-cors/Cargo.toml
@@ -17,7 +17,7 @@ name = "actix_cors"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = "2.0.0-alpha.1"
-actix-service = "1.0.0-alpha.1"
+actix-web = "1.0.9"
+actix-service = "0.4.0"
 derive_more = "0.15.0"
 futures = "0.3.1"
diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml
index 6e33bb412..2f75fb50d 100644
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-files"
-version = "0.2.0-alpha.1"
+version = "0.1.7"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Static files support for actix web."
 readme = "README.md"
@@ -11,19 +11,19 @@ documentation = "https://docs.rs/actix-files/"
 categories = ["asynchronous", "web-programming::http-server"]
 license = "MIT/Apache-2.0"
 edition = "2018"
-workspace = ".."
+# workspace = ".."
 
 [lib]
 name = "actix_files"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "2.0.0-alpha.1", default-features = false }
-actix-http = "0.3.0-alpha.1"
-actix-service = "1.0.0-alpha.1"
+actix-web = { version = "1.0.9", default-features = false }
+actix-http = "0.2.11"
+actix-service = "0.4.2"
 bitflags = "1"
 bytes = "0.4"
-futures = "0.3.1"
+futures = "0.1.24"
 derive_more = "0.15.0"
 log = "0.4"
 mime = "0.3"
@@ -32,4 +32,4 @@ percent-encoding = "2.1"
 v_htmlescape = "0.4"
 
 [dev-dependencies]
-actix-web = { version = "2.0.0-alpha.1", features=["openssl"] }
+actix-web = { version = "1.0.9", features=["ssl"] }
diff --git a/actix-framed/Cargo.toml b/actix-framed/Cargo.toml
index 9d32ebed5..232c6ae66 100644
--- a/actix-framed/Cargo.toml
+++ b/actix-framed/Cargo.toml
@@ -20,19 +20,19 @@ name = "actix_framed"
 path = "src/lib.rs"
 
 [dependencies]
-actix-codec = "0.2.0-alpha.1"
-actix-service = "1.0.0-alpha.1"
+actix-codec = "0.1.2"
+actix-service = "0.4.2"
 actix-router = "0.1.2"
-actix-rt = "1.0.0-alpha.1"
-actix-http = "0.3.0-alpha.1"
-actix-server-config = "0.2.0-alpha.1"
+actix-rt = "0.2.2"
+actix-http = "0.2.11"
+actix-server-config = "0.1.1"
 
 bytes = "0.4"
 futures = "0.1.25"
 log = "0.4"
 
 [dev-dependencies]
-actix-server = { version = "0.8.0-alpha.1", features=["openssl"] }
-actix-connect = { version = "0.3.0-alpha.1", features=["openssl"] }
-actix-http-test = { version = "0.3.0-alpha.1", features=["openssl"] }
-actix-utils = "0.5.0-alpha.1"
+actix-server = { version = "0.6.0", features=["openssl"] }
+actix-connect = { version = "0.2.0", features=["openssl"] }
+actix-http-test = { version = "0.1.0", features=["openssl"] }
+actix-utils = "0.4.0"
diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml
index d05b37685..a307007ef 100644
--- a/actix-identity/Cargo.toml
+++ b/actix-identity/Cargo.toml
@@ -17,14 +17,14 @@ name = "actix_identity"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "2.0.0-alpha.1", default-features = false, features = ["secure-cookies"] }
-actix-service = "1.0.0-alpha.1"
+actix-web = { version = "1.0.9", default-features = false, features = ["secure-cookies"] }
+actix-service = "0.4.2"
 futures = "0.3.1"
 serde = "1.0"
 serde_json = "1.0"
 time = "0.1.42"
 
 [dev-dependencies]
-actix-rt = "1.0.0-alpha.1"
-actix-http = "0.3.0-alpha.1"
+actix-rt = "0.2.2"
+actix-http = "0.2.11"
 bytes = "0.4"
\ No newline at end of file
diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
index 804d1bb67..aa4e9be20 100644
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -18,17 +18,17 @@ name = "actix_multipart"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "2.0.0-alpha.1", default-features = false }
-actix-service = "1.0.0-alpha.1"
+actix-web = { version = "1.0.9", default-features = false }
+actix-service = "0.4.2"
 bytes = "0.4"
 derive_more = "0.15.0"
 httparse = "1.3"
-futures = "0.3.1"
+futures = "0.1.24"
 log = "0.4"
 mime = "0.3"
 time = "0.1"
 twoway = "0.2"
 
 [dev-dependencies]
-actix-rt = "1.0.0-alpha.1"
-actix-http = "0.3.0-alpha.1"
\ No newline at end of file
+actix-rt = "0.2.2"
+actix-http = "0.2.11"
\ No newline at end of file
diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml
index 3ce2a8b40..d2fd5ae50 100644
--- a/actix-session/Cargo.toml
+++ b/actix-session/Cargo.toml
@@ -24,15 +24,15 @@ default = ["cookie-session"]
 cookie-session = ["actix-web/secure-cookies"]
 
 [dependencies]
-actix-web = "2.0.0-alpha.1"
-actix-service = "1.0.0-alpha.1"
+actix-web = "1.0.9"
+actix-service = "0.4.2"
 bytes = "0.4"
 derive_more = "0.15.0"
-futures = "0.3.1"
+futures = "0.1.24"
 hashbrown = "0.6.3"
 serde = "1.0"
 serde_json = "1.0"
 time = "0.1.42"
 
 [dev-dependencies]
-actix-rt = "1.0.0-alpha.1"
+actix-rt = "0.2.2"
diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml
index e43820290..a2b03ffc2 100644
--- a/test-server/Cargo.toml
+++ b/test-server/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous",
 license = "MIT/Apache-2.0"
 exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"]
 edition = "2018"
-# workspace = ".."
+workspace = ".."
 
 [package.metadata.docs.rs]
 features = []
diff --git a/test-server/src/lib.rs b/test-server/src/lib.rs
index 0c24ac907..1ec69b100 100644
--- a/test-server/src/lib.rs
+++ b/test-server/src/lib.rs
@@ -23,24 +23,26 @@ pub use actix_testing::*;
 ///
 /// ```rust
 /// use actix_http::HttpService;
-/// use actix_http_test::TestServer;
-/// use actix_web::{web, App, HttpResponse};
+/// use actix_http_test::{block_on, TestServer};
+/// use actix_web::{web, App, HttpResponse, Error};
 ///
-/// fn my_handler() -> HttpResponse {
-///     HttpResponse::Ok().into()
+/// async fn my_handler() -> Result<HttpResponse, Error> {
+///     Ok(HttpResponse::Ok().into())
 /// }
 ///
 /// fn main() {
-///     let mut srv = TestServer::new(
-///         || HttpService::new(
-///             App::new().service(
-///                 web::resource("/").to(my_handler))
-///         )
-///     );
+///     block_on( async {
+///         let mut srv = TestServer::start(
+///             || HttpService::new(
+///                 App::new().service(
+///                     web::resource("/").to_async(my_handler))
+///             )
+///         );
 ///
-///     let req = srv.get("/");
-///     let response = srv.block_on(req.send()).unwrap();
-///     assert!(response.status().is_success());
+///         let req = srv.get("/");
+///         let response = req.send().await.unwrap();
+///         assert!(response.status().is_success());
+///     })
 /// }
 /// ```
 pub struct TestServer;