diff --git a/packages/cli/README.md b/packages/cli/README.md
index 736aa714..3b763f11 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -39,6 +39,7 @@ USAGE
 * [`preevy ls`](docs/ls.md) - List preview environments
 * [`preevy profile`](docs/profile.md) - View and update profile configuration
 * [`preevy purge`](docs/purge.md) - Delete all cloud provider machines, and potentially other resources
+* [`preevy ssh`](docs/ssh.md) - Execute a command or start an interactive shell inside an environment
 * [`preevy up`](docs/up.md) - Bring up a preview environment
 * [`preevy urls`](docs/urls.md) - Show urls for an existing environment
 * [`preevy version`](docs/version.md) - Show Preevy version
diff --git a/packages/cli/docs/down.md b/packages/cli/docs/down.md
index d9e67811..d634f22c 100644
--- a/packages/cli/docs/down.md
+++ b/packages/cli/docs/down.md
@@ -11,26 +11,27 @@ Delete preview environments
 
 ```
 USAGE
-  $ preevy down [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [-d
-    lightsail|gce|azure|kube-pod] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone <value>]
-    [--azure-region <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>] [--kube-pod-kubeconfig
-    <value>] [--kube-pod-context <value>] [--kube-pod-template <value>] [--id <value>] [--force] [--wait] [--json]
+  $ preevy down [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
+    <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone
+    <value>] [--azure-region <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>]
+    [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template <value>] [--id <value>] [--force]
+    [--wait]
 
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-  --force                Do not error if the environment is not found
-  --id=<value>           Environment id
-  --profile=<value>      Run in a specific profile context
-  --wait                 Wait for resource deletion to complete. If false (the default), the deletion will be started
+      --force            Do not error if the environment is not found
+      --id=<value>       Environment id
+      --profile=<value>  Run in a specific profile context
+      --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
                          but not waited for
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
diff --git a/packages/cli/docs/init.md b/packages/cli/docs/init.md
index 9f4b176f..8cddab19 100644
--- a/packages/cli/docs/init.md
+++ b/packages/cli/docs/init.md
@@ -20,10 +20,10 @@ FLAGS
   -f, --from=<value>  Import profile from existing path
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Initialize or import a new profile
diff --git a/packages/cli/docs/login.md b/packages/cli/docs/login.md
index 1c130691..3f3f5018 100644
--- a/packages/cli/docs/login.md
+++ b/packages/cli/docs/login.md
@@ -20,10 +20,10 @@ FLAGS
   --lc-client-id=<value>  [default: BHXcVtapfKPEpZtYO3AJ2Livmz6j7xK0] The client ID for the OAuth app
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Login to the Livecycle SaaS
diff --git a/packages/cli/docs/logs.md b/packages/cli/docs/logs.md
index bf062480..7e0f89d1 100644
--- a/packages/cli/docs/logs.md
+++ b/packages/cli/docs/logs.md
@@ -23,20 +23,20 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-  --follow               Follow log output
-  --id=<value>           Environment id
-  --no-log-prefix        Don't print log prefix in logs
-  --profile=<value>      Run in a specific profile context
-  --since=<value>        Show logs since timestamp
-  --tail=<value>         Number of lines to show from the end of the logs for each container (default: all)
-  --timestamps           Show timestamps
-  --until=<value>        Show logs before timestamp
+      --follow           Follow log output
+      --id=<value>       Environment id
+      --no-log-prefix    Don't print log prefix in logs
+      --profile=<value>  Run in a specific profile context
+      --since=<value>    Show logs since timestamp
+      --tail=<value>     Number of lines to show from the end of the logs for each container (default: all)
+      --timestamps       Show timestamps
+      --until=<value>    Show logs before timestamp
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
diff --git a/packages/cli/docs/ls.md b/packages/cli/docs/ls.md
index 48a21850..f01a7563 100644
--- a/packages/cli/docs/ls.md
+++ b/packages/cli/docs/ls.md
@@ -11,32 +11,32 @@ List preview environments
 
 ```
 USAGE
-  $ preevy ls [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [-d
-    lightsail|gce|azure|kube-pod] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone <value>]
-    [--azure-region <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>] [--kube-pod-kubeconfig
-    <value>] [--kube-pod-context <value>] [--kube-pod-template <value>] [--columns <value> | -x] [--sort <value>]
-    [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ] [--json]
+  $ preevy ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
+    <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone
+    <value>] [--azure-region <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>]
+    [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template <value>] [--columns <value> | -x]
+    [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>]
 
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
   -x, --extended         show extra columns
-  --columns=<value>      only show provided columns (comma-separated)
-  --csv                  output is csv format [alias: --output=csv]
-  --filter=<value>       filter property by partial string matching, ex: name=foo
-  --no-header            hide table header from output
-  --no-truncate          do not truncate output to fit screen
-  --output=<option>      output in a more machine friendly format
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
                          <options: csv|json|yaml>
-  --profile=<value>      Run in a specific profile context
-  --sort=<value>         property to sort by (prepend '-' for descending)
+      --profile=<value>  Run in a specific profile context
+      --sort=<value>     property to sort by (prepend '-' for descending)
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
diff --git a/packages/cli/docs/profile.md b/packages/cli/docs/profile.md
index f614609d..aed802f7 100644
--- a/packages/cli/docs/profile.md
+++ b/packages/cli/docs/profile.md
@@ -21,31 +21,31 @@ View and update profile configuration
 
 ```
 USAGE
-  $ preevy profile config update [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-    [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>]
+  $ preevy profile config update [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
+    <value>] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>]
     [--azure-subscription-id <value>] [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context
     <value>] [--kube-pod-template <value>] [--lightsail-availability-zone <value>] [--lightsail-bundle-id
     nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
     [--azure-vm-size <value>] [--kube-pod-server-side-apply] [-d lightsail|gce|azure|kube-pod] [--unset
     lightsail-region|gce-project-id|gce-zone|azure-region|azure-subscription-id|kube-pod-namespace|kube-pod-kubeconfig|k
     ube-pod-context|kube-pod-template|lightsail-availability-zone|lightsail-bundle-id|gce-machine-type|azure-vm-size|kub
-    e-pod-server-side-apply] [--json]
+    e-pod-server-side-apply]
 
 FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-  --profile=<value>      Run in a specific profile context
-  --unset=<option>...    [default: ] Unset a configuration option
-                         <options: lightsail-region|gce-project-id|gce-zone|azure-region|azure-subscription-id|kube-pod-
-                         namespace|kube-pod-kubeconfig|kube-pod-context|kube-pod-template|lightsail-availability-zone|li
-                         ghtsail-bundle-id|gce-machine-type|azure-vm-size|kube-pod-server-side-apply>
+  -d, --driver=<option>    Machine driver to use
+                           <options: lightsail|gce|azure|kube-pod>
+      --profile=<value>    Run in a specific profile context
+      --unset=<option>...  [default: ] Unset a configuration option
+                           <options: lightsail-region|gce-project-id|gce-zone|azure-region|azure-subscription-id|kube-po
+                           d-namespace|kube-pod-kubeconfig|kube-pod-context|kube-pod-template|lightsail-availability-zon
+                           e|lightsail-bundle-id|gce-machine-type|azure-vm-size|kube-pod-server-side-apply>
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
@@ -83,18 +83,18 @@ View profile configuration
 
 ```
 USAGE
-  $ preevy profile config view [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-  [--json]
+  $ preevy profile config view [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
+  <value>]
 
 FLAGS
   --profile=<value>  Run in a specific profile context
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   View profile configuration
@@ -108,7 +108,7 @@ Copy a profile
 
 ```
 USAGE
-  $ preevy profile cp [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json] [--profile
+  $ preevy profile cp [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
     <value>] [--target-location <value> | --target-storage local|s3|gs] [--target-name <value>] [--use]
 
 FLAGS
@@ -120,11 +120,11 @@ FLAGS
   --use                      Mark the new profile as the current profile
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Copy a profile
@@ -138,12 +138,12 @@ Create a new profile
 
 ```
 USAGE
-  $ preevy profile create NAME URL [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
-    <value>] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>]
-    [--azure-subscription-id <value>] [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-context
-    <value>] [--kube-pod-template <value>] [--lightsail-availability-zone <value>] [--lightsail-bundle-id
-    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
-    [--azure-vm-size <value>] [--kube-pod-server-side-apply] [-d lightsail|gce|azure|kube-pod] [--use] [--json]
+  $ preevy profile create NAME URL [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
+    [--profile <value>] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone <value>] [--azure-region
+    <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>]
+    [--kube-pod-context <value>] [--kube-pod-template <value>] [--lightsail-availability-zone <value>]
+    [--lightsail-bundle-id nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type
+    <value>] [--azure-vm-size <value>] [--kube-pod-server-side-apply] [-d lightsail|gce|azure|kube-pod] [--use]
 
 ARGUMENTS
   NAME  Name of the new profile
@@ -152,15 +152,15 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-  --profile=<value>      Run in a specific profile context
-  --use                  Mark the new profile as the current profile
+      --profile=<value>  Run in a specific profile context
+      --use              Mark the new profile as the current profile
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
@@ -199,17 +199,17 @@ Display current profile in use
 
 ```
 USAGE
-  $ preevy profile current [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [--json]
+  $ preevy profile current [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
 
 FLAGS
   --profile=<value>  Run in a specific profile context
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Display current profile in use
@@ -234,10 +234,10 @@ FLAGS
   --use           Mark the new profile as the current profile
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Import an existing profile
@@ -251,8 +251,8 @@ Show profile key
 
 ```
 USAGE
-  $ preevy profile key [TYPE] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-    [--json]
+  $ preevy profile key [TYPE] [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
+    <value>]
 
 ARGUMENTS
   TYPE  (private|public-pem|public-ssh|thumbprint|thumbprint-uri) [default: thumbprint-uri] type of the key to show
@@ -261,11 +261,11 @@ FLAGS
   --profile=<value>  Run in a specific profile context
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Show profile key
@@ -289,10 +289,10 @@ FLAGS
   --profile=<value>       Run in a specific profile context
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Link the profile to the logged in user's organization
@@ -306,17 +306,17 @@ Lists profiles
 
 ```
 USAGE
-  $ preevy profile ls [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [--json]
+  $ preevy profile ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
 
 FLAGS
   --profile=<value>  Run in a specific profile context
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Lists profiles
@@ -330,8 +330,8 @@ Remove a profile
 
 ```
 USAGE
-  $ preevy profile rm NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-    [--json]
+  $ preevy profile rm NAME [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
+    <value>]
 
 ARGUMENTS
   NAME  name of the profile to remove
@@ -340,11 +340,11 @@ FLAGS
   --profile=<value>  Run in a specific profile context
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Remove a profile
@@ -364,10 +364,10 @@ ARGUMENTS
   NAME  name of the profile to use
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Set current profile
diff --git a/packages/cli/docs/purge.md b/packages/cli/docs/purge.md
index ca453e75..06fb4c20 100644
--- a/packages/cli/docs/purge.md
+++ b/packages/cli/docs/purge.md
@@ -11,28 +11,28 @@ Delete all cloud provider machines, and potentially other resources
 
 ```
 USAGE
-  $ preevy purge [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [-d
-    lightsail|gce|azure|kube-pod] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone <value>]
-    [--azure-region <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>] [--kube-pod-kubeconfig
-    <value>] [--kube-pod-context <value>] [--kube-pod-template <value>] [--all] [--type <value>] [--force] [--wait]
-    [--json]
+  $ preevy purge [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
+    <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone
+    <value>] [--azure-region <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>]
+    [--kube-pod-kubeconfig <value>] [--kube-pod-context <value>] [--kube-pod-template <value>] [--all] [--type <value>]
+    [--force] [--wait]
 
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-  --all                  Remove all resources types (snapshots, keypairs, and other resource types)
-  --force                Do not ask for confirmation
-  --profile=<value>      Run in a specific profile context
-  --type=<value>...      [default: machine] Resource type(s) to delete
-  --wait                 Wait for resource deletion to complete. If false (the default), the deletion will be started
+      --all              Remove all resources types (snapshots, keypairs, and other resource types)
+      --force            Do not ask for confirmation
+      --profile=<value>  Run in a specific profile context
+      --type=<value>...  [default: machine] Resource type(s) to delete
+      --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
                          but not waited for
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
diff --git a/packages/cli/docs/ssh.md b/packages/cli/docs/ssh.md
new file mode 100644
index 00000000..b19c6438
--- /dev/null
+++ b/packages/cli/docs/ssh.md
@@ -0,0 +1,56 @@
+`preevy ssh`
+============
+
+Execute a command or start an interactive shell inside an environment
+
+* [`preevy ssh ENVID`](#preevy-ssh-envid)
+
+## `preevy ssh ENVID`
+
+Execute a command or start an interactive shell inside an environment
+
+```
+USAGE
+  $ preevy ssh ENVID [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
+    [-d lightsail|gce|azure|kube-pod] [--lightsail-region <value>] [--gce-project-id <value>] [--gce-zone <value>]
+    [--azure-region <value>] [--azure-subscription-id <value>] [--kube-pod-namespace <value>] [--kube-pod-kubeconfig
+    <value>] [--kube-pod-context <value>] [--kube-pod-template <value>]
+
+ARGUMENTS
+  ENVID  Environment id
+
+FLAGS
+  -d, --driver=<option>  Machine driver to use
+                         <options: lightsail|gce|azure|kube-pod>
+      --profile=<value>  Run in a specific profile context
+
+GLOBAL FLAGS
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+
+GCE DRIVER FLAGS
+  --gce-project-id=<value>  Google Cloud project ID
+  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
+
+KUBE-POD DRIVER FLAGS
+  --kube-pod-context=<value>     kubeconfig context name (will load config from defaults if not specified)
+  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
+                                 to exist)
+  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-region=<value>  AWS region in which resources will be provisioned
+
+DESCRIPTION
+  Execute a command or start an interactive shell inside an environment
+
+ALIASES
+  $ preevy ssh
+```
diff --git a/packages/cli/docs/up.md b/packages/cli/docs/up.md
index 81b5970d..5e896fb4 100644
--- a/packages/cli/docs/up.md
+++ b/packages/cli/docs/up.md
@@ -19,42 +19,42 @@ USAGE
     nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
     [--azure-vm-size <value>] [--kube-pod-server-side-apply] [--id <value>] [-t <value>] [--tls-hostname <value>]
     [--insecure-skip-verify] [--no-build] [--no-registry-single-name | [--registry-single-name <value> --registry
-    <value>]] [--no-registry-cache ] [--load] [--builder <value>] [--no-cache] [--skip-unchanged-files]
-    [--show-preevy-service-urls] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |
-    | [--csv | --no-truncate]] [--no-header | ]
+    <value>]] [--no-registry-cache ] [--builder <value>] [--no-cache] [--skip-unchanged-files]
+    [--show-preevy-service-urls] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv | --no-truncate]]
+    [--output csv|json|yaml |  | ] [--sort <value>]
 
 ARGUMENTS
   SERVICE  Service name(s). If not specified, will deploy all services
 
 FLAGS
-  -d, --driver=<option>               Machine driver to use
-                                      <options: lightsail|gce|azure|kube-pod>
-  -t, --tunnel-url=<value>            [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port] or
-                                      ssh+tls://hostname[:port]
-  -x, --extended                      show extra columns
-  --access-credentials-type=<option>  (required) [default: browser] Access credentials type
-                                      <options: api|browser>
-  --columns=<value>                   only show provided columns (comma-separated)
-  --csv                               output is csv format [alias: --output=csv]
-  --filter=<value>                    filter property by partial string matching, ex: name=foo
-  --id=<value>                        Environment id
-  --include-access-credentials        Include access credentials for basic auth for each service URL
-  --insecure-skip-verify              Skip TLS or SSH certificate verification
-  --no-header                         hide table header from output
-  --no-truncate                       do not truncate output to fit screen
-  --output=<option>                   output in a more machine friendly format
-                                      <options: csv|json|yaml>
-  --profile=<value>                   Run in a specific profile context
-  --show-preevy-service-urls          Show URLs for internal Preevy services
-  --[no-]skip-unchanged-files         Detect and skip unchanged files when copying (default: true)
-  --sort=<value>                      property to sort by (prepend '-' for descending)
-  --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
+  -d, --driver=<option>                   Machine driver to use
+                                          <options: lightsail|gce|azure|kube-pod>
+  -t, --tunnel-url=<value>                [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port]
+                                          or ssh+tls://hostname[:port]
+  -x, --extended                          show extra columns
+      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
+                                          <options: api|browser>
+      --columns=<value>                   only show provided columns (comma-separated)
+      --csv                               output is csv format [alias: --output=csv]
+      --filter=<value>                    filter property by partial string matching, ex: name=foo
+      --id=<value>                        Environment id
+      --include-access-credentials        Include access credentials for basic auth for each service URL
+      --insecure-skip-verify              Skip TLS or SSH certificate verification
+      --no-header                         hide table header from output
+      --no-truncate                       do not truncate output to fit screen
+      --output=<option>                   output in a more machine friendly format
+                                          <options: csv|json|yaml>
+      --profile=<value>                   Run in a specific profile context
+      --show-preevy-service-urls          Show URLs for internal Preevy services
+      --[no-]skip-unchanged-files         Detect and skip unchanged files when copying (default: true)
+      --sort=<value>                      property to sort by (prepend '-' for descending)
+      --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
@@ -63,7 +63,6 @@ AZURE DRIVER FLAGS
 
 BUILD FLAGS
   --builder=<value>               Builder to use
-  --load                          Load build results to the Docker server at the deployment target
   --no-build                      Do not build images
   --no-cache                      Do not use cache when building the images
   --no-registry-cache             Do not add the registry as a cache source and target
diff --git a/packages/cli/docs/urls.md b/packages/cli/docs/urls.md
index 6c91ce1a..498e071e 100644
--- a/packages/cli/docs/urls.md
+++ b/packages/cli/docs/urls.md
@@ -11,42 +11,42 @@ Show urls for an existing environment
 
 ```
 USAGE
-  $ preevy urls [SERVICE] [PORT] (--access-credentials-type api|browser --include-access-credentials) [-D]
-    [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [--id <value>] [-t <value>]
-    [--tls-hostname <value>] [--insecure-skip-verify] [--columns <value> | -x] [--sort <value>] [--filter <value>]
-    [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ] [--show-preevy-service-urls] [--json]
+  $ preevy urls [SERVICE] [PORT] (--access-credentials-type api|browser --include-access-credentials)
+    [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [--id <value>] [-t
+    <value>] [--tls-hostname <value>] [--insecure-skip-verify] [--columns <value> | -x] [--filter <value>] [--no-header
+    | [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--show-preevy-service-]
 
 ARGUMENTS
   SERVICE  Service name. If not specified, will show all services
   PORT     Service port. If not specified, will show all ports for the specified service
 
 FLAGS
-  -t, --tunnel-url=<value>            [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port] or
-                                      ssh+tls://hostname[:port]
-  -x, --extended                      show extra columns
-  --access-credentials-type=<option>  (required) [default: browser] Access credentials type
-                                      <options: api|browser>
-  --columns=<value>                   only show provided columns (comma-separated)
-  --csv                               output is csv format [alias: --output=csv]
-  --filter=<value>                    filter property by partial string matching, ex: name=foo
-  --id=<value>                        Environment id
-  --include-access-credentials        Include access credentials for basic auth for each service URL
-  --insecure-skip-verify              Skip TLS or SSH certificate verification
-  --no-header                         hide table header from output
-  --no-truncate                       do not truncate output to fit screen
-  --output=<option>                   output in a more machine friendly format
-                                      <options: csv|json|yaml>
-  --profile=<value>                   Run in a specific profile context
-  --show-preevy-service-urls          Show URLs for internal Preevy services
-  --sort=<value>                      property to sort by (prepend '-' for descending)
-  --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
+  -t, --tunnel-url=<value>                [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port]
+                                          or ssh+tls://hostname[:port]
+  -x, --extended                          show extra columns
+      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
+                                          <options: api|browser>
+      --columns=<value>                   only show provided columns (comma-separated)
+      --csv                               output is csv format [alias: --output=csv]
+      --filter=<value>                    filter property by partial string matching, ex: name=foo
+      --id=<value>                        Environment id
+      --include-access-credentials        Include access credentials for basic auth for each service URL
+      --insecure-skip-verify              Skip TLS or SSH certificate verification
+      --no-header                         hide table header from output
+      --no-truncate                       do not truncate output to fit screen
+      --output=<option>                   output in a more machine friendly format
+                                          <options: csv|json|yaml>
+      --profile=<value>                   Run in a specific profile context
+      --show-preevy-service-urls          Show URLs for internal Preevy services
+      --sort=<value>                      property to sort by (prepend '-' for descending)
+      --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Show urls for an existing environment
diff --git a/packages/cli/docs/version.md b/packages/cli/docs/version.md
index bc71fa61..571f93eb 100644
--- a/packages/cli/docs/version.md
+++ b/packages/cli/docs/version.md
@@ -11,14 +11,14 @@ Show Preevy version
 
 ```
 USAGE
-  $ preevy version [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+  $ preevy version [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
 
 GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+  -D, --debug                           Enable debug logging
+  -f, --file=<value>...                 [default: ] Compose configuration file
+  -p, --project=<value>                 Project name. Defaults to the Compose project name
+      --json                            Format output as json.
+      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
 DESCRIPTION
   Show Preevy version
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 76af7590..7068ec0e 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -10,7 +10,7 @@
     "lib": ["es2022", "ESNext.Disposable"],
     "esModuleInterop": true,
     "sourceMap": true,
-    "baseUrl": ".",
+    "baseUrl": "."
   },
   "include": [
     "src/**/*"
@@ -25,6 +25,6 @@
     { "path": "../driver-gce" },
     { "path": "../driver-azure" },
     { "path": "../driver-kube-pod" },
-    { "path": "../plugin-github-pr-link" },
+    { "path": "../plugin-github-pr-link" }
   ]
 }