diff --git a/packages/cli/README.md b/packages/cli/README.md
index 7d6076cc..736aa714 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -11,6 +11,7 @@ Preevy is a CLI tool for easily creating preview environments for your Docker Co
 <!-- toc -->
 * [Usage](#usage)
 * [Commands](#commands)
+* [Command Topics](#command-topics)
 <!-- tocstop -->
 # Usage
 <!-- usage -->
@@ -19,7 +20,7 @@ $ npm install -g preevy
 $ preevy COMMAND
 running command...
 $ preevy (--version)
-preevy/0.0.56 darwin-arm64 node-v18.17.1
+preevy/0.0.56 darwin-arm64 node-v18.12.1
 $ preevy --help [COMMAND]
 USAGE
   $ preevy COMMAND
@@ -28,857 +29,18 @@ USAGE
 <!-- usagestop -->
 # Commands
 <!-- commands -->
-* [`preevy down`](#preevy-down)
-* [`preevy help [COMMANDS]`](#preevy-help-commands)
-* [`preevy init [PROFILE-ALIAS]`](#preevy-init-profile-alias)
-* [`preevy login`](#preevy-login)
-* [`preevy logs [SERVICES]`](#preevy-logs-services)
-* [`preevy ls`](#preevy-ls)
-* [`preevy profile config update`](#preevy-profile-config-update)
-* [`preevy profile config view`](#preevy-profile-config-view)
-* [`preevy profile cp`](#preevy-profile-cp)
-* [`preevy profile create NAME URL`](#preevy-profile-create-name-url)
-* [`preevy profile current`](#preevy-profile-current)
-* [`preevy profile import LOCATION`](#preevy-profile-import-location)
-* [`preevy profile key [TYPE]`](#preevy-profile-key-type)
-* [`preevy profile link`](#preevy-profile-link)
-* [`preevy profile ls`](#preevy-profile-ls)
-* [`preevy profile rm NAME`](#preevy-profile-rm-name)
-* [`preevy profile use NAME`](#preevy-profile-use-name)
-* [`preevy purge`](#preevy-purge)
-* [`preevy up [SERVICE]`](#preevy-up-service)
-* [`preevy urls [SERVICE] [PORT]`](#preevy-urls-service-port)
-* [`preevy version`](#preevy-version)
+# Command Topics
+
+* [`preevy down`](docs/down.md) - Delete preview environments
+* [`preevy help`](docs/help.md) - Display help for preevy.
+* [`preevy init`](docs/init.md) - Initialize or import a new profile
+* [`preevy login`](docs/login.md) - Login to the Livecycle SaaS
+* [`preevy logs`](docs/logs.md) - Show logs for an existing environment
+* [`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 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
 
-## `preevy down`
-
-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 us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--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]
-
-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 - affects created URLs. If not specified, will try to detect automatically
-  --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
-
-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=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-
-DESCRIPTION
-  Delete preview environments
-```
-
-_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/down.ts)_
-
-## `preevy help [COMMANDS]`
-
-Display help for preevy.
-
-```
-USAGE
-  $ preevy help [COMMANDS] [-n]
-
-ARGUMENTS
-  COMMANDS  Command to show help for.
-
-FLAGS
-  -n, --nested-commands  Include all nested commands in the output.
-
-DESCRIPTION
-  Display help for preevy.
-```
-
-_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/help.ts)_
-
-## `preevy init [PROFILE-ALIAS]`
-
-Initialize or import a new profile
-
-```
-USAGE
-  $ preevy init [PROFILE-ALIAS] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-f <value>]
-
-ARGUMENTS
-  PROFILE-ALIAS  [default: default] Alias of the profile
-
-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
-
-DESCRIPTION
-  Initialize or import a new profile
-```
-
-_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/init.ts)_
-
-## `preevy login`
-
-Login to the Livecycle SaaS
-
-```
-USAGE
-  $ preevy login [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--lc-auth-url <value>]
-    [--lc-api-url <value>] [--lc-client-id <value>]
-
-FLAGS
-  --lc-api-url=<value>    [default: https://app.livecycle.run] The Livecycle API URL'
-  --lc-auth-url=<value>   [default: https://auth.livecycle.dev] The login URL
-  --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
-
-DESCRIPTION
-  Login to the Livecycle SaaS
-```
-
-_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/login.ts)_
-
-## `preevy logs [SERVICES]`
-
-Show logs for an existing environment
-
-```
-USAGE
-  $ preevy logs [SERVICES] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
-    <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast
-    -2|ap-southeast-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--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>] [--follow] [--tail <value>] [--no-log-prefix] [--timestamps] [--since <value>] [--until
-    <value>]
-
-ARGUMENTS
-  SERVICES  Service name(s). If not specified, will show all services
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-  --follow               Follow log output
-  --id=<value>           Environment id - affects created URLs. If not specified, will try to detect automatically
-  --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
-
-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=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-
-DESCRIPTION
-  Show logs for an existing environment
-```
-
-_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/logs.ts)_
-
-## `preevy ls`
-
-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 us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--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]
-
-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
-                         <options: csv|json|yaml>
-  --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
-
-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=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-
-DESCRIPTION
-  List preview environments
-```
-
-_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/ls.ts)_
-
-## `preevy profile config update`
-
-View and update profile configuration
-
-```
-USAGE
-  $ preevy profile config update [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-    [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northea
-    st-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--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]
-
-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>
-
-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
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-  --azure-vm-size=<value>          Machine type to be provisioned
-
-GCE DRIVER FLAGS
-  --gce-machine-type=<value>  Machine type to be provisioned
-  --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>       Kubernetes namespace in which resources will be provisioned (needs to exist)
-  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
-  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
-  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
-                                         <options:
-                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<option>            AWS region in which resources will be provisioned
-                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
-                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
-                                         u-west-3|eu-north-1>
-
-DESCRIPTION
-  View and update profile configuration
-```
-
-_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/config/update.ts)_
-
-## `preevy profile config view`
-
-View profile configuration
-
-```
-USAGE
-  $ preevy profile config view [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-  [--json]
-
-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
-
-DESCRIPTION
-  View profile configuration
-```
-
-_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/config/view.ts)_
-
-## `preevy profile cp`
-
-Copy a profile
-
-```
-USAGE
-  $ preevy profile cp [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json] [--profile
-    <value>] [--target-location <value> | --target-storage local|s3|gs] [--target-name <value>] [--use]
-
-FLAGS
-  --profile=<value>          Source profile name, defaults to the current profile
-  --target-location=<value>  Target profile location URL
-  --target-name=<value>      Target profile name
-  --target-storage=<option>  Target profile storage type
-                             <options: local|s3|gs>
-  --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
-
-DESCRIPTION
-  Copy a profile
-```
-
-_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/cp.ts)_
-
-## `preevy profile create NAME URL`
-
-Create a new profile
-
-```
-USAGE
-  $ preevy profile create NAME URL [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
-    <value>] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|a
-    p-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--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]
-
-ARGUMENTS
-  NAME  Name of the new profile
-  URL   URL of the new profile
-
-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
-
-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
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-  --azure-vm-size=<value>          [default: Standard_B2s] Machine type to be provisioned
-
-GCE DRIVER FLAGS
-  --gce-machine-type=<value>  Machine type to be provisioned
-  --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)
-  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
-  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
-  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
-                                         <options:
-                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<option>            AWS region in which resources will be provisioned
-                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
-                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
-                                         u-west-3|eu-north-1>
-
-DESCRIPTION
-  Create a new profile
-```
-
-_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/create.ts)_
-
-## `preevy profile current`
-
-Display current profile in use
-
-```
-USAGE
-  $ preevy profile current [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [--json]
-
-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
-
-DESCRIPTION
-  Display current profile in use
-```
-
-_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/current.ts)_
-
-## `preevy profile import LOCATION`
-
-Import an existing profile
-
-```
-USAGE
-  $ preevy profile import LOCATION [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--name <value>]
-    [--use]
-
-ARGUMENTS
-  LOCATION  URL of the profile
-
-FLAGS
-  --name=<value>  Name of the profile
-  --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
-
-DESCRIPTION
-  Import an existing profile
-```
-
-_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/import.ts)_
-
-## `preevy profile key [TYPE]`
-
-Show profile key
-
-```
-USAGE
-  $ preevy profile key [TYPE] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-    [--json]
-
-ARGUMENTS
-  TYPE  (private|public-pem|public-ssh|thumbprint|thumbprint-uri) [default: thumbprint-uri] type of the key to show
-
-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
-
-DESCRIPTION
-  Show profile key
-```
-
-_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/key.ts)_
-
-## `preevy profile link`
-
-Link the profile to the logged in user's organization
-
-```
-USAGE
-  $ preevy profile link [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-    [--lc-api-url <value>] [--access-token <value>] [--org <value>]
-
-FLAGS
-  --access-token=<value>  Livecycle's Access Token
-  --lc-api-url=<value>    [default: https://app.livecycle.run] The Livecycle API URL'
-  --org=<value>           Target organization slug for linking the profile
-  --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
-
-DESCRIPTION
-  Link the profile to the logged in user's organization
-```
-
-_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/link.ts)_
-
-## `preevy profile ls`
-
-Lists profiles
-
-```
-USAGE
-  $ preevy profile ls [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [--json]
-
-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
-
-DESCRIPTION
-  Lists profiles
-```
-
-_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/ls.ts)_
-
-## `preevy profile rm NAME`
-
-Remove a profile
-
-```
-USAGE
-  $ preevy profile rm NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-    [--json]
-
-ARGUMENTS
-  NAME  name of the profile to remove
-
-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
-
-DESCRIPTION
-  Remove a profile
-```
-
-_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/rm.ts)_
-
-## `preevy profile use NAME`
-
-Set current profile
-
-```
-USAGE
-  $ preevy profile use NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-
-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
-
-DESCRIPTION
-  Set current profile
-```
-
-_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/use.ts)_
-
-## `preevy purge`
-
-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 us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--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]
-
-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
-                         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
-
-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=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-
-DESCRIPTION
-  Delete all cloud provider machines, and potentially other resources
-```
-
-_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/purge.ts)_
-
-## `preevy up [SERVICE]`
-
-Bring up a preview environment
-
-```
-USAGE
-  $ preevy up [SERVICE] (--access-credentials-type api|browser --include-access-credentials) [-D] [-f
-    <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [-d lightsail|gce|azure|kube-pod]
-    [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northea
-    st-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--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] [--id <value>] [-t <value>] [--tls-hostname <value>]
-    [--insecure-skip-verify] [--skip-unchanged-files] [--show-preevy-service-urls] [--columns <value> | -x] [--sort
-    <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-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]
-                                      <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 - affects created URLs. If not specified, will try to detect
-                                      automatically
-  --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
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-  --azure-vm-size=<value>          [default: Standard_B2s] Machine type to be provisioned
-
-GCE DRIVER FLAGS
-  --gce-machine-type=<value>  Machine type to be provisioned
-  --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)
-  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
-  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
-  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
-                                         <options:
-                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<option>            AWS region in which resources will be provisioned
-                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
-                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
-                                         u-west-3|eu-north-1>
-
-DESCRIPTION
-  Bring up a preview environment
-```
-
-_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/up.ts)_
-
-## `preevy urls [SERVICE] [PORT]`
-
-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]
-
-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]
-                                      <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 - affects created URLs. If not specified, will try to detect
-                                      automatically
-  --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
-
-DESCRIPTION
-  Show urls for an existing environment
-```
-
-_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/urls.ts)_
-
-## `preevy version`
-
-Show Preevy version
-
-```
-USAGE
-  $ preevy version [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
-
-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
-
-DESCRIPTION
-  Show Preevy version
-```
-
-_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/version.ts)_
 <!-- commandsstop -->
diff --git a/packages/cli/docs/down.md b/packages/cli/docs/down.md
index 0365dc5a..d9e67811 100644
--- a/packages/cli/docs/down.md
+++ b/packages/cli/docs/down.md
@@ -12,17 +12,15 @@ 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 us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--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]
+    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]
 
 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 - affects created URLs. If not specified, will try to detect automatically
+  --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
@@ -50,12 +48,16 @@ KUBE-POD DRIVER FLAGS
   --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
 
 LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+  --lightsail-region=<value>  AWS region in which resources will be provisioned
 
 DESCRIPTION
   Delete preview environments
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/down.ts)_
+_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/down.ts)_
diff --git a/packages/cli/docs/help.md b/packages/cli/docs/help.md
index b18c8365..3c1a6049 100644
--- a/packages/cli/docs/help.md
+++ b/packages/cli/docs/help.md
@@ -23,4 +23,4 @@ DESCRIPTION
   Display help for preevy.
 ```
 
-_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/help.ts)_
+_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/help.ts)_
diff --git a/packages/cli/docs/init.md b/packages/cli/docs/init.md
index 0f1cef3c..9f4b176f 100644
--- a/packages/cli/docs/init.md
+++ b/packages/cli/docs/init.md
@@ -29,4 +29,4 @@ DESCRIPTION
   Initialize or import a new profile
 ```
 
-_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/init.ts)_
+_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/init.ts)_
diff --git a/packages/cli/docs/login.md b/packages/cli/docs/login.md
index 77ea48dd..1c130691 100644
--- a/packages/cli/docs/login.md
+++ b/packages/cli/docs/login.md
@@ -29,4 +29,4 @@ DESCRIPTION
   Login to the Livecycle SaaS
 ```
 
-_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/login.ts)_
diff --git a/packages/cli/docs/logs.md b/packages/cli/docs/logs.md
index 12ff2d7a..bf062480 100644
--- a/packages/cli/docs/logs.md
+++ b/packages/cli/docs/logs.md
@@ -12,12 +12,10 @@ Show logs for an existing environment
 ```
 USAGE
   $ preevy logs [SERVICES] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
-    <value>] [-d lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast
-    -2|ap-southeast-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--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>] [--follow] [--tail <value>] [--no-log-prefix] [--timestamps] [--since <value>] [--until
-    <value>]
+    <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>] [--follow]
+    [--tail <value>] [--no-log-prefix] [--timestamps] [--since <value>] [--until <value>]
 
 ARGUMENTS
   SERVICES  Service name(s). If not specified, will show all services
@@ -26,7 +24,7 @@ FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
   --follow               Follow log output
-  --id=<value>           Environment id - affects created URLs. If not specified, will try to detect automatically
+  --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
@@ -56,12 +54,16 @@ KUBE-POD DRIVER FLAGS
   --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
 
 LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+  --lightsail-region=<value>  AWS region in which resources will be provisioned
 
 DESCRIPTION
   Show logs for an existing environment
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/logs.ts)_
diff --git a/packages/cli/docs/ls.md b/packages/cli/docs/ls.md
index 01a13f9e..48a21850 100644
--- a/packages/cli/docs/ls.md
+++ b/packages/cli/docs/ls.md
@@ -12,12 +12,10 @@ 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 us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--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]
+    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]
 
 FLAGS
   -d, --driver=<option>  Machine driver to use
@@ -56,12 +54,10 @@ KUBE-POD DRIVER FLAGS
   --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
 
 LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+  --lightsail-region=<value>  AWS region in which resources will be provisioned
 
 DESCRIPTION
   List preview environments
 ```
 
-_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/ls.ts)_
+_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/ls.ts)_
diff --git a/packages/cli/docs/profile.md b/packages/cli/docs/profile.md
index 2d503704..f614609d 100644
--- a/packages/cli/docs/profile.md
+++ b/packages/cli/docs/profile.md
@@ -22,26 +22,23 @@ View and update profile configuration
 ```
 USAGE
   $ preevy profile config update [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>]
-    [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northea
-    st-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--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
+    [--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>] [--azure-resource-group-name <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|k
-    ube-pod-namespace|kube-pod-kubeconfig|kube-pod-context|kube-pod-template|lightsail-availability-zone|lightsail-bundl
-    e-id|gce-machine-type|azure-vm-size|azure-resource-group-name|kube-pod-server-side-apply] [--json]
+    [--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]
 
 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|lightsail-bu
-                         ndle-id|gce-machine-type|azure-vm-size|azure-resource-group-name|kube-pod-server-side-apply>
+                         <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>
 
 GLOBAL FLAGS
   -D, --debug                       Enable debug logging
@@ -51,10 +48,9 @@ GLOBAL FLAGS
   --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-resource-group-name=<value>  Microsoft Azure resource group name
-  --azure-subscription-id=<value>      Microsoft Azure subscription id
-  --azure-vm-size=<value>              Machine type to be provisioned
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+  --azure-vm-size=<value>          Machine type to be provisioned
 
 GCE DRIVER FLAGS
   --gce-machine-type=<value>  Machine type to be provisioned
@@ -73,16 +69,13 @@ LIGHTSAIL DRIVER FLAGS
   --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
                                          <options:
                                          nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<option>            AWS region in which resources will be provisioned
-                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
-                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
-                                         u-west-3|eu-north-1>
+  --lightsail-region=<value>             AWS region in which resources will be provisioned
 
 DESCRIPTION
   View and update profile configuration
 ```
 
-_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/config/update.ts)_
+_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/config/update.ts)_
 
 ## `preevy profile config view`
 
@@ -107,7 +100,7 @@ DESCRIPTION
   View profile configuration
 ```
 
-_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/config/view.ts)_
+_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/config/view.ts)_
 
 ## `preevy profile cp`
 
@@ -137,7 +130,7 @@ DESCRIPTION
   Copy a profile
 ```
 
-_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/cp.ts)_
+_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/cp.ts)_
 
 ## `preevy profile create NAME URL`
 
@@ -146,14 +139,11 @@ Create a new profile
 ```
 USAGE
   $ preevy profile create NAME URL [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--profile
-    <value>] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|a
-    p-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--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
+    <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>] [--azure-resource-group-name <value>] [--kube-pod-server-side-apply] [-d
-    lightsail|gce|azure|kube-pod] [--use] [--json]
+    [--azure-vm-size <value>] [--kube-pod-server-side-apply] [-d lightsail|gce|azure|kube-pod] [--use] [--json]
 
 ARGUMENTS
   NAME  Name of the new profile
@@ -173,10 +163,9 @@ GLOBAL FLAGS
   --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-resource-group-name=<value>  Microsoft Azure resource group name
-  --azure-subscription-id=<value>      Microsoft Azure subscription id
-  --azure-vm-size=<value>              [default: Standard_B2s] Machine type to be provisioned
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+  --azure-vm-size=<value>          [default: Standard_B2s] Machine type to be provisioned
 
 GCE DRIVER FLAGS
   --gce-machine-type=<value>  Machine type to be provisioned
@@ -196,16 +185,13 @@ LIGHTSAIL DRIVER FLAGS
   --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
                                          <options:
                                          nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<option>            AWS region in which resources will be provisioned
-                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
-                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
-                                         u-west-3|eu-north-1>
+  --lightsail-region=<value>             AWS region in which resources will be provisioned
 
 DESCRIPTION
   Create a new profile
 ```
 
-_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/create.ts)_
+_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/create.ts)_
 
 ## `preevy profile current`
 
@@ -229,7 +215,7 @@ DESCRIPTION
   Display current profile in use
 ```
 
-_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/current.ts)_
+_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/current.ts)_
 
 ## `preevy profile import LOCATION`
 
@@ -257,7 +243,7 @@ DESCRIPTION
   Import an existing profile
 ```
 
-_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/import.ts)_
+_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/import.ts)_
 
 ## `preevy profile key [TYPE]`
 
@@ -285,7 +271,7 @@ DESCRIPTION
   Show profile key
 ```
 
-_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/key.ts)_
+_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/key.ts)_
 
 ## `preevy profile link`
 
@@ -312,7 +298,7 @@ DESCRIPTION
   Link the profile to the logged in user's organization
 ```
 
-_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/link.ts)_
+_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/link.ts)_
 
 ## `preevy profile ls`
 
@@ -336,7 +322,7 @@ DESCRIPTION
   Lists profiles
 ```
 
-_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/ls.ts)_
+_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/ls.ts)_
 
 ## `preevy profile rm NAME`
 
@@ -364,7 +350,7 @@ DESCRIPTION
   Remove a profile
 ```
 
-_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/rm.ts)_
+_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/rm.ts)_
 
 ## `preevy profile use NAME`
 
@@ -387,4 +373,4 @@ DESCRIPTION
   Set current profile
 ```
 
-_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/profile/use.ts)_
+_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/use.ts)_
diff --git a/packages/cli/docs/purge.md b/packages/cli/docs/purge.md
index f6d17aef..ca453e75 100644
--- a/packages/cli/docs/purge.md
+++ b/packages/cli/docs/purge.md
@@ -12,11 +12,10 @@ 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 us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--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]
+    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]
 
 FLAGS
   -d, --driver=<option>  Machine driver to use
@@ -51,12 +50,10 @@ KUBE-POD DRIVER FLAGS
   --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
 
 LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+  --lightsail-region=<value>  AWS region in which resources will be provisioned
 
 DESCRIPTION
   Delete all cloud provider machines, and potentially other resources
 ```
 
-_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/purge.ts)_
+_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/purge.ts)_
diff --git a/packages/cli/docs/up.md b/packages/cli/docs/up.md
index 48c40012..81b5970d 100644
--- a/packages/cli/docs/up.md
+++ b/packages/cli/docs/up.md
@@ -13,16 +13,15 @@ Bring up a preview environment
 USAGE
   $ preevy up [SERVICE] (--access-credentials-type api|browser --include-access-credentials) [-D] [-f
     <value>] [--system-compose-file <value>] [-p <value>] [--profile <value>] [-d lightsail|gce|azure|kube-pod]
-    [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northea
-    st-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--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
+    [--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>] [--azure-resource-group-name <value>] [--kube-pod-server-side-apply] [--id <value>] [-t
-    <value>] [--tls-hostname <value>] [--insecure-skip-verify] [--skip-unchanged-files] [--show-preevy-service-urls]
-    [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]]
-    [--no-header | ]
+    [--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 | ]
 
 ARGUMENTS
   SERVICE  Service name(s). If not specified, will deploy all services
@@ -33,13 +32,12 @@ 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=<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 - affects created URLs. If not specified, will try to detect
-                                      automatically
+  --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
@@ -59,10 +57,21 @@ GLOBAL FLAGS
   --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-resource-group-name=<value>  Microsoft Azure resource group name
-  --azure-subscription-id=<value>      Microsoft Azure subscription id
-  --azure-vm-size=<value>              [default: Standard_B2s] Machine type to be provisioned
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+  --azure-vm-size=<value>          [default: Standard_B2s] Machine type to be provisioned
+
+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
+  --no-registry-single-name       Disable auto-detection for ECR-style registry single name
+  --registry=<value>              Image registry. If this flag is specified, the "build-context" flag defaults to
+                                  "*local"
+  --registry-single-name=<value>  Use single name for image registry, ECR-style. Default: auto-detect from "registry"
+                                  flag
 
 GCE DRIVER FLAGS
   --gce-machine-type=<value>  Machine type to be provisioned
@@ -82,13 +91,16 @@ LIGHTSAIL DRIVER FLAGS
   --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
                                          <options:
                                          nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<option>            AWS region in which resources will be provisioned
-                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
-                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
-                                         u-west-3|eu-north-1>
+  --lightsail-region=<value>             AWS region in which resources will be provisioned
 
 DESCRIPTION
   Bring up a preview environment
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/up.ts)_
+_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/up.ts)_
diff --git a/packages/cli/docs/urls.md b/packages/cli/docs/urls.md
index 0eacfcb1..6c91ce1a 100644
--- a/packages/cli/docs/urls.md
+++ b/packages/cli/docs/urls.md
@@ -24,13 +24,12 @@ 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=<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 - affects created URLs. If not specified, will try to detect
-                                      automatically
+  --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
@@ -51,6 +50,12 @@ GLOBAL FLAGS
 
 DESCRIPTION
   Show urls for an existing environment
+
+FLAG DESCRIPTIONS
+  --id=<value>  Environment id
+
+    Affects created URLs
+    If not specified, will detect from the current Git context
 ```
 
-_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/urls.ts)_
+_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/urls.ts)_
diff --git a/packages/cli/docs/version.md b/packages/cli/docs/version.md
index 1fd30113..bc71fa61 100644
--- a/packages/cli/docs/version.md
+++ b/packages/cli/docs/version.md
@@ -24,4 +24,4 @@ DESCRIPTION
   Show Preevy version
 ```
 
-_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.55/src/commands/version.ts)_
+_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/version.ts)_