diff --git a/dune-project b/dune-project
index 1af5ad3cac212833e1610256c510795a1ddefeea..37ebe1d56fe7ba3c6eb3894667c303d12238a23c 100644
--- a/dune-project
+++ b/dune-project
@@ -153,6 +153,7 @@
 (package (name tezos-tree-encoding-test)(allow_empty))
 (package (name tezos_internal_brassaia_tests)(allow_empty))
 (package (name tezos_internal_irmin_tests)(allow_empty))
+(package (name tezt-cloud))
 (package (name tezt-etherlink)(allow_empty))
 (package (name tezt-riscv-sandbox)(allow_empty))
 (package (name tezt-tests-cloud)(allow_empty))
diff --git a/etherlink/tezt/lib/dune b/etherlink/tezt/lib/dune
index 3a0b5dd4fd017212c86cc54daefa9ccd61f5113d..1c0152665ec276cb01a0fda59dbbbfe5a012ad0a 100644
--- a/etherlink/tezt/lib/dune
+++ b/etherlink/tezt/lib/dune
@@ -9,7 +9,7 @@
   tezt-tezos.tezt-performance-regression
   octez-libs.crypto
   tezt-tezos
-  tezt-tezos.tezt-cloud
+  tezt-cloud
   octez-libs.test-helpers)
  (flags
   (:standard)
@@ -18,5 +18,5 @@
   -open Tezt_tezos_tezt_performance_regression
   -open Tezt_tezos
   -open Tezt_tezos.Runnable.Syntax
-  -open Tezt_tezos_tezt_cloud
+  -open Tezt_cloud
   -open Tezos_test_helpers))
diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml
index 2e435d08dbb27e96a76005aad7070572920da69d..fed5cdc316a9633de9b45b6b501a3d267981cbd8 100644
--- a/manifest/product_octez.ml
+++ b/manifest/product_octez.ml
@@ -2378,10 +2378,11 @@ let tezt_performance_regression =
 
 let tezt_cloud =
   public_lib
-    "tezt-tezos.tezt-cloud"
+    "tezt-cloud"
     ~path:"tezt/lib_cloud"
-    ~opam:"tezt-tezos"
     ~bisect_ppx:No
+    ~synopsis:
+      "Automatic of Cloud deployment for complex scenarios on top of Tezt"
     ~deps:
       [
         tezt_lib |> open_ |> open_ ~m:"Base";
diff --git a/opam/tezt-cloud.opam b/opam/tezt-cloud.opam
new file mode 100644
index 0000000000000000000000000000000000000000..b64a8a2a4aad9e0418a9f0131cbdb66b82b2f30d
--- /dev/null
+++ b/opam/tezt-cloud.opam
@@ -0,0 +1,24 @@
+# This file was automatically generated, do not edit.
+# Edit file manifest/main.ml instead.
+opam-version: "2.0"
+maintainer: "contact@tezos.com"
+authors: ["Tezos devteam"]
+homepage: "https://www.tezos.com/"
+bug-reports: "https://gitlab.com/tezos/tezos/issues"
+dev-repo: "git+https://gitlab.com/tezos/tezos.git"
+license: "MIT"
+depends: [
+  "dune" { >= "3.11.1" }
+  "ocaml" { >= "4.14" }
+  "tezt" { >= "4.1.0" & < "5.0.0" }
+  "tezt-tezos" { = version }
+  "jingoo"
+  "octez-libs" { = version }
+]
+build: [
+  ["rm" "-r" "vendors" "contrib"]
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+available: os-family != "windows"
+synopsis: "Automatic of Cloud deployment for complex scenarios on top of Tezt"
diff --git a/opam/tezt-etherlink.opam b/opam/tezt-etherlink.opam
index c247144f69d58f0a687fffe1ccbebd64885955ca..2c997a88eb10e76133879b63881b412ea672c49b 100644
--- a/opam/tezt-etherlink.opam
+++ b/opam/tezt-etherlink.opam
@@ -12,6 +12,7 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "tezt-tezos"
+  "tezt-cloud"
   "ppx_import" {with-test}
   "ppx_deriving" {with-test}
   "tezt" { with-test & >= "4.1.0" & < "5.0.0" }
diff --git a/opam/tezt-tests-cloud.opam b/opam/tezt-tests-cloud.opam
index 3ac40401aa33b5a2465bdd9d0bacbe07ca8dfc5b..324b5cf71ed5749bfc74d4296b6ff1e56f6107ba 100644
--- a/opam/tezt-tests-cloud.opam
+++ b/opam/tezt-tests-cloud.opam
@@ -13,6 +13,7 @@ depends: [
   "bls12-381"
   "octez-libs"
   "tezt-tezos"
+  "tezt-cloud"
   "tezt-etherlink" { = version }
 ]
 build: [
diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam
index 2c42f83d2b7e4b8a9325bcfbeb3133a77d9dfe23..7a5c9da18fe95f8c02c6de03ebf04994a52c565d 100644
--- a/opam/tezt-tezos.opam
+++ b/opam/tezt-tezos.opam
@@ -12,9 +12,8 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs" { = version }
   "uri" { >= "3.1.0" }
-  "tezt" { >= "4.1.0" & < "5.0.0" }
-  "jingoo"
   "hex" { >= "1.3.0" }
+  "tezt" { with-test & >= "4.1.0" & < "5.0.0" }
   "bls12-381" { with-test & = version }
 ]
 build: [
diff --git a/tezt/lib_cloud/cli.ml b/tezt/lib_cloud/cli.ml
index 91003f0cb3e891bb42a5b77d7ddc00398643a936..a16cb43ad19e25fc7c13c2cbb5bbf60f2ad8df4e 100644
--- a/tezt/lib_cloud/cli.ml
+++ b/tezt/lib_cloud/cli.ml
@@ -238,14 +238,6 @@ let no_dns =
        cancel any effect of [--dns-domain]."
     false
 
-let octez_release =
-  Clap.optional_string
-    ~section
-    ~long:"octez-release"
-    ~placeholder:"<tag>"
-    ~description:"Use the octez release <tag> instead of local octez binaries."
-    ()
-
 let open_telemetry =
   Clap.flag
     ~section
diff --git a/tezt/lib_cloud/cli.mli b/tezt/lib_cloud/cli.mli
index 7d672cd06bf51db2db3f89656a39f9a08b889925..6c5fc7a54ddd079475f73740cc8ab30105f3f9e5 100644
--- a/tezt/lib_cloud/cli.mli
+++ b/tezt/lib_cloud/cli.mli
@@ -99,9 +99,6 @@ val no_dns : bool
 (** OS used by the VM. *)
 val os : string
 
-(** The tag of the octez release to be used. *)
-val octez_release : string option
-
 (** Activate the Open Telemetry collector. *)
 val open_telemetry : bool
 
diff --git a/tezt/lib_cloud/dune b/tezt/lib_cloud/dune
index 3ff95c1a07e5a70e3ea0d0550acf057cab24de55..0d1fe0ca480af204349481fc3640e6b60a3d8b81 100644
--- a/tezt/lib_cloud/dune
+++ b/tezt/lib_cloud/dune
@@ -2,8 +2,8 @@
 ; Edit file manifest/main.ml instead.
 
 (library
- (name tezt_tezos_tezt_cloud)
- (public_name tezt-tezos.tezt-cloud)
+ (name tezt_cloud)
+ (public_name tezt-cloud)
  (libraries
   tezt
   tezt-tezos.tezt-performance-regression
diff --git a/tezt/lib_cloud/tezt_cloud.mli b/tezt/lib_cloud/tezt_cloud.mli
index 05a7770774073a74a3de28d6c8e07bf308b7ff14..93f44d603252769963dcd03aa000507b2b1dbd7f 100644
--- a/tezt/lib_cloud/tezt_cloud.mli
+++ b/tezt/lib_cloud/tezt_cloud.mli
@@ -5,11 +5,7 @@
 (*                                                                           *)
 (*****************************************************************************)
 
-module Agent : sig
-  type t
-
-  val configuration : Agent.t -> Configuration.t
-end
+module Agent = Agent
 
 module Configuration : sig
   type docker_image =
diff --git a/tezt/tests/cloud/dal.ml b/tezt/tests/cloud/dal.ml
index 49cf0ff7c16da43c0532d23d05dd2eb95f24bef7..e81eba6ad0535e9588c37fc83d6e088c7d2ef989 100644
--- a/tezt/tests/cloud/dal.ml
+++ b/tezt/tests/cloud/dal.ml
@@ -776,6 +776,15 @@ module Cli = struct
       ~description:"Runs teztale"
       false
 
+  let octez_release =
+    Clap.optional_string
+      ~section
+      ~long:"octez-release"
+      ~placeholder:"<tag>"
+      ~description:
+        "Use the octez release <tag> instead of local octez binaries."
+      ()
+
   let memtrace =
     Clap.flag
       ~section
@@ -1460,10 +1469,7 @@ let init_teztale (configuration : configuration) cloud agent =
     let* () = Teztale.wait_server teztale in
     let* () =
       let domain =
-        match Env.mode with
-        | `Host | `Cloud ->
-            Agent.point agent |> Option.fold ~none:"localhost" ~some:fst
-        | `Orchestrator | `Localhost -> "localhost"
+        Agent.point agent |> Option.fold ~none:"localhost" ~some:fst
       in
       let port = teztale.server.conf.interface.port in
       let url = sf "http://%s:%d" domain port in
@@ -1676,7 +1682,6 @@ let init_sandbox_and_activate_protocol cloud (configuration : configuration)
       ~url:
         (sf "http://explorus.io?network=%s" (Node.rpc_endpoint bootstrap_node))
   in
-  let* () = Cloud.write_website cloud in
   let* client = Client.init ~endpoint:(Node bootstrap_node) () in
   let* baker_accounts =
     Client.stresstest_gen_keys
@@ -2793,7 +2798,7 @@ let benchmark () =
     |> List.concat
   in
   let docker_image =
-    Option.map (fun tag -> Env.Octez_release {tag}) Cli.octez_release
+    Option.map (fun tag -> Configuration.Octez_release {tag}) Cli.octez_release
   in
   let default_vm_configuration = Configuration.make ?docker_image () in
   let vms =
diff --git a/tezt/tests/cloud/dune b/tezt/tests/cloud/dune
index 5d72d41c9a74a63128ec985d89ce378a197067e0..40f3df964c656fce4567df133ae3e4c2f9bfe50a 100644
--- a/tezt/tests/cloud/dune
+++ b/tezt/tests/cloud/dune
@@ -8,7 +8,7 @@
   octez-libs.test-helpers
   octez-libs.tezt-wrapper
   tezt-tezos
-  tezt-tezos.tezt-cloud
+  tezt-cloud
   tezt_etherlink)
  (link_flags
   (:standard)
@@ -20,4 +20,4 @@
   -open Tezt_wrapper.Base
   -open Tezt_tezos
   -open Tezt_tezos.Runnable.Syntax
-  -open Tezt_tezos_tezt_cloud))
+  -open Tezt_cloud))