diff --git a/.husky/pre-commit b/.husky/pre-commit
index e32e31b1..fb742cc2 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 . "$(dirname -- "$0")/_/husky.sh"
 
+root_dir=("$(cd "$(dirname -- "$0")/.."; pwd)")
+
 diff=$(git diff --cached --name-only)
 
 if echo "${diff}" | grep -E --quiet '^site/'; then
-  (cd site; yarn build)
+  (cd "${root_dir}/site"; yarn build)
 fi
 
 if echo "${diff}" | grep -E --quiet '^(packages/)|(lerna)|(package.json)|(yarn.lock)'; then
@@ -14,7 +16,7 @@ if echo "${diff}" | grep -E --quiet '^(packages/)|(lerna)|(package.json)|(yarn.l
 fi
 
 if echo "${diff}" | grep -E --quiet '^tunnel-server/'; then
-  (cd tunnel-server; yarn lint && yarn build)
+  (cd "${root_dir}/tunnel-server"; yarn lint && yarn build)
 fi
 
 if echo "${diff}" | grep -E --quiet '^README/'; then
diff --git a/packages/cli/README.md b/packages/cli/README.md
index c3880a6d..8d5473e1 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 -->
@@ -28,1015 +29,19 @@ 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 ssh ENVID`](#preevy-ssh-envid)
-* [`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 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
 
-## `preevy down`
-
-Delete preview environments
-
-```
-USAGE
-  $ preevy down [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <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] [--github-token <value>] [--github-repo <value>] [--github-pull-request
-    <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache] [--github-pr-comment-enabled
-    auto|no|always]
-
-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 (either an alias or a URL)
-      --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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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
-
-GITHUB INTEGRATION FLAGS
-  --github-add-build-cache                   Add github cache to the build
-  --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
-                                             <options: auto|no|always>
-  --github-pr-comment-template-file=<value>  Path to nunjucks template file
-  --github-pull-request=<value>              GitHub Pull Request number. Will auto-detect if not specified
-  --github-repo=<value>                      GitHub repo name in the format owner/repo. Will auto-detect if not
-                                             specified
-  --github-token=<value>                     GitHub token with write access to the repo
-
-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
-  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.58/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.58/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>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--from <value>]
-
-ARGUMENTS
-  PROFILE-ALIAS  Name of the profile
-
-FLAGS
-  --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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/src/commands/init.ts)_
-
-## `preevy login`
-
-Login to the Livecycle SaaS
-
-```
-USAGE
-  $ preevy login [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin <value>]
-    [--disable-plugin <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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/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>] [--enable-plugin
-    <value>] [--disable-plugin <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>] [--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
-      --no-log-prefix    Don't print log prefix in logs
-      --profile=<value>  Run in a specific profile context (either an alias or a URL)
-      --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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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
-  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.58/src/commands/logs.ts)_
-
-## `preevy ls`
-
-List preview environments
-
-```
-USAGE
-  $ preevy ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <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>
-      --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-OUTPUT FLAGS
-  -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>
-      --sort=<value>     property to sort by (prepend '-' for descending)
-
-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
-  List preview environments
-```
-
-_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/ls.ts)_
-
-## `preevy profile config update`
-
-View and update profile configuration
-
-```
-USAGE
-  $ preevy profile config update [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <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]
-
-FLAGS
-  -d, --driver=<option>    Machine driver to use
-                           <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>    Run in a specific profile context (either an alias or a URL)
-      --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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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=<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.58/src/commands/profile/config/update.ts)_
-
-## `preevy profile config view`
-
-View profile configuration
-
-```
-USAGE
-  $ preevy profile config view [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>]
-
-FLAGS
-  --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/src/commands/profile/config/view.ts)_
-
-## `preevy profile cp`
-
-Copy a profile
-
-```
-USAGE
-  $ preevy profile cp [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/src/commands/profile/cp.ts)_
-
-## `preevy profile create NAME URL`
-
-Create a new profile
-
-```
-USAGE
-  $ preevy profile create NAME URL [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <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
-  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 (either an alias or a URL)
-      --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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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=<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.58/src/commands/profile/create.ts)_
-
-## `preevy profile current`
-
-Display current profile in use
-
-```
-USAGE
-  $ preevy profile current [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>]
-
-FLAGS
-  --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/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>] [--enable-plugin
-    <value>] [--disable-plugin <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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/src/commands/profile/import.ts)_
-
-## `preevy profile key [TYPE]`
-
-Show profile key
-
-```
-USAGE
-  $ preevy profile key [TYPE] [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>]
-
-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 (either an alias or a URL)
-
-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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/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>] [--enable-plugin <value>]
-    [--disable-plugin <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 (either an alias or a URL)
-
-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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/src/commands/profile/link.ts)_
-
-## `preevy profile ls`
-
-Lists profiles
-
-```
-USAGE
-  $ preevy profile ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
-    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>]
-
-FLAGS
-  --json
-  --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-OUTPUT FLAGS
-  -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>
-      --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Lists profiles
-```
-
-_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/ls.ts)_
-
-## `preevy profile rm NAME`
-
-Remove a profile
-
-```
-USAGE
-  $ preevy profile rm NAME [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>] [--force]
-
-ARGUMENTS
-  NAME  name of the profile to remove
-
-FLAGS
-  --force            Do not error if the profile is not found
-  --profile=<value>  Run in a specific profile context (either an alias or a URL)
-
-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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/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>] [--enable-plugin
-    <value>] [--disable-plugin <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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/src/commands/profile/use.ts)_
-
-## `preevy purge`
-
-Delete all cloud provider machines, and potentially other resources
-
-```
-USAGE
-  $ preevy purge [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <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 (either an alias or a URL)
-      --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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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=<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.58/src/commands/purge.ts)_
-
-## `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>] [--enable-plugin
-    <value>] [--disable-plugin <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 (either an alias or a URL)
-
-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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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
-```
-
-## `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>] [--enable-plugin <value>] [--disable-plugin <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>]
-    [--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] [--no-build] [--no-registry-single-name | [--registry-single-name <value> --registry
-    <value>]] [--no-registry-cache ] [--builder <value>] [--no-cache] [--skip-volume <value>] [--skip-unchanged-files]
-    [--show-preevy-service-urls] [--output-urls-to <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
-    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--github-token <value>] [--github-repo
-    <value>] [--github-pull-request <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache]
-    [--github-pr-comment-enabled auto|no|always]
-
-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]
-      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
-                                          <options: api|browser>
-      --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
-      --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
-      --show-preevy-service-urls          Show URLs for internal Preevy services
-      --[no-]skip-unchanged-files         Detect and skip unchanged files when copying (default: true)
-      --skip-volume=<value>...            [default: ] Additional volume glob patterns to skip copying
-      --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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-OUTPUT FLAGS
-  -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>
-      --sort=<value>     property to sort by (prepend '-' for descending)
-
-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
-
-BUILD FLAGS
-  --builder=<value>               Builder to use
-  --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
-  --gce-project-id=<value>    Google Cloud project ID
-  --gce-zone=<value>          Google Cloud zone in which resources will be provisioned
-
-GITHUB INTEGRATION FLAGS
-  --github-add-build-cache                   Add github cache to the build
-  --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
-                                             <options: auto|no|always>
-  --github-pr-comment-template-file=<value>  Path to nunjucks template file
-  --github-pull-request=<value>              GitHub Pull Request number. Will auto-detect if not specified
-  --github-repo=<value>                      GitHub repo name in the format owner/repo. Will auto-detect if not
-                                             specified
-  --github-token=<value>                     GitHub token with write access to the repo
-
-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=<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.58/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)
-    [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin <value>] [--disable-plugin
-    <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-] [--output-urls-to <value>]
-
-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]
-      --access-credentials-type=<option>  (required) [default: browser] Access credentials type
-                                          <options: api|browser>
-      --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
-      --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
-      --show-preevy-service-urls          Show URLs for internal Preevy services
-      --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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
-      --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-OUTPUT FLAGS
-  -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>
-      --sort=<value>     property to sort by (prepend '-' for descending)
-
-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.58/src/commands/urls.ts)_
-
-## `preevy version`
-
-Show Preevy version
-
-```
-USAGE
-  $ preevy version [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <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
-      --disable-plugin=<value>...       Disable plugin with specified package name
-      --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package 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.58/src/commands/version.ts)_
 <!-- commandsstop -->
diff --git a/packages/cli/docs/down.md b/packages/cli/docs/down.md
index ae053ecd..26ac9aec 100644
--- a/packages/cli/docs/down.md
+++ b/packages/cli/docs/down.md
@@ -16,14 +16,15 @@ USAGE
     <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] [--github-token <value>] [--github-repo <value>] [--github-pull-request
-    <value>] [--github-pr-comment-template-file <value>] [--github-pr-comment-enabled auto|no|always]
+    <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache] [--github-pr-comment-enabled
+    auto|no|always]
 
 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
+      --id=<value>       Environment id
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
                          but not waited for
 
@@ -45,6 +46,7 @@ GCE DRIVER FLAGS
   --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
 
 GITHUB INTEGRATION FLAGS
+  --github-add-build-cache                   Add github cache to the build
   --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
                                              <options: auto|no|always>
   --github-pr-comment-template-file=<value>  Path to nunjucks template file
@@ -65,6 +67,12 @@ LIGHTSAIL DRIVER FLAGS
 
 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.56/src/commands/down.ts)_
+_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/down.ts)_
diff --git a/packages/cli/docs/help.md b/packages/cli/docs/help.md
index 3c1a6049..ba8df910 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.56/src/commands/help.ts)_
+_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/help.ts)_
diff --git a/packages/cli/docs/init.md b/packages/cli/docs/init.md
index 2c87fa87..abd197c7 100644
--- a/packages/cli/docs/init.md
+++ b/packages/cli/docs/init.md
@@ -12,13 +12,13 @@ Initialize or import a new profile
 ```
 USAGE
   $ preevy init [PROFILE-ALIAS] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [-f <value>]
+    [--enable-plugin <value>] [--disable-plugin <value>] [--from <value>]
 
 ARGUMENTS
-  PROFILE-ALIAS  [default: default] Alias of the profile
+  PROFILE-ALIAS  Name of the profile
 
 FLAGS
-  -f, --from=<value>  Import profile from existing path
+  --from=<value>  Import profile from existing path
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -32,4 +32,4 @@ 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)_
+_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/init.ts)_
diff --git a/packages/cli/docs/login.md b/packages/cli/docs/login.md
index e6cfcdb6..5134f064 100644
--- a/packages/cli/docs/login.md
+++ b/packages/cli/docs/login.md
@@ -31,4 +31,4 @@ 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)_
+_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/login.ts)_
diff --git a/packages/cli/docs/logs.md b/packages/cli/docs/logs.md
index 22158616..230148b2 100644
--- a/packages/cli/docs/logs.md
+++ b/packages/cli/docs/logs.md
@@ -25,9 +25,9 @@ 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
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --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
@@ -61,6 +61,12 @@ LIGHTSAIL DRIVER FLAGS
 
 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.56/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/logs.ts)_
diff --git a/packages/cli/docs/ls.md b/packages/cli/docs/ls.md
index 6b6d8960..1c902327 100644
--- a/packages/cli/docs/ls.md
+++ b/packages/cli/docs/ls.md
@@ -21,16 +21,7 @@ USAGE
 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)
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -41,6 +32,17 @@ GLOBAL FLAGS
       --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -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>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
   --azure-subscription-id=<value>  Microsoft Azure subscription id
@@ -63,4 +65,4 @@ DESCRIPTION
   List preview environments
 ```
 
-_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/ls.ts)_
+_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/ls.ts)_
diff --git a/packages/cli/docs/profile.md b/packages/cli/docs/profile.md
index 5939fe77..4f1c03ef 100644
--- a/packages/cli/docs/profile.md
+++ b/packages/cli/docs/profile.md
@@ -35,7 +35,7 @@ USAGE
 FLAGS
   -d, --driver=<option>    Machine driver to use
                            <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>    Run in a specific profile context
+      --profile=<value>    Run in a specific profile context (either an alias or a URL)
       --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
@@ -78,7 +78,7 @@ 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)_
+_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/update.ts)_
 
 ## `preevy profile config view`
 
@@ -90,7 +90,7 @@ USAGE
     <value>] [--disable-plugin <value>] [--profile <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -105,7 +105,7 @@ 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)_
+_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/view.ts)_
 
 ## `preevy profile cp`
 
@@ -138,7 +138,7 @@ 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)_
+_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/cp.ts)_
 
 ## `preevy profile create NAME URL`
 
@@ -161,7 +161,7 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --use              Mark the new profile as the current profile
 
 GLOBAL FLAGS
@@ -202,7 +202,7 @@ 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)_
+_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/create.ts)_
 
 ## `preevy profile current`
 
@@ -214,7 +214,7 @@ USAGE
     <value>] [--disable-plugin <value>] [--profile <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -229,7 +229,7 @@ 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)_
+_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/current.ts)_
 
 ## `preevy profile import LOCATION`
 
@@ -259,7 +259,7 @@ 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)_
+_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/import.ts)_
 
 ## `preevy profile key [TYPE]`
 
@@ -274,7 +274,7 @@ 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
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -289,7 +289,7 @@ 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)_
+_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/key.ts)_
 
 ## `preevy profile link`
 
@@ -304,7 +304,7 @@ 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
+  --profile=<value>       Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -318,7 +318,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.56/src/commands/profile/link.ts)_
+_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/link.ts)_
 
 ## `preevy profile ls`
 
@@ -327,10 +327,12 @@ Lists profiles
 ```
 USAGE
   $ preevy profile ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>]
+    <value>] [--disable-plugin <value>] [--profile <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
+    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --json
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -338,14 +340,24 @@ GLOBAL FLAGS
   -p, --project=<value>                 Project name. Defaults to the Compose project name
       --disable-plugin=<value>...       Disable plugin with specified package name
       --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -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>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 DESCRIPTION
   Lists profiles
 ```
 
-_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/ls.ts)_
+_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/ls.ts)_
 
 ## `preevy profile rm NAME`
 
@@ -354,13 +366,14 @@ Remove a profile
 ```
 USAGE
   $ preevy profile rm NAME [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>]
+    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>] [--force]
 
 ARGUMENTS
   NAME  name of the profile to remove
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --force            Do not error if the profile is not found
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -375,7 +388,7 @@ 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)_
+_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/rm.ts)_
 
 ## `preevy profile use NAME`
 
@@ -401,4 +414,4 @@ 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)_
+_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/use.ts)_
diff --git a/packages/cli/docs/purge.md b/packages/cli/docs/purge.md
index ccb7aa1b..84ee4e01 100644
--- a/packages/cli/docs/purge.md
+++ b/packages/cli/docs/purge.md
@@ -22,7 +22,7 @@ FLAGS
                          <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
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --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
@@ -58,4 +58,4 @@ 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)_
+_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/purge.ts)_
diff --git a/packages/cli/docs/ssh.md b/packages/cli/docs/ssh.md
index 23a52e6a..a4755b86 100644
--- a/packages/cli/docs/ssh.md
+++ b/packages/cli/docs/ssh.md
@@ -23,7 +23,7 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
diff --git a/packages/cli/docs/up.md b/packages/cli/docs/up.md
index 9d1d5b6b..96028295 100644
--- a/packages/cli/docs/up.md
+++ b/packages/cli/docs/up.md
@@ -19,10 +19,12 @@ USAGE
     [--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] [--output-urls-to <value>] [--columns
-    <value> | -x] [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort
-    <value>] [--github-token <value>] [--github-repo <value>] [--github-pull-request <value>]
-    [--github-pr-comment-template-file <value>] [--github-pr-comment-enabled auto|no|always]
+    [--insecure-skip-verify] [--no-build] [--no-registry-single-name | [--registry-single-name <value> --registry
+    <value>]] [--no-registry-cache ] [--builder <value>] [--no-cache] [--skip-volume <value>] [--skip-unchanged-files]
+    [--show-preevy-service-urls] [--output-urls-to <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
+    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--github-token <value>] [--github-repo
+    <value>] [--github-pull-request <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache]
+    [--github-pr-comment-enabled auto|no|always]
 
 ARGUMENTS
   SERVICE  Service name(s). If not specified, will deploy all services
@@ -32,25 +34,16 @@ FLAGS
                                           <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=<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
-      --no-truncate                       do not truncate output to fit screen
-      --output=<option>                   output in a more machine friendly format
-                                          <options: csv|json|yaml>
       --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context
+      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
       --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)
+      --skip-volume=<value>...            [default: ] Additional volume glob patterns to skip copying
       --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
 
 GLOBAL FLAGS
@@ -61,17 +54,40 @@ GLOBAL FLAGS
       --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -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>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 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
 
+BUILD FLAGS
+  --builder=<value>               Builder to use
+  --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
   --gce-project-id=<value>    Google Cloud project ID
   --gce-zone=<value>          Google Cloud zone in which resources will be provisioned
 
 GITHUB INTEGRATION FLAGS
+  --github-add-build-cache                   Add github cache to the build
   --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
                                              <options: auto|no|always>
   --github-pr-comment-template-file=<value>  Path to nunjucks template file
@@ -97,6 +113,12 @@ LIGHTSAIL DRIVER FLAGS
 
 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.56/src/commands/up.ts)_
+_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/up.ts)_
diff --git a/packages/cli/docs/urls.md b/packages/cli/docs/urls.md
index 398c3a98..c720bab0 100644
--- a/packages/cli/docs/urls.md
+++ b/packages/cli/docs/urls.md
@@ -24,24 +24,14 @@ ARGUMENTS
 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
-      --no-truncate                       do not truncate output to fit screen
-      --output=<option>                   output in a more machine friendly format
-                                          <options: csv|json|yaml>
       --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context
+      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
       --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
@@ -53,8 +43,25 @@ GLOBAL FLAGS
       --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -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>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 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.56/src/commands/urls.ts)_
+_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/urls.ts)_
diff --git a/packages/cli/docs/version.md b/packages/cli/docs/version.md
index f237b71e..28b8abac 100644
--- a/packages/cli/docs/version.md
+++ b/packages/cli/docs/version.md
@@ -27,4 +27,4 @@ DESCRIPTION
   Show Preevy version
 ```
 
-_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/version.ts)_
+_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/version.ts)_
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2aaf5795..cffd9172 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -110,7 +110,7 @@
     "lint": "eslint . --ext .ts --cache",
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "yarn lint",
-    "prepack": "yarn build && ./scripts/validate-tsconfig && oclif manifest && oclif readme --dir docs --multi && ./scripts/prepare_and_copy_docs.sh",
+    "prepack": "yarn build && ./scripts/validate-tsconfig.cjs && oclif manifest && oclif readme --dir docs --multi && ./scripts/prepare_and_copy_docs.sh",
     "cli": "./bin/dev",
     "version": "oclif readme && git add README.md"
   },
diff --git a/packages/cli/scripts/validate-tsconfig b/packages/cli/scripts/validate-tsconfig.cjs
similarity index 100%
rename from packages/cli/scripts/validate-tsconfig
rename to packages/cli/scripts/validate-tsconfig.cjs
diff --git a/site/docs/cli-reference/down.md b/site/docs/cli-reference/down.md
index ae053ecd..26ac9aec 100644
--- a/site/docs/cli-reference/down.md
+++ b/site/docs/cli-reference/down.md
@@ -16,14 +16,15 @@ USAGE
     <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] [--github-token <value>] [--github-repo <value>] [--github-pull-request
-    <value>] [--github-pr-comment-template-file <value>] [--github-pr-comment-enabled auto|no|always]
+    <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache] [--github-pr-comment-enabled
+    auto|no|always]
 
 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
+      --id=<value>       Environment id
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --wait             Wait for resource deletion to complete. If false (the default), the deletion will be started
                          but not waited for
 
@@ -45,6 +46,7 @@ GCE DRIVER FLAGS
   --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
 
 GITHUB INTEGRATION FLAGS
+  --github-add-build-cache                   Add github cache to the build
   --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
                                              <options: auto|no|always>
   --github-pr-comment-template-file=<value>  Path to nunjucks template file
@@ -65,6 +67,12 @@ LIGHTSAIL DRIVER FLAGS
 
 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.56/src/commands/down.ts)_
+_See code: [src/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/down.ts)_
diff --git a/site/docs/cli-reference/help.md b/site/docs/cli-reference/help.md
index 3c1a6049..ba8df910 100644
--- a/site/docs/cli-reference/help.md
+++ b/site/docs/cli-reference/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.56/src/commands/help.ts)_
+_See code: [src/commands/help.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/help.ts)_
diff --git a/site/docs/cli-reference/index.md b/site/docs/cli-reference/index.md
index c7158aa7..38f84030 100644
--- a/site/docs/cli-reference/index.md
+++ b/site/docs/cli-reference/index.md
@@ -20,7 +20,7 @@ $ npm install -g preevy
 $ preevy COMMAND
 running command...
 $ preevy (--version)
-preevy/0.0.56 darwin-arm64 node-v18.12.1
+preevy/0.0.58 darwin-arm64 node-v18.12.1
 $ preevy --help [COMMAND]
 USAGE
   $ preevy COMMAND
diff --git a/site/docs/cli-reference/init.md b/site/docs/cli-reference/init.md
index 2c87fa87..abd197c7 100644
--- a/site/docs/cli-reference/init.md
+++ b/site/docs/cli-reference/init.md
@@ -12,13 +12,13 @@ Initialize or import a new profile
 ```
 USAGE
   $ preevy init [PROFILE-ALIAS] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [-f <value>]
+    [--enable-plugin <value>] [--disable-plugin <value>] [--from <value>]
 
 ARGUMENTS
-  PROFILE-ALIAS  [default: default] Alias of the profile
+  PROFILE-ALIAS  Name of the profile
 
 FLAGS
-  -f, --from=<value>  Import profile from existing path
+  --from=<value>  Import profile from existing path
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -32,4 +32,4 @@ 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)_
+_See code: [src/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/init.ts)_
diff --git a/site/docs/cli-reference/login.md b/site/docs/cli-reference/login.md
index e6cfcdb6..5134f064 100644
--- a/site/docs/cli-reference/login.md
+++ b/site/docs/cli-reference/login.md
@@ -31,4 +31,4 @@ 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)_
+_See code: [src/commands/login.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/login.ts)_
diff --git a/site/docs/cli-reference/logs.md b/site/docs/cli-reference/logs.md
index 22158616..230148b2 100644
--- a/site/docs/cli-reference/logs.md
+++ b/site/docs/cli-reference/logs.md
@@ -25,9 +25,9 @@ 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
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --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
@@ -61,6 +61,12 @@ LIGHTSAIL DRIVER FLAGS
 
 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.56/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/logs.ts)_
diff --git a/site/docs/cli-reference/ls.md b/site/docs/cli-reference/ls.md
index 6b6d8960..1c902327 100644
--- a/site/docs/cli-reference/ls.md
+++ b/site/docs/cli-reference/ls.md
@@ -21,16 +21,7 @@ USAGE
 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)
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -41,6 +32,17 @@ GLOBAL FLAGS
       --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -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>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 AZURE DRIVER FLAGS
   --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
   --azure-subscription-id=<value>  Microsoft Azure subscription id
@@ -63,4 +65,4 @@ DESCRIPTION
   List preview environments
 ```
 
-_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/ls.ts)_
+_See code: [src/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/ls.ts)_
diff --git a/site/docs/cli-reference/profile.md b/site/docs/cli-reference/profile.md
index 5939fe77..4f1c03ef 100644
--- a/site/docs/cli-reference/profile.md
+++ b/site/docs/cli-reference/profile.md
@@ -35,7 +35,7 @@ USAGE
 FLAGS
   -d, --driver=<option>    Machine driver to use
                            <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>    Run in a specific profile context
+      --profile=<value>    Run in a specific profile context (either an alias or a URL)
       --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
@@ -78,7 +78,7 @@ 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)_
+_See code: [src/commands/profile/config/update.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/update.ts)_
 
 ## `preevy profile config view`
 
@@ -90,7 +90,7 @@ USAGE
     <value>] [--disable-plugin <value>] [--profile <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -105,7 +105,7 @@ 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)_
+_See code: [src/commands/profile/config/view.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/config/view.ts)_
 
 ## `preevy profile cp`
 
@@ -138,7 +138,7 @@ 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)_
+_See code: [src/commands/profile/cp.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/cp.ts)_
 
 ## `preevy profile create NAME URL`
 
@@ -161,7 +161,7 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --use              Mark the new profile as the current profile
 
 GLOBAL FLAGS
@@ -202,7 +202,7 @@ 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)_
+_See code: [src/commands/profile/create.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/create.ts)_
 
 ## `preevy profile current`
 
@@ -214,7 +214,7 @@ USAGE
     <value>] [--disable-plugin <value>] [--profile <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -229,7 +229,7 @@ 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)_
+_See code: [src/commands/profile/current.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/current.ts)_
 
 ## `preevy profile import LOCATION`
 
@@ -259,7 +259,7 @@ 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)_
+_See code: [src/commands/profile/import.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/import.ts)_
 
 ## `preevy profile key [TYPE]`
 
@@ -274,7 +274,7 @@ 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
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -289,7 +289,7 @@ 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)_
+_See code: [src/commands/profile/key.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/key.ts)_
 
 ## `preevy profile link`
 
@@ -304,7 +304,7 @@ 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
+  --profile=<value>       Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -318,7 +318,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.56/src/commands/profile/link.ts)_
+_See code: [src/commands/profile/link.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/link.ts)_
 
 ## `preevy profile ls`
 
@@ -327,10 +327,12 @@ Lists profiles
 ```
 USAGE
   $ preevy profile ls [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--enable-plugin
-    <value>] [--disable-plugin <value>] [--profile <value>]
+    <value>] [--disable-plugin <value>] [--profile <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
+    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>]
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --json
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -338,14 +340,24 @@ GLOBAL FLAGS
   -p, --project=<value>                 Project name. Defaults to the Compose project name
       --disable-plugin=<value>...       Disable plugin with specified package name
       --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
-      --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -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>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 DESCRIPTION
   Lists profiles
 ```
 
-_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/profile/ls.ts)_
+_See code: [src/commands/profile/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/ls.ts)_
 
 ## `preevy profile rm NAME`
 
@@ -354,13 +366,14 @@ Remove a profile
 ```
 USAGE
   $ preevy profile rm NAME [--json] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>]
-    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>]
+    [--enable-plugin <value>] [--disable-plugin <value>] [--profile <value>] [--force]
 
 ARGUMENTS
   NAME  name of the profile to remove
 
 FLAGS
-  --profile=<value>  Run in a specific profile context
+  --force            Do not error if the profile is not found
+  --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
@@ -375,7 +388,7 @@ 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)_
+_See code: [src/commands/profile/rm.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/rm.ts)_
 
 ## `preevy profile use NAME`
 
@@ -401,4 +414,4 @@ 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)_
+_See code: [src/commands/profile/use.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/profile/use.ts)_
diff --git a/site/docs/cli-reference/purge.md b/site/docs/cli-reference/purge.md
index ccb7aa1b..84ee4e01 100644
--- a/site/docs/cli-reference/purge.md
+++ b/site/docs/cli-reference/purge.md
@@ -22,7 +22,7 @@ FLAGS
                          <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
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
       --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
@@ -58,4 +58,4 @@ 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)_
+_See code: [src/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/purge.ts)_
diff --git a/site/docs/cli-reference/ssh.md b/site/docs/cli-reference/ssh.md
index 23a52e6a..a4755b86 100644
--- a/site/docs/cli-reference/ssh.md
+++ b/site/docs/cli-reference/ssh.md
@@ -23,7 +23,7 @@ ARGUMENTS
 FLAGS
   -d, --driver=<option>  Machine driver to use
                          <options: lightsail|gce|azure|kube-pod>
-      --profile=<value>  Run in a specific profile context
+      --profile=<value>  Run in a specific profile context (either an alias or a URL)
 
 GLOBAL FLAGS
   -D, --debug                           Enable debug logging
diff --git a/site/docs/cli-reference/up.md b/site/docs/cli-reference/up.md
index 9d1d5b6b..96028295 100644
--- a/site/docs/cli-reference/up.md
+++ b/site/docs/cli-reference/up.md
@@ -19,10 +19,12 @@ USAGE
     [--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] [--output-urls-to <value>] [--columns
-    <value> | -x] [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort
-    <value>] [--github-token <value>] [--github-repo <value>] [--github-pull-request <value>]
-    [--github-pr-comment-template-file <value>] [--github-pr-comment-enabled auto|no|always]
+    [--insecure-skip-verify] [--no-build] [--no-registry-single-name | [--registry-single-name <value> --registry
+    <value>]] [--no-registry-cache ] [--builder <value>] [--no-cache] [--skip-volume <value>] [--skip-unchanged-files]
+    [--show-preevy-service-urls] [--output-urls-to <value>] [--columns <value> | -x] [--filter <value>] [--no-header |
+    [--csv | --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--github-token <value>] [--github-repo
+    <value>] [--github-pull-request <value>] [--github-pr-comment-template-file <value>] [--github-add-build-cache]
+    [--github-pr-comment-enabled auto|no|always]
 
 ARGUMENTS
   SERVICE  Service name(s). If not specified, will deploy all services
@@ -32,25 +34,16 @@ FLAGS
                                           <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=<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
-      --no-truncate                       do not truncate output to fit screen
-      --output=<option>                   output in a more machine friendly format
-                                          <options: csv|json|yaml>
       --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context
+      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
       --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)
+      --skip-volume=<value>...            [default: ] Additional volume glob patterns to skip copying
       --tls-hostname=<value>              Override TLS server name when tunneling via HTTPS
 
 GLOBAL FLAGS
@@ -61,17 +54,40 @@ GLOBAL FLAGS
       --enable-plugin=<value>...        [default: @preevy/plugin-github] Enable plugin with specified package name
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -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>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 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
 
+BUILD FLAGS
+  --builder=<value>               Builder to use
+  --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
   --gce-project-id=<value>    Google Cloud project ID
   --gce-zone=<value>          Google Cloud zone in which resources will be provisioned
 
 GITHUB INTEGRATION FLAGS
+  --github-add-build-cache                   Add github cache to the build
   --github-pr-comment-enabled=<option>       [default: auto] Whether to enable posting to the GitHub PR
                                              <options: auto|no|always>
   --github-pr-comment-template-file=<value>  Path to nunjucks template file
@@ -97,6 +113,12 @@ LIGHTSAIL DRIVER FLAGS
 
 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.56/src/commands/up.ts)_
+_See code: [src/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/up.ts)_
diff --git a/site/docs/cli-reference/urls.md b/site/docs/cli-reference/urls.md
index 398c3a98..c720bab0 100644
--- a/site/docs/cli-reference/urls.md
+++ b/site/docs/cli-reference/urls.md
@@ -24,24 +24,14 @@ ARGUMENTS
 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
-      --no-truncate                       do not truncate output to fit screen
-      --output=<option>                   output in a more machine friendly format
-                                          <options: csv|json|yaml>
       --output-urls-to=<value>            Output URLs to file
-      --profile=<value>                   Run in a specific profile context
+      --profile=<value>                   Run in a specific profile context (either an alias or a URL)
       --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
@@ -53,8 +43,25 @@ GLOBAL FLAGS
       --json                            Format output as json.
       --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
 
+OUTPUT FLAGS
+  -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>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
 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.56/src/commands/urls.ts)_
+_See code: [src/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/urls.ts)_
diff --git a/site/docs/cli-reference/version.md b/site/docs/cli-reference/version.md
index f237b71e..28b8abac 100644
--- a/site/docs/cli-reference/version.md
+++ b/site/docs/cli-reference/version.md
@@ -27,4 +27,4 @@ DESCRIPTION
   Show Preevy version
 ```
 
-_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.56/src/commands/version.ts)_
+_See code: [src/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.58/src/commands/version.ts)_