diff --git a/packages/cli/README.md b/packages/cli/README.md
index bfa11f83..89683bd2 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -11,6 +11,7 @@ Preevy is a CLI tool for easily creating preview environments for your Docker Co
 <!-- toc -->
 * [Usage](#usage)
 * [Commands](#commands)
+* [Command Topics](#command-topics)
 <!-- tocstop -->
 # Usage
 <!-- usage -->
@@ -19,7 +20,7 @@ $ npm install -g preevy
 $ preevy COMMAND
 running command...
 $ preevy (--version)
-preevy/0.0.40 darwin-arm64 node-v18.12.1
+preevy/0.0.40 darwin-arm64 node-v18.16.0
 $ preevy --help [COMMAND]
 USAGE
   $ preevy COMMAND
@@ -28,612 +29,17 @@ USAGE
 <!-- usagestop -->
 # Commands
 <!-- commands -->
-* [`preevy down`](#preevy-down)
-* [`preevy help [COMMANDS]`](#preevy-help-commands)
-* [`preevy init [PROFILE-ALIAS]`](#preevy-init-profile-alias)
-* [`preevy logs [SERVICES]`](#preevy-logs-services)
-* [`preevy ls`](#preevy-ls)
-* [`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 ls`](#preevy-profile-ls)
-* [`preevy profile rm NAME`](#preevy-profile-rm-name)
-* [`preevy profile use NAME`](#preevy-profile-use-name)
-* [`preevy purge`](#preevy-purge)
-* [`preevy up [SERVICE]`](#preevy-up-service)
-* [`preevy urls [SERVICE] [PORT]`](#preevy-urls-service-port)
-* [`preevy version`](#preevy-version)
+# Command Topics
+
+* [`preevy down`](docs/down.md) - Delete preview environments
+* [`preevy help`](docs/help.md) - Display help for preevy.
+* [`preevy init`](docs/init.md) - Initialize or import a new profile
+* [`preevy logs`](docs/logs.md) - Show logs for an existing environment
+* [`preevy ls`](docs/ls.md) - List preview environments
+* [`preevy profile`](docs/profile.md) - Create a new profile
+* [`preevy purge`](docs/purge.md) - Delete all cloud provider machines, and potentially other resources
+* [`preevy up`](docs/up.md) - Bring up a preview environment
+* [`preevy urls`](docs/urls.md) - Show urls for an existing environment
+* [`preevy version`](docs/version.md) - Show Preevy version
 
-## `preevy down`
-
-Delete preview environments
-
-```
-USAGE
-  $ preevy down [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
-    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--id <value>]
-    [--force] [--wait] [--json]
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-  --force                Do not error if the environment is not found
-  --id=<value>           Environment id - affects created URLs. If not specified, will try to detect automatically
-  --wait                 Wait for resource deletion to complete. If false (the default), the deletion will be started
-                         but not waited for
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-
-GCE DRIVER FLAGS
-  --gce-project-id=<value>  Google Cloud project ID
-  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
-                                 to exist)
-  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-
-DESCRIPTION
-  Delete preview environments
-```
-
-_See code: [dist/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.40/dist/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: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.9/src/commands/help.ts)_
-
-## `preevy init [PROFILE-ALIAS]`
-
-Initialize or import a new profile
-
-```
-USAGE
-  $ preevy init [PROFILE-ALIAS] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-f <value>]
-
-ARGUMENTS
-  PROFILE-ALIAS  [default: default] Alias of the profile
-
-FLAGS
-  -f, --from=<value>  Import profile from existing path
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Initialize or import a new profile
-```
-
-_See code: [dist/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.40/dist/commands/init.ts)_
-
-## `preevy logs [SERVICES]`
-
-Show logs for an existing environment
-
-```
-USAGE
-  $ preevy logs [SERVICES] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
-    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--id <value>]
-    [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]]
-    [--no-header | ]
-
-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>
-  -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
-  --id=<value>           Environment id - affects created URLs. If not specified, will try to detect automatically
-  --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)
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-
-GCE DRIVER FLAGS
-  --gce-project-id=<value>  Google Cloud project ID
-  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
-                                 to exist)
-  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-
-DESCRIPTION
-  Show logs for an existing environment
-```
-
-_See code: [dist/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.40/dist/commands/logs.ts)_
-
-## `preevy ls`
-
-List preview environments
-
-```
-USAGE
-  $ preevy ls [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
-    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--columns <value> |
-    -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-    [--json]
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-  -x, --extended         show extra columns
-  --columns=<value>      only show provided columns (comma-separated)
-  --csv                  output is csv format [alias: --output=csv]
-  --filter=<value>       filter property by partial string matching, ex: name=foo
-  --no-header            hide table header from output
-  --no-truncate          do not truncate output to fit screen
-  --output=<option>      output in a more machine friendly format
-                         <options: csv|json|yaml>
-  --sort=<value>         property to sort by (prepend '-' for descending)
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-
-GCE DRIVER FLAGS
-  --gce-project-id=<value>  Google Cloud project ID
-  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
-                                 to exist)
-  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-
-DESCRIPTION
-  List preview environments
-```
-
-_See code: [dist/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.40/dist/commands/ls.ts)_
-
-## `preevy profile create NAME URL`
-
-Create a new profile
-
-```
-USAGE
-  $ preevy profile create NAME URL [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
-    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>]
-    [--lightsail-availability-zone <value>] [--lightsail-bundle-id
-    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
-    [--azure-vm-size <value>] [--azure-resource-group-name <value>] [--kube-pod-server-side-apply] [--json]
-
-ARGUMENTS
-  NAME  name of the new profile
-  URL   url of the new profile store
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>               Microsoft Azure region in which resources will be provisioned
-  --azure-resource-group-name=<value>  Microsoft Azure resource group name
-  --azure-subscription-id=<value>      Microsoft Azure subscription id
-  --azure-vm-size=<value>              [default: Standard_B2s] Machine type to be provisioned
-
-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-kubeconfig=<value>      Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>       [default: default] Kubernetes namespace in which resources will be provisioned
-                                     (needs to exist)
-  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
-  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
-  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
-                                         <options:
-                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<option>            AWS region in which resources will be provisioned
-                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
-                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
-                                         u-west-3|eu-north-1>
-
-DESCRIPTION
-  Create a new profile
-```
-
-## `preevy profile current`
-
-Display current profile in use
-
-```
-USAGE
-  $ preevy profile current [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Display current profile in use
-```
-
-## `preevy profile import LOCATION`
-
-Import an existing profile
-
-```
-USAGE
-  $ preevy profile import LOCATION [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--name <value>]
-    [--json]
-
-ARGUMENTS
-  LOCATION  location of the profile
-
-FLAGS
-  --name=<value>  name of the profile
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Import an existing profile
-```
-
-## `preevy profile ls`
-
-Lists profiles
-
-```
-USAGE
-  $ preevy profile ls [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Lists profiles
-```
-
-## `preevy profile rm NAME`
-
-Remove a profile
-
-```
-USAGE
-  $ preevy profile rm NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
-
-ARGUMENTS
-  NAME  name of the profile to remove
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Remove a profile
-```
-
-## `preevy profile use NAME`
-
-Set current profile
-
-```
-USAGE
-  $ preevy profile use NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
-
-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
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Set current profile
-```
-
-## `preevy purge`
-
-Delete all cloud provider machines, and potentially other resources
-
-```
-USAGE
-  $ preevy purge [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
-    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--all] [--type
-    <value>] [--force] [--wait] [--json]
-
-FLAGS
-  -d, --driver=<option>  Machine driver to use
-                         <options: lightsail|gce|azure|kube-pod>
-  --all                  Remove all resources types (snapshots, keypairs, and other resource types)
-  --force                Do not ask for confirmation
-  --type=<value>...      [default: machine] Resource type(s) to delete
-  --wait                 Wait for resource deletion to complete. If false (the default), the deletion will be started
-                         but not waited for
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
-  --azure-subscription-id=<value>  Microsoft Azure subscription id
-
-GCE DRIVER FLAGS
-  --gce-project-id=<value>  Google Cloud project ID
-  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
-
-KUBE-POD DRIVER FLAGS
-  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
-                                 to exist)
-  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-
-DESCRIPTION
-  Delete all cloud provider machines, and potentially other resources
-```
-
-_See code: [dist/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.40/dist/commands/purge.ts)_
-
-## `preevy up [SERVICE]`
-
-Bring up a preview environment
-
-```
-USAGE
-  $ preevy up [SERVICE] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
-    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
-    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
-    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
-    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>]
-    [--lightsail-availability-zone <value>] [--lightsail-bundle-id
-    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
-    [--azure-vm-size <value>] [--azure-resource-group-name <value>] [--kube-pod-server-side-apply] [--id <value>] [-t
-    <value>] [--tls-hostname <value>] [--insecure-skip-verify] [--skip-unchanged-files] [--include-access-credentials]
-    [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]]
-    [--no-header | ]
-
-ARGUMENTS
-  SERVICE  Service name(s). If not specified, will deploy all services
-
-FLAGS
-  -d, --driver=<option>         Machine driver to use
-                                <options: lightsail|gce|azure|kube-pod>
-  -t, --tunnel-url=<value>      [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port] or
-                                ssh+tls://hostname[:port]
-  -x, --extended                show extra columns
-  --columns=<value>             only show provided columns (comma-separated)
-  --csv                         output is csv format [alias: --output=csv]
-  --filter=<value>              filter property by partial string matching, ex: name=foo
-  --id=<value>                  Environment id - affects created URLs. If not specified, will try to detect
-                                automatically
-  --include-access-credentials  Include access credentials for basic auth for each service URL
-  --insecure-skip-verify        Skip TLS or SSH certificate verification
-  --no-header                   hide table header from output
-  --no-truncate                 do not truncate output to fit screen
-  --output=<option>             output in a more machine friendly format
-                                <options: csv|json|yaml>
-  --[no-]skip-unchanged-files   Detect and skip unchanged files when copying (default: true)
-  --sort=<value>                property to sort by (prepend '-' for descending)
-  --tls-hostname=<value>        Override TLS server name when tunneling via HTTPS
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-AZURE DRIVER FLAGS
-  --azure-region=<value>               Microsoft Azure region in which resources will be provisioned
-  --azure-resource-group-name=<value>  Microsoft Azure resource group name
-  --azure-subscription-id=<value>      Microsoft Azure subscription id
-  --azure-vm-size=<value>              [default: Standard_B2s] Machine type to be provisioned
-
-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-kubeconfig=<value>      Path to kubeconfig file (will load config from defaults if not specified)
-  --kube-pod-namespace=<value>       [default: default] Kubernetes namespace in which resources will be provisioned
-                                     (needs to exist)
-  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
-  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
-
-LIGHTSAIL DRIVER FLAGS
-  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
-  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
-                                         <options:
-                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<option>            AWS region in which resources will be provisioned
-                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
-                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
-                                         u-west-3|eu-north-1>
-
-DESCRIPTION
-  Bring up a preview environment
-```
-
-_See code: [dist/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.40/dist/commands/up.ts)_
-
-## `preevy urls [SERVICE] [PORT]`
-
-Show urls for an existing environment
-
-```
-USAGE
-  $ preevy urls [SERVICE] [PORT] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--id
-    <value>] [-t <value>] [--tls-hostname <value>] [--insecure-skip-verify] [--columns <value> | -x] [--sort <value>]
-    [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-    [--include-access-credentials] [--json]
-
-ARGUMENTS
-  SERVICE  Service name. If not specified, will show all services
-  PORT     Service port. If not specified, will show all ports for the specified service
-
-FLAGS
-  -t, --tunnel-url=<value>      [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port] or
-                                ssh+tls://hostname[:port]
-  -x, --extended                show extra columns
-  --columns=<value>             only show provided columns (comma-separated)
-  --csv                         output is csv format [alias: --output=csv]
-  --filter=<value>              filter property by partial string matching, ex: name=foo
-  --id=<value>                  Environment id - affects created URLs. If not specified, will try to detect
-                                automatically
-  --include-access-credentials  Include access credentials for basic auth for each service URL
-  --insecure-skip-verify        Skip TLS or SSH certificate verification
-  --no-header                   hide table header from output
-  --no-truncate                 do not truncate output to fit screen
-  --output=<option>             output in a more machine friendly format
-                                <options: csv|json|yaml>
-  --sort=<value>                property to sort by (prepend '-' for descending)
-  --tls-hostname=<value>        Override TLS server name when tunneling via HTTPS
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Show urls for an existing environment
-```
-
-_See code: [dist/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.40/dist/commands/urls.ts)_
-
-## `preevy version`
-
-Show Preevy version
-
-```
-USAGE
-  $ preevy version [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
-
-GLOBAL FLAGS
-  -D, --debug                       Enable debug logging
-  -f, --file=<value>...             [default: ] Compose configuration file
-  -p, --project=<value>             Project name. Defaults to the Compose project name
-  --json                            Format output as json.
-  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
-
-DESCRIPTION
-  Show Preevy version
-```
-
-_See code: [dist/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.40/dist/commands/version.ts)_
 <!-- commandsstop -->
diff --git a/packages/cli/docs/down.md b/packages/cli/docs/down.md
new file mode 100644
index 00000000..d98221af
--- /dev/null
+++ b/packages/cli/docs/down.md
@@ -0,0 +1,59 @@
+`preevy down`
+=============
+
+Delete preview environments
+
+* [`preevy down`](#preevy-down)
+
+## `preevy down`
+
+Delete preview environments
+
+```
+USAGE
+  $ preevy down [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--id <value>]
+    [--force] [--wait] [--json]
+
+FLAGS
+  -d, --driver=<option>  Machine driver to use
+                         <options: lightsail|gce|azure|kube-pod>
+  --force                Do not error if the environment is not found
+  --id=<value>           Environment id - affects created URLs. If not specified, will try to detect automatically
+  --wait                 Wait for resource deletion to complete. If false (the default), the deletion will be started
+                         but not waited for
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+
+GCE DRIVER FLAGS
+  --gce-project-id=<value>  Google Cloud project ID
+  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
+
+KUBE-POD DRIVER FLAGS
+  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
+                                 to exist)
+  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-region=<option>  AWS region in which resources will be provisioned
+                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
+                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+
+DESCRIPTION
+  Delete preview environments
+```
+
+_See code: [dist/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/down.ts)_
diff --git a/packages/cli/docs/help.md b/packages/cli/docs/help.md
new file mode 100644
index 00000000..72b9a08f
--- /dev/null
+++ b/packages/cli/docs/help.md
@@ -0,0 +1,26 @@
+`preevy help`
+=============
+
+Display help for preevy.
+
+* [`preevy help [COMMANDS]`](#preevy-help-commands)
+
+## `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: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.9/src/commands/help.ts)_
diff --git a/packages/cli/docs/init.md b/packages/cli/docs/init.md
new file mode 100644
index 00000000..ef43e15e
--- /dev/null
+++ b/packages/cli/docs/init.md
@@ -0,0 +1,32 @@
+`preevy init`
+=============
+
+Initialize or import a new profile
+
+* [`preevy init [PROFILE-ALIAS]`](#preevy-init-profile-alias)
+
+## `preevy init [PROFILE-ALIAS]`
+
+Initialize or import a new profile
+
+```
+USAGE
+  $ preevy init [PROFILE-ALIAS] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-f <value>]
+
+ARGUMENTS
+  PROFILE-ALIAS  [default: default] Alias of the profile
+
+FLAGS
+  -f, --from=<value>  Import profile from existing path
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Initialize or import a new profile
+```
+
+_See code: [dist/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/init.ts)_
diff --git a/packages/cli/docs/logs.md b/packages/cli/docs/logs.md
new file mode 100644
index 00000000..840509db
--- /dev/null
+++ b/packages/cli/docs/logs.md
@@ -0,0 +1,68 @@
+`preevy logs`
+=============
+
+Show logs for an existing environment
+
+* [`preevy logs [SERVICES]`](#preevy-logs-services)
+
+## `preevy logs [SERVICES]`
+
+Show logs for an existing environment
+
+```
+USAGE
+  $ preevy logs [SERVICES] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--id <value>]
+    [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]]
+    [--no-header | ]
+
+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>
+  -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
+  --id=<value>           Environment id - affects created URLs. If not specified, will try to detect automatically
+  --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)
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+
+GCE DRIVER FLAGS
+  --gce-project-id=<value>  Google Cloud project ID
+  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
+
+KUBE-POD DRIVER FLAGS
+  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
+                                 to exist)
+  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-region=<option>  AWS region in which resources will be provisioned
+                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
+                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+
+DESCRIPTION
+  Show logs for an existing environment
+```
+
+_See code: [dist/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/logs.ts)_
diff --git a/packages/cli/docs/ls.md b/packages/cli/docs/ls.md
new file mode 100644
index 00000000..2c5dcff2
--- /dev/null
+++ b/packages/cli/docs/ls.md
@@ -0,0 +1,65 @@
+`preevy ls`
+===========
+
+List preview environments
+
+* [`preevy ls`](#preevy-ls)
+
+## `preevy ls`
+
+List preview environments
+
+```
+USAGE
+  $ preevy ls [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--columns <value> |
+    -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
+    [--json]
+
+FLAGS
+  -d, --driver=<option>  Machine driver to use
+                         <options: lightsail|gce|azure|kube-pod>
+  -x, --extended         show extra columns
+  --columns=<value>      only show provided columns (comma-separated)
+  --csv                  output is csv format [alias: --output=csv]
+  --filter=<value>       filter property by partial string matching, ex: name=foo
+  --no-header            hide table header from output
+  --no-truncate          do not truncate output to fit screen
+  --output=<option>      output in a more machine friendly format
+                         <options: csv|json|yaml>
+  --sort=<value>         property to sort by (prepend '-' for descending)
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+
+GCE DRIVER FLAGS
+  --gce-project-id=<value>  Google Cloud project ID
+  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
+
+KUBE-POD DRIVER FLAGS
+  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
+                                 to exist)
+  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-region=<option>  AWS region in which resources will be provisioned
+                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
+                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+
+DESCRIPTION
+  List preview environments
+```
+
+_See code: [dist/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/ls.ts)_
diff --git a/packages/cli/docs/profile.md b/packages/cli/docs/profile.md
new file mode 100644
index 00000000..9627e3ce
--- /dev/null
+++ b/packages/cli/docs/profile.md
@@ -0,0 +1,181 @@
+`preevy profile`
+================
+
+Create a new profile
+
+* [`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 ls`](#preevy-profile-ls)
+* [`preevy profile rm NAME`](#preevy-profile-rm-name)
+* [`preevy profile use NAME`](#preevy-profile-use-name)
+
+## `preevy profile create NAME URL`
+
+Create a new profile
+
+```
+USAGE
+  $ preevy profile create NAME URL [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>]
+    [--lightsail-availability-zone <value>] [--lightsail-bundle-id
+    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
+    [--azure-vm-size <value>] [--azure-resource-group-name <value>] [--kube-pod-server-side-apply] [--json]
+
+ARGUMENTS
+  NAME  name of the new profile
+  URL   url of the new profile store
+
+FLAGS
+  -d, --driver=<option>  Machine driver to use
+                         <options: lightsail|gce|azure|kube-pod>
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>               Microsoft Azure region in which resources will be provisioned
+  --azure-resource-group-name=<value>  Microsoft Azure resource group name
+  --azure-subscription-id=<value>      Microsoft Azure subscription id
+  --azure-vm-size=<value>              [default: Standard_B2s] Machine type to be provisioned
+
+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-kubeconfig=<value>      Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>       [default: default] Kubernetes namespace in which resources will be provisioned
+                                     (needs to exist)
+  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
+  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
+  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
+                                         <options:
+                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
+  --lightsail-region=<option>            AWS region in which resources will be provisioned
+                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
+                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
+                                         u-west-3|eu-north-1>
+
+DESCRIPTION
+  Create a new profile
+```
+
+## `preevy profile current`
+
+Display current profile in use
+
+```
+USAGE
+  $ preevy profile current [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Display current profile in use
+```
+
+## `preevy profile import LOCATION`
+
+Import an existing profile
+
+```
+USAGE
+  $ preevy profile import LOCATION [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--name <value>]
+    [--json]
+
+ARGUMENTS
+  LOCATION  location of the profile
+
+FLAGS
+  --name=<value>  name of the profile
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Import an existing profile
+```
+
+## `preevy profile ls`
+
+Lists profiles
+
+```
+USAGE
+  $ preevy profile ls [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Lists profiles
+```
+
+## `preevy profile rm NAME`
+
+Remove a profile
+
+```
+USAGE
+  $ preevy profile rm NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+ARGUMENTS
+  NAME  name of the profile to remove
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Remove a profile
+```
+
+## `preevy profile use NAME`
+
+Set current profile
+
+```
+USAGE
+  $ preevy profile use NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+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
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Set current profile
+```
diff --git a/packages/cli/docs/purge.md b/packages/cli/docs/purge.md
new file mode 100644
index 00000000..a7001880
--- /dev/null
+++ b/packages/cli/docs/purge.md
@@ -0,0 +1,60 @@
+`preevy purge`
+==============
+
+Delete all cloud provider machines, and potentially other resources
+
+* [`preevy purge`](#preevy-purge)
+
+## `preevy purge`
+
+Delete all cloud provider machines, and potentially other resources
+
+```
+USAGE
+  $ preevy purge [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--all] [--type
+    <value>] [--force] [--wait] [--json]
+
+FLAGS
+  -d, --driver=<option>  Machine driver to use
+                         <options: lightsail|gce|azure|kube-pod>
+  --all                  Remove all resources types (snapshots, keypairs, and other resource types)
+  --force                Do not ask for confirmation
+  --type=<value>...      [default: machine] Resource type(s) to delete
+  --wait                 Wait for resource deletion to complete. If false (the default), the deletion will be started
+                         but not waited for
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+
+GCE DRIVER FLAGS
+  --gce-project-id=<value>  Google Cloud project ID
+  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
+
+KUBE-POD DRIVER FLAGS
+  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
+                                 to exist)
+  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-region=<option>  AWS region in which resources will be provisioned
+                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
+                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+
+DESCRIPTION
+  Delete all cloud provider machines, and potentially other resources
+```
+
+_See code: [dist/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/purge.ts)_
diff --git a/packages/cli/docs/up.md b/packages/cli/docs/up.md
new file mode 100644
index 00000000..cc8fc383
--- /dev/null
+++ b/packages/cli/docs/up.md
@@ -0,0 +1,88 @@
+`preevy up`
+===========
+
+Bring up a preview environment
+
+* [`preevy up [SERVICE]`](#preevy-up-service)
+
+## `preevy up [SERVICE]`
+
+Bring up a preview environment
+
+```
+USAGE
+  $ preevy up [SERVICE] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>]
+    [--lightsail-availability-zone <value>] [--lightsail-bundle-id
+    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
+    [--azure-vm-size <value>] [--azure-resource-group-name <value>] [--kube-pod-server-side-apply] [--id <value>] [-t
+    <value>] [--tls-hostname <value>] [--insecure-skip-verify] [--skip-unchanged-files] [--include-access-credentials]
+    [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]]
+    [--no-header | ]
+
+ARGUMENTS
+  SERVICE  Service name(s). If not specified, will deploy all services
+
+FLAGS
+  -d, --driver=<option>         Machine driver to use
+                                <options: lightsail|gce|azure|kube-pod>
+  -t, --tunnel-url=<value>      [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port] or
+                                ssh+tls://hostname[:port]
+  -x, --extended                show extra columns
+  --columns=<value>             only show provided columns (comma-separated)
+  --csv                         output is csv format [alias: --output=csv]
+  --filter=<value>              filter property by partial string matching, ex: name=foo
+  --id=<value>                  Environment id - affects created URLs. If not specified, will try to detect
+                                automatically
+  --include-access-credentials  Include access credentials for basic auth for each service URL
+  --insecure-skip-verify        Skip TLS or SSH certificate verification
+  --no-header                   hide table header from output
+  --no-truncate                 do not truncate output to fit screen
+  --output=<option>             output in a more machine friendly format
+                                <options: csv|json|yaml>
+  --[no-]skip-unchanged-files   Detect and skip unchanged files when copying (default: true)
+  --sort=<value>                property to sort by (prepend '-' for descending)
+  --tls-hostname=<value>        Override TLS server name when tunneling via HTTPS
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>               Microsoft Azure region in which resources will be provisioned
+  --azure-resource-group-name=<value>  Microsoft Azure resource group name
+  --azure-subscription-id=<value>      Microsoft Azure subscription id
+  --azure-vm-size=<value>              [default: Standard_B2s] Machine type to be provisioned
+
+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-kubeconfig=<value>      Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>       [default: default] Kubernetes namespace in which resources will be provisioned
+                                     (needs to exist)
+  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
+  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
+  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
+                                         <options:
+                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
+  --lightsail-region=<option>            AWS region in which resources will be provisioned
+                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
+                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
+                                         u-west-3|eu-north-1>
+
+DESCRIPTION
+  Bring up a preview environment
+```
+
+_See code: [dist/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/up.ts)_
diff --git a/packages/cli/docs/urls.md b/packages/cli/docs/urls.md
new file mode 100644
index 00000000..0ec1a05d
--- /dev/null
+++ b/packages/cli/docs/urls.md
@@ -0,0 +1,52 @@
+`preevy urls`
+=============
+
+Show urls for an existing environment
+
+* [`preevy urls [SERVICE] [PORT]`](#preevy-urls-service-port)
+
+## `preevy urls [SERVICE] [PORT]`
+
+Show urls for an existing environment
+
+```
+USAGE
+  $ preevy urls [SERVICE] [PORT] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--id
+    <value>] [-t <value>] [--tls-hostname <value>] [--insecure-skip-verify] [--columns <value> | -x] [--sort <value>]
+    [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
+    [--include-access-credentials] [--json]
+
+ARGUMENTS
+  SERVICE  Service name. If not specified, will show all services
+  PORT     Service port. If not specified, will show all ports for the specified service
+
+FLAGS
+  -t, --tunnel-url=<value>      [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port] or
+                                ssh+tls://hostname[:port]
+  -x, --extended                show extra columns
+  --columns=<value>             only show provided columns (comma-separated)
+  --csv                         output is csv format [alias: --output=csv]
+  --filter=<value>              filter property by partial string matching, ex: name=foo
+  --id=<value>                  Environment id - affects created URLs. If not specified, will try to detect
+                                automatically
+  --include-access-credentials  Include access credentials for basic auth for each service URL
+  --insecure-skip-verify        Skip TLS or SSH certificate verification
+  --no-header                   hide table header from output
+  --no-truncate                 do not truncate output to fit screen
+  --output=<option>             output in a more machine friendly format
+                                <options: csv|json|yaml>
+  --sort=<value>                property to sort by (prepend '-' for descending)
+  --tls-hostname=<value>        Override TLS server name when tunneling via HTTPS
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Show urls for an existing environment
+```
+
+_See code: [dist/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/urls.ts)_
diff --git a/packages/cli/docs/version.md b/packages/cli/docs/version.md
new file mode 100644
index 00000000..ca9305dd
--- /dev/null
+++ b/packages/cli/docs/version.md
@@ -0,0 +1,27 @@
+`preevy version`
+================
+
+Show Preevy version
+
+* [`preevy version`](#preevy-version)
+
+## `preevy version`
+
+Show Preevy version
+
+```
+USAGE
+  $ preevy version [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Show Preevy version
+```
+
+_See code: [dist/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/version.ts)_
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 34693681..4dfc554d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -88,7 +88,7 @@
     "lint": "eslint . --ext .ts --cache",
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "yarn lint",
-    "prepack": "yarn build && oclif manifest && oclif readme",
+    "prepack": "yarn build && oclif manifest && oclif readme --dir docs --multi     && ./scripts/prepare_and_copy_docs.sh",
     "cli": "./bin/dev",
     "version": "oclif readme && git add README.md",
     "bump-to": "yarn version --no-commit-hooks --no-git-tag-version --new-version"
diff --git a/packages/cli/scripts/prepare_and_copy_docs.sh b/packages/cli/scripts/prepare_and_copy_docs.sh
new file mode 100755
index 00000000..abf93b9b
--- /dev/null
+++ b/packages/cli/scripts/prepare_and_copy_docs.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Get the parent folder of the script
+parent_folder=$(dirname "$(readlink -f "$0")")
+
+# Define the relative paths
+docs_source_path="../docs"
+commands_destination_path="../../../site/docs/cli-reference/commands/"
+readme_source_path="../README.md"
+index_destination_path="../../../site/docs/cli-reference/index.md"
+
+# Find and replace URLs containing /dist/commands/ with /packages/cli/src/commands/
+find "$parent_folder/$docs_source_path" -type f -exec sed -i.bak 's#/dist/commands/#/packages/cli/src/commands/#g' {} +
+find "$parent_folder/$docs_source_path" -type f -name "*.bak" -delete
+
+# Move files from docs_source_path to commands_destination_path
+cp -R "$parent_folder/$docs_source_path/"* "$parent_folder/$commands_destination_path"
+
+# Copy README.md from readme_source_path to index_destination_path
+cp "$parent_folder/$readme_source_path" "$parent_folder/$index_destination_path"
+
+
+# Find and replace URLs containing /docs with /commands/
+sed 's#docs/#commands/#g' "$parent_folder/$index_destination_path" > "$parent_folder/$index_destination_path.tmp"
+mv "$parent_folder/$index_destination_path.tmp" "$parent_folder/$index_destination_path"
diff --git a/site/docs/ci/example-github-actions.md b/site/docs/ci/example-github-actions.md
index 4763076d..9a1087d0 100644
--- a/site/docs/ci/example-github-actions.md
+++ b/site/docs/ci/example-github-actions.md
@@ -3,12 +3,14 @@ sidebar_position: 2
 title: "Example: Github Actions"
 ---
 
-# Github Actions
+# GitHub Actions
 
-In this section we'll show an example of how to run Preevy in GitHub Actions pipeline.
+In this section we'll show an example of how to run Preevy using our GitHub Actions [preevy-up](https://github.com/marketplace/actions/preevy-up) and [preevy-down](https://github.com/marketplace/actions/preevy-down).
 
-## Authentication
+# Preevy-Up
 
+## Authentication
+In this example Preevy will get your stored profile from AWS S3, and will deploy the repo using docker compose file to AWS Lightsail. 
 Make sure the action has [sufficient permissions](/drivers/aws-lightsail#required-permissions) to AWS.
 See: [Assume a rule](https://github.com/aws-actions/configure-aws-credentials#assuming-a-role)
 
@@ -16,42 +18,36 @@ Once configured, use the [AWS for GitHub Actions](https://github.com/marketplace
 
 ```yml
 - uses: aws-actions/configure-aws-credentials@v2
-        with:
-          role-to-assume: [your-aws-role]
-          aws-region: [your-aws-region]
+  with:
+    role-to-assume: [your-aws-role]
+    aws-region: [your-aws-region]
 ```
 
-## Running Preevy
-
-It's good practice to explicitly set the node version, you can do it with the [Setup Node.js environment](https://github.com/marketplace/actions/setup-node-js-environment) action:
+## Permissions
+Make sure your code has the required permissions. we are using `pull-requests: write` to write our deployed URLs on the PR, `contents: read` to read the docker file, and `id-token` for GitHub's OIDC Token endpoint
 
 ```yaml
-- uses: actions/setup-node@v3
-  with:
-    node-version: 18
+permissions:
+  id-token: write
+  contents: read
+  pull-requests: write
 ```
 
-Next, make sure your code is checked out using the [Checkout](https://github.com/marketplace/actions/checkout) action:
+## Running Preevy
+Make sure your code is checked out before using the preevy up action, using the [Checkout](https://github.com/marketplace/actions/checkout) action:
 
 ```yaml
 - uses: actions/checkout@v3
+- uses: livecycle/preevy-up-action@latest
 ```
 
-Now you can install the Preevy CLI:
-
+With the `profile-url` arg, load the Preevy profile you [configured earlier](/ci/overview#how-to-run-preevy-from-the-ci), e.g.
+Use the `docker-compose-yaml-paths` to point to your docker compose file
 ```yaml
-- name: Install Preevy CLI
-  run: npm i -g preevy
+  profile-url: "s3://preview-8450209857-ci?region=us-east-1"
+  docker-compose-yaml-paths: "./docker/docker-compose.yaml"
 ```
 
-And load the Preevy profile you [configured earlier](/ci/overview#how-to-run-preevy-from-the-ci), e.g.
-
-```bash
-preevy init --from "s3://preview-8450209857-ci?region=us-east-1"
-```
-
-Now run `preevy up` from the directory that contains your `docker-compose.yml` file
-
 ## Complete workflow example
 
 ```yml
@@ -64,24 +60,72 @@ on:
 permissions:
   id-token: write
   contents: read
+  pull-requests: write
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - uses: aws-actions/configure-aws-credentials@v2
         with:
-          role-to-assume: arn:aws:iam::8450209857:role/preevy-github-action
-          aws-region: us-east-1
-      - uses: actions/setup-node@v3
+          role-to-assume: arn:aws:iam::12345678:role/my-role
+          aws-region: eu-west-1
+      - uses: actions/checkout@v3
+      - uses: livecycle/preevy-up-action@latest
+        id: preevy
+        with:
+          profile-url: "s3://preevy-12345678-my-profile?region=eu-west-1"
+          # docker-compose-yaml-paths arg will point to the `docker-compose.yml` file. if you have multiple docker compose files, you can add them as a comma seperated string like so `'docker-compose.yml,docker-compose.dev.yml'`
+          docker-compose-yaml-paths: "./docker/docker-compose.yaml"
+      - uses: mshick/add-pr-comment@v2
+        with:
+          message: ${{ steps.preevy.outputs.urls-markdown }} 
+```
+
+# Preevy-Down
+Use this action to stop and delete a preview environment using the Preevy CLI when the Pull Request is merged or closed.
+
+## Teardown the Preevy environment
+Just like the preevy-up action, we need to authenticate and checkout.
+
+```yaml
+- uses: actions/checkout@v3
+- uses: livecycle/preevy-down-action@latest
+```
+
+With the `profile-url` arg, load the Preevy profile you [configured earlier](/ci/overview#how-to-run-preevy-from-the-ci), with the AWS S3 permissions we granted earlier.
+
+```yaml
+  profile-url: "s3://preevy-12345678-my-profile?region=eu-west-1"
+```
+This part is a bit different from the preevy-up action,
+you should pass the args as if you are passing them to the [preevy down command](/cli-reference/commands/down),
+note the `-f` before the docker-compose file path.
+```yaml
+  args: "-f ./docker/docker-compose.yaml"
+```
+for multiple docker files you can use `"-f ./docker/docker-compose.yaml -f ./docker/docker-compose.dev.yaml"`
+
+```yml
+name: Teardown Preevy environment
+on:
+  pull_request:
+    types:
+      - closed
+permissions:
+  id-token: write
+  contents: read
+jobs:
+  teardown:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: aws-actions/configure-aws-credentials@v2
         with:
-          node-version: 18
+          role-to-assume: arn:aws:iam::12345678:role/my-role
+          aws-region: eu-west-1
       - uses: actions/checkout@v3
-      - name: Install Preevy CLI
-        run: npm i -g preevy
-      - name: Run preevy up
-        id: preevy_up
-        run: |
-          preevy init --from "s3://preview-8450209857-ci?region=us-east-1"
-          cd docker
-          preevy up
-```
\ No newline at end of file
+      - uses: livecycle/preevy-down-action@latest
+        id: preevy
+        with:
+          profile-url: "s3://preevy-12345678-my-profile?region=eu-west-1"
+          args: "-f ./docker/docker-compose.yaml"
+```
diff --git a/site/docs/cli-reference.md b/site/docs/cli-reference.md
deleted file mode 100644
index 26a824b6..00000000
--- a/site/docs/cli-reference.md
+++ /dev/null
@@ -1,472 +0,0 @@
----
-title: CLI Reference
-sidebar_position: 3
----
-# Command Line Reference
-<!-- usagestop -->
-# Commands
-<!-- commands -->
-- [`preevy down`](#preevy-down)
-- [`preevy help [COMMANDS]`](#preevy-help-commands)
-- [`preevy init [PROFILE-ALIAS]`](#preevy-init-profile-alias)
-- [`preevy logs [SERVICES]`](#preevy-logs-services)
-- [`preevy ls`](#preevy-ls)
-- [`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 ls`](#preevy-profile-ls)
-- [`preevy profile rm NAME`](#preevy-profile-rm-name)
-- [`preevy profile use NAME`](#preevy-profile-use-name)
-- [`preevy purge`](#preevy-purge)
-- [`preevy up [SERVICE]`](#preevy-up-service)
-- [`preevy urls [SERVICE] [PORT]`](#preevy-urls-service-port)
-- [`preevy version`](#preevy-version)
-
-## `preevy down`
-
-Delete preview environments
-
-```
-USAGE
-  $ preevy down [-D] [-d lightsail|gce|fake] [--lightsail-region
-    us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu
-    -central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--gce-project-id <value>] [--gce-zone <value>] [--id <value>]
-    [-f <value>] [-p <value>] [--force] [--wait] [--json]
-
-FLAGS
-  -d, --driver=<option>        Machine driver to use
-                               <options: lightsail|gce|fake>
-  -f, --file=<value>...        [default: ] Compose configuration file
-  -p, --project=<value>        Project name. Defaults to the Compose project name
-  --force                      Do not error if the environment is not found
-  --gce-project-id=<value>     Google Cloud project ID
-  --gce-zone=<value>           Google Cloud zone in which resources will be provisioned
-  --id=<value>                 Environment id - affects created URLs. If not specified, will try to detect automatically
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-  --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
-  --json       Format output as json.
-
-DESCRIPTION
-  Delete preview environments
-```
-
-_See code: [dist/commands/down/index.ts](https://github.com/livecycle/preevy/blob/v0.0.23/dist/commands/down/index.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: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.6/src/commands/help.ts)_
-
-## `preevy init [PROFILE-ALIAS]`
-
-Initialize or import a new profile
-
-```
-USAGE
-  $ preevy init [PROFILE-ALIAS] [-D] [-f <value>]
-
-ARGUMENTS
-  PROFILE-ALIAS  [default: default] Alias of the profile
-
-FLAGS
-  -f, --from=<value>  Import profile from existing path
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-
-DESCRIPTION
-  Initialize or import a new profile
-```
-
-_See code: [dist/commands/init/index.ts](https://github.com/livecycle/preevy/blob/v0.0.23/dist/commands/init/index.ts)_
-
-## `preevy logs [SERVICES]`
-
-Show logs for an existing environment
-
-```
-USAGE
-  $ preevy logs [SERVICES] [-D] [-d lightsail|gce|fake] [--lightsail-region
-    us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu
-    -central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--gce-project-id <value>] [--gce-zone <value>] [--id <value>]
-    [-f <value>] [-p <value>] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  |
-    [--csv | --no-truncate]] [--no-header | ]
-
-ARGUMENTS
-  SERVICES  Service name(s). If not specified, will show all services
-
-FLAGS
-  -d, --driver=<option>        Machine driver to use
-                               <options: lightsail|gce|fake>
-  -f, --file=<value>...        [default: ] Compose configuration file
-  -p, --project=<value>        Project name. Defaults to the Compose project name
-  -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
-  --gce-project-id=<value>     Google Cloud project ID
-  --gce-zone=<value>           Google Cloud zone in which resources will be provisioned
-  --id=<value>                 Environment id - affects created URLs. If not specified, will try to detect automatically
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-  --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)
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-
-DESCRIPTION
-  Show logs for an existing environment
-```
-
-_See code: [dist/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.23/dist/commands/logs.ts)_
-
-## `preevy ls`
-
-List preview environments
-
-```
-USAGE
-  $ preevy ls [-D] [-d lightsail|gce|fake] [--lightsail-region
-    us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu
-    -central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--gce-project-id <value>] [--gce-zone <value>] [--columns
-    <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header
-    | ] [--json]
-
-FLAGS
-  -d, --driver=<option>        Machine driver to use
-                               <options: lightsail|gce|fake>
-  -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
-  --gce-project-id=<value>     Google Cloud project ID
-  --gce-zone=<value>           Google Cloud zone in which resources will be provisioned
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-  --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)
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-  --json       Format output as json.
-
-DESCRIPTION
-  List preview environments
-```
-
-_See code: [dist/commands/ls/index.ts](https://github.com/livecycle/preevy/blob/v0.0.23/dist/commands/ls/index.ts)_
-
-## `preevy profile create NAME URL`
-
-Create a new profile
-
-```
-USAGE
-  $ preevy profile create NAME URL [-D] [-d lightsail|gce|fake] [--lightsail-region
-    us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu
-    -central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--gce-project-id <value>] [--gce-zone <value>] [--json]
-
-ARGUMENTS
-  NAME  name of the new profile
-  URL   url of the new profile store
-
-FLAGS
-  -d, --driver=<option>        Machine driver to use
-                               <options: lightsail|gce|fake>
-  --gce-project-id=<value>     Google Cloud project ID
-  --gce-zone=<value>           Google Cloud zone in which resources will be provisioned
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-  --json       Format output as json.
-
-DESCRIPTION
-  Create a new profile
-```
-
-## `preevy profile current`
-
-Display current profile in use
-
-```
-USAGE
-  $ preevy profile current [-D] [--json]
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-  --json       Format output as json.
-
-DESCRIPTION
-  Display current profile in use
-```
-
-## `preevy profile import LOCATION`
-
-Import an existing profile
-
-```
-USAGE
-  $ preevy profile import LOCATION [-D] [--name <value>] [--json]
-
-ARGUMENTS
-  LOCATION  location of the profile
-
-FLAGS
-  --name=<value>  name of the profile
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-  --json       Format output as json.
-
-DESCRIPTION
-  Import an existing profile
-```
-
-## `preevy profile ls`
-
-Lists profiles
-
-```
-USAGE
-  $ preevy profile ls [-D] [--json]
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-  --json       Format output as json.
-
-DESCRIPTION
-  Lists profiles
-```
-
-## `preevy profile rm NAME`
-
-Remove a profile
-
-```
-USAGE
-  $ preevy profile rm NAME [-D] [--json]
-
-ARGUMENTS
-  NAME  name of the profile to remove
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-  --json       Format output as json.
-
-DESCRIPTION
-  Remove a profile
-```
-
-## `preevy profile use NAME`
-
-Set current profile
-
-```
-USAGE
-  $ preevy profile use NAME [-D] [--json]
-
-ARGUMENTS
-  NAME  name of the profile to use
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-  --json       Format output as json.
-
-DESCRIPTION
-  Set current profile
-```
-
-## `preevy purge`
-
-Remove all cloud provider resources
-
-```
-USAGE
-  $ preevy purge [-D] [-d lightsail|gce|fake] [--lightsail-region
-    us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu
-    -central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--gce-project-id <value>] [--gce-zone <value>] [--snapshots]
-    [--machines] [--key-pair] [--all] [--force] [--wait] [--json]
-
-FLAGS
-  -d, --driver=<option>        Machine driver to use
-                               <options: lightsail|gce|fake>
-  --all                        Remove machines, snapshots and key pairs
-  --force                      Do not ask for confirmation
-  --gce-project-id=<value>     Google Cloud project ID
-  --gce-zone=<value>           Google Cloud zone in which resources will be provisioned
-  --key-pair                   Remove key pair
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-  --machines                   Remove machines
-  --snapshots                  Remove snapshots
-  --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
-  --json       Format output as json.
-
-DESCRIPTION
-  Remove all cloud provider resources
-```
-
-_See code: [dist/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.23/dist/commands/purge.ts)_
-
-## `preevy up [SERVICE]`
-
-Bring up a preview environment
-
-```
-USAGE
-  $ preevy up [SERVICE] [-D] [-d lightsail|gce|fake] [--lightsail-region
-    us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu
-    -central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--gce-project-id <value>] [--gce-zone <value>]
-    [--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>] [--id
-    <value>] [-f <value>] [-p <value>] [-t <value>] [--tls-hostname <value>] [--insecure-skip-verify] [--columns <value>
-    | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-ARGUMENTS
-  SERVICE  Service name(s). If not specified, will deploy all services
-
-FLAGS
-  -d, --driver=<option>                  Machine driver to use
-                                         <options: lightsail|gce|fake>
-  -f, --file=<value>...                  [default: ] Compose configuration file
-  -p, --project=<value>                  Project name. Defaults to the Compose project name
-  -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
-  --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
-  --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
-  --id=<value>                           Environment id - affects created URLs. If not specified, will try to detect
-                                         automatically
-  --insecure-skip-verify                 Skip TLS or SSH certificate verification
-  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
-  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
-                                         <options:
-                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
-  --lightsail-region=<option>            AWS region in which resources will be provisioned
-                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
-                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
-                                         u-west-3|eu-north-1>
-  --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)
-  --tls-hostname=<value>                 Override TLS server name when tunneling via HTTPS
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-
-DESCRIPTION
-  Bring up a preview environment
-```
-
-_See code: [dist/commands/up/index.ts](https://github.com/livecycle/preevy/blob/v0.0.23/dist/commands/up/index.ts)_
-
-## `preevy urls [SERVICE] [PORT]`
-
-Show urls for an existing environment
-
-```
-USAGE
-  $ preevy urls [SERVICE] [PORT] [-D] [-d lightsail|gce|fake] [--lightsail-region
-    us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu
-    -central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1] [--gce-project-id <value>] [--gce-zone <value>] [--id <value>]
-    [-f <value>] [-p <value>] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  |
-    [--csv | --no-truncate]] [--no-header | ] [--json]
-
-ARGUMENTS
-  SERVICE  Service name. If not specified, will show all services
-  PORT     Service port. If not specified, will show all ports for the specified service
-
-FLAGS
-  -d, --driver=<option>        Machine driver to use
-                               <options: lightsail|gce|fake>
-  -f, --file=<value>...        [default: ] Compose configuration file
-  -p, --project=<value>        Project name. Defaults to the Compose project name
-  -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
-  --gce-project-id=<value>     Google Cloud project ID
-  --gce-zone=<value>           Google Cloud zone in which resources will be provisioned
-  --id=<value>                 Environment id - affects created URLs. If not specified, will try to detect automatically
-  --lightsail-region=<option>  AWS region in which resources will be provisioned
-                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
-                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
-  --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)
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-  --json       Format output as json.
-
-DESCRIPTION
-  Show urls for an existing environment
-```
-
-_See code: [dist/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.23/dist/commands/urls.ts)_
-
-## `preevy version`
-
-Show Preevy version
-
-```
-USAGE
-  $ preevy version [-D] [--json]
-
-GLOBAL FLAGS
-  -D, --debug  Enable debug logging
-  --json       Format output as json.
-
-DESCRIPTION
-  Show Preevy version
-```
-
-_See code: [dist/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.23/dist/commands/version.ts)_
-<!-- commandsstop -->
-
diff --git a/site/docs/cli-reference/_category_.json b/site/docs/cli-reference/_category_.json
new file mode 100644
index 00000000..b56135dd
--- /dev/null
+++ b/site/docs/cli-reference/_category_.json
@@ -0,0 +1,4 @@
+{
+  "label": "CLI Reference",
+  "position": 8
+}
diff --git a/site/docs/cli-reference/commands/down.md b/site/docs/cli-reference/commands/down.md
new file mode 100644
index 00000000..d98221af
--- /dev/null
+++ b/site/docs/cli-reference/commands/down.md
@@ -0,0 +1,59 @@
+`preevy down`
+=============
+
+Delete preview environments
+
+* [`preevy down`](#preevy-down)
+
+## `preevy down`
+
+Delete preview environments
+
+```
+USAGE
+  $ preevy down [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--id <value>]
+    [--force] [--wait] [--json]
+
+FLAGS
+  -d, --driver=<option>  Machine driver to use
+                         <options: lightsail|gce|azure|kube-pod>
+  --force                Do not error if the environment is not found
+  --id=<value>           Environment id - affects created URLs. If not specified, will try to detect automatically
+  --wait                 Wait for resource deletion to complete. If false (the default), the deletion will be started
+                         but not waited for
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+
+GCE DRIVER FLAGS
+  --gce-project-id=<value>  Google Cloud project ID
+  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
+
+KUBE-POD DRIVER FLAGS
+  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
+                                 to exist)
+  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-region=<option>  AWS region in which resources will be provisioned
+                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
+                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+
+DESCRIPTION
+  Delete preview environments
+```
+
+_See code: [dist/commands/down.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/down.ts)_
diff --git a/site/docs/cli-reference/commands/help.md b/site/docs/cli-reference/commands/help.md
new file mode 100644
index 00000000..72b9a08f
--- /dev/null
+++ b/site/docs/cli-reference/commands/help.md
@@ -0,0 +1,26 @@
+`preevy help`
+=============
+
+Display help for preevy.
+
+* [`preevy help [COMMANDS]`](#preevy-help-commands)
+
+## `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: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.9/src/commands/help.ts)_
diff --git a/site/docs/cli-reference/commands/init.md b/site/docs/cli-reference/commands/init.md
new file mode 100644
index 00000000..ef43e15e
--- /dev/null
+++ b/site/docs/cli-reference/commands/init.md
@@ -0,0 +1,32 @@
+`preevy init`
+=============
+
+Initialize or import a new profile
+
+* [`preevy init [PROFILE-ALIAS]`](#preevy-init-profile-alias)
+
+## `preevy init [PROFILE-ALIAS]`
+
+Initialize or import a new profile
+
+```
+USAGE
+  $ preevy init [PROFILE-ALIAS] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-f <value>]
+
+ARGUMENTS
+  PROFILE-ALIAS  [default: default] Alias of the profile
+
+FLAGS
+  -f, --from=<value>  Import profile from existing path
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Initialize or import a new profile
+```
+
+_See code: [dist/commands/init.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/init.ts)_
diff --git a/site/docs/cli-reference/commands/logs.md b/site/docs/cli-reference/commands/logs.md
new file mode 100644
index 00000000..840509db
--- /dev/null
+++ b/site/docs/cli-reference/commands/logs.md
@@ -0,0 +1,68 @@
+`preevy logs`
+=============
+
+Show logs for an existing environment
+
+* [`preevy logs [SERVICES]`](#preevy-logs-services)
+
+## `preevy logs [SERVICES]`
+
+Show logs for an existing environment
+
+```
+USAGE
+  $ preevy logs [SERVICES] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--id <value>]
+    [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]]
+    [--no-header | ]
+
+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>
+  -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
+  --id=<value>           Environment id - affects created URLs. If not specified, will try to detect automatically
+  --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)
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+
+GCE DRIVER FLAGS
+  --gce-project-id=<value>  Google Cloud project ID
+  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
+
+KUBE-POD DRIVER FLAGS
+  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
+                                 to exist)
+  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-region=<option>  AWS region in which resources will be provisioned
+                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
+                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+
+DESCRIPTION
+  Show logs for an existing environment
+```
+
+_See code: [dist/commands/logs.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/logs.ts)_
diff --git a/site/docs/cli-reference/commands/ls.md b/site/docs/cli-reference/commands/ls.md
new file mode 100644
index 00000000..2c5dcff2
--- /dev/null
+++ b/site/docs/cli-reference/commands/ls.md
@@ -0,0 +1,65 @@
+`preevy ls`
+===========
+
+List preview environments
+
+* [`preevy ls`](#preevy-ls)
+
+## `preevy ls`
+
+List preview environments
+
+```
+USAGE
+  $ preevy ls [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--columns <value> |
+    -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
+    [--json]
+
+FLAGS
+  -d, --driver=<option>  Machine driver to use
+                         <options: lightsail|gce|azure|kube-pod>
+  -x, --extended         show extra columns
+  --columns=<value>      only show provided columns (comma-separated)
+  --csv                  output is csv format [alias: --output=csv]
+  --filter=<value>       filter property by partial string matching, ex: name=foo
+  --no-header            hide table header from output
+  --no-truncate          do not truncate output to fit screen
+  --output=<option>      output in a more machine friendly format
+                         <options: csv|json|yaml>
+  --sort=<value>         property to sort by (prepend '-' for descending)
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+
+GCE DRIVER FLAGS
+  --gce-project-id=<value>  Google Cloud project ID
+  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
+
+KUBE-POD DRIVER FLAGS
+  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
+                                 to exist)
+  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-region=<option>  AWS region in which resources will be provisioned
+                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
+                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+
+DESCRIPTION
+  List preview environments
+```
+
+_See code: [dist/commands/ls.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/ls.ts)_
diff --git a/site/docs/cli-reference/commands/profile.md b/site/docs/cli-reference/commands/profile.md
new file mode 100644
index 00000000..9627e3ce
--- /dev/null
+++ b/site/docs/cli-reference/commands/profile.md
@@ -0,0 +1,181 @@
+`preevy profile`
+================
+
+Create a new profile
+
+* [`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 ls`](#preevy-profile-ls)
+* [`preevy profile rm NAME`](#preevy-profile-rm-name)
+* [`preevy profile use NAME`](#preevy-profile-use-name)
+
+## `preevy profile create NAME URL`
+
+Create a new profile
+
+```
+USAGE
+  $ preevy profile create NAME URL [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>]
+    [--lightsail-availability-zone <value>] [--lightsail-bundle-id
+    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
+    [--azure-vm-size <value>] [--azure-resource-group-name <value>] [--kube-pod-server-side-apply] [--json]
+
+ARGUMENTS
+  NAME  name of the new profile
+  URL   url of the new profile store
+
+FLAGS
+  -d, --driver=<option>  Machine driver to use
+                         <options: lightsail|gce|azure|kube-pod>
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>               Microsoft Azure region in which resources will be provisioned
+  --azure-resource-group-name=<value>  Microsoft Azure resource group name
+  --azure-subscription-id=<value>      Microsoft Azure subscription id
+  --azure-vm-size=<value>              [default: Standard_B2s] Machine type to be provisioned
+
+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-kubeconfig=<value>      Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>       [default: default] Kubernetes namespace in which resources will be provisioned
+                                     (needs to exist)
+  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
+  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
+  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
+                                         <options:
+                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
+  --lightsail-region=<option>            AWS region in which resources will be provisioned
+                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
+                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
+                                         u-west-3|eu-north-1>
+
+DESCRIPTION
+  Create a new profile
+```
+
+## `preevy profile current`
+
+Display current profile in use
+
+```
+USAGE
+  $ preevy profile current [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Display current profile in use
+```
+
+## `preevy profile import LOCATION`
+
+Import an existing profile
+
+```
+USAGE
+  $ preevy profile import LOCATION [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--name <value>]
+    [--json]
+
+ARGUMENTS
+  LOCATION  location of the profile
+
+FLAGS
+  --name=<value>  name of the profile
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Import an existing profile
+```
+
+## `preevy profile ls`
+
+Lists profiles
+
+```
+USAGE
+  $ preevy profile ls [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Lists profiles
+```
+
+## `preevy profile rm NAME`
+
+Remove a profile
+
+```
+USAGE
+  $ preevy profile rm NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+ARGUMENTS
+  NAME  name of the profile to remove
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Remove a profile
+```
+
+## `preevy profile use NAME`
+
+Set current profile
+
+```
+USAGE
+  $ preevy profile use NAME [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+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
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Set current profile
+```
diff --git a/site/docs/cli-reference/commands/purge.md b/site/docs/cli-reference/commands/purge.md
new file mode 100644
index 00000000..a7001880
--- /dev/null
+++ b/site/docs/cli-reference/commands/purge.md
@@ -0,0 +1,60 @@
+`preevy purge`
+==============
+
+Delete all cloud provider machines, and potentially other resources
+
+* [`preevy purge`](#preevy-purge)
+
+## `preevy purge`
+
+Delete all cloud provider machines, and potentially other resources
+
+```
+USAGE
+  $ preevy purge [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>] [--all] [--type
+    <value>] [--force] [--wait] [--json]
+
+FLAGS
+  -d, --driver=<option>  Machine driver to use
+                         <options: lightsail|gce|azure|kube-pod>
+  --all                  Remove all resources types (snapshots, keypairs, and other resource types)
+  --force                Do not ask for confirmation
+  --type=<value>...      [default: machine] Resource type(s) to delete
+  --wait                 Wait for resource deletion to complete. If false (the default), the deletion will be started
+                         but not waited for
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>           Microsoft Azure region in which resources will be provisioned
+  --azure-subscription-id=<value>  Microsoft Azure subscription id
+
+GCE DRIVER FLAGS
+  --gce-project-id=<value>  Google Cloud project ID
+  --gce-zone=<value>        Google Cloud zone in which resources will be provisioned
+
+KUBE-POD DRIVER FLAGS
+  --kube-pod-kubeconfig=<value>  Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>   [default: default] Kubernetes namespace in which resources will be provisioned (needs
+                                 to exist)
+  --kube-pod-template=<value>    Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-region=<option>  AWS region in which resources will be provisioned
+                               <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-1|ap-south
+                               east-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1>
+
+DESCRIPTION
+  Delete all cloud provider machines, and potentially other resources
+```
+
+_See code: [dist/commands/purge.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/purge.ts)_
diff --git a/site/docs/cli-reference/commands/up.md b/site/docs/cli-reference/commands/up.md
new file mode 100644
index 00000000..cc8fc383
--- /dev/null
+++ b/site/docs/cli-reference/commands/up.md
@@ -0,0 +1,88 @@
+`preevy up`
+===========
+
+Bring up a preview environment
+
+* [`preevy up [SERVICE]`](#preevy-up-service)
+
+## `preevy up [SERVICE]`
+
+Bring up a preview environment
+
+```
+USAGE
+  $ preevy up [SERVICE] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [-d
+    lightsail|gce|azure|kube-pod] [--lightsail-region us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southea
+    st-1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|eu-west-3|eu-north-1]
+    [--gce-project-id <value>] [--gce-zone <value>] [--azure-region <value>] [--azure-subscription-id <value>]
+    [--kube-pod-namespace <value>] [--kube-pod-kubeconfig <value>] [--kube-pod-template <value>]
+    [--lightsail-availability-zone <value>] [--lightsail-bundle-id
+    nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0] [--gce-machine-type <value>]
+    [--azure-vm-size <value>] [--azure-resource-group-name <value>] [--kube-pod-server-side-apply] [--id <value>] [-t
+    <value>] [--tls-hostname <value>] [--insecure-skip-verify] [--skip-unchanged-files] [--include-access-credentials]
+    [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]]
+    [--no-header | ]
+
+ARGUMENTS
+  SERVICE  Service name(s). If not specified, will deploy all services
+
+FLAGS
+  -d, --driver=<option>         Machine driver to use
+                                <options: lightsail|gce|azure|kube-pod>
+  -t, --tunnel-url=<value>      [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port] or
+                                ssh+tls://hostname[:port]
+  -x, --extended                show extra columns
+  --columns=<value>             only show provided columns (comma-separated)
+  --csv                         output is csv format [alias: --output=csv]
+  --filter=<value>              filter property by partial string matching, ex: name=foo
+  --id=<value>                  Environment id - affects created URLs. If not specified, will try to detect
+                                automatically
+  --include-access-credentials  Include access credentials for basic auth for each service URL
+  --insecure-skip-verify        Skip TLS or SSH certificate verification
+  --no-header                   hide table header from output
+  --no-truncate                 do not truncate output to fit screen
+  --output=<option>             output in a more machine friendly format
+                                <options: csv|json|yaml>
+  --[no-]skip-unchanged-files   Detect and skip unchanged files when copying (default: true)
+  --sort=<value>                property to sort by (prepend '-' for descending)
+  --tls-hostname=<value>        Override TLS server name when tunneling via HTTPS
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+AZURE DRIVER FLAGS
+  --azure-region=<value>               Microsoft Azure region in which resources will be provisioned
+  --azure-resource-group-name=<value>  Microsoft Azure resource group name
+  --azure-subscription-id=<value>      Microsoft Azure subscription id
+  --azure-vm-size=<value>              [default: Standard_B2s] Machine type to be provisioned
+
+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-kubeconfig=<value>      Path to kubeconfig file (will load config from defaults if not specified)
+  --kube-pod-namespace=<value>       [default: default] Kubernetes namespace in which resources will be provisioned
+                                     (needs to exist)
+  --[no-]kube-pod-server-side-apply  Use server side apply to create Kubernetes resources
+  --kube-pod-template=<value>        Path to custom resources template file (will use default template if not specified)
+
+LIGHTSAIL DRIVER FLAGS
+  --lightsail-availability-zone=<value>  AWS availability zone to provision resources in region
+  --lightsail-bundle-id=<option>         Lightsail bundle ID (size of instance) to provision. Default: medium_2_0
+                                         <options:
+                                         nano_2_0|micro_2_0|small_2_0|medium_2_0|large_2_0|xlarge_2_0|2xlarge_2_0>
+  --lightsail-region=<option>            AWS region in which resources will be provisioned
+                                         <options: us-east-2|us-east-1|us-west-2|ap-south-1|ap-northeast-2|ap-southeast-
+                                         1|ap-southeast-2|ap-northeast-1|ca-central-1|eu-central-1|eu-west-1|eu-west-2|e
+                                         u-west-3|eu-north-1>
+
+DESCRIPTION
+  Bring up a preview environment
+```
+
+_See code: [dist/commands/up.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/up.ts)_
diff --git a/site/docs/cli-reference/commands/urls.md b/site/docs/cli-reference/commands/urls.md
new file mode 100644
index 00000000..0ec1a05d
--- /dev/null
+++ b/site/docs/cli-reference/commands/urls.md
@@ -0,0 +1,52 @@
+`preevy urls`
+=============
+
+Show urls for an existing environment
+
+* [`preevy urls [SERVICE] [PORT]`](#preevy-urls-service-port)
+
+## `preevy urls [SERVICE] [PORT]`
+
+Show urls for an existing environment
+
+```
+USAGE
+  $ preevy urls [SERVICE] [PORT] [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--id
+    <value>] [-t <value>] [--tls-hostname <value>] [--insecure-skip-verify] [--columns <value> | -x] [--sort <value>]
+    [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
+    [--include-access-credentials] [--json]
+
+ARGUMENTS
+  SERVICE  Service name. If not specified, will show all services
+  PORT     Service port. If not specified, will show all ports for the specified service
+
+FLAGS
+  -t, --tunnel-url=<value>      [default: ssh+tls://livecycle.run] Tunnel url, specify ssh://hostname[:port] or
+                                ssh+tls://hostname[:port]
+  -x, --extended                show extra columns
+  --columns=<value>             only show provided columns (comma-separated)
+  --csv                         output is csv format [alias: --output=csv]
+  --filter=<value>              filter property by partial string matching, ex: name=foo
+  --id=<value>                  Environment id - affects created URLs. If not specified, will try to detect
+                                automatically
+  --include-access-credentials  Include access credentials for basic auth for each service URL
+  --insecure-skip-verify        Skip TLS or SSH certificate verification
+  --no-header                   hide table header from output
+  --no-truncate                 do not truncate output to fit screen
+  --output=<option>             output in a more machine friendly format
+                                <options: csv|json|yaml>
+  --sort=<value>                property to sort by (prepend '-' for descending)
+  --tls-hostname=<value>        Override TLS server name when tunneling via HTTPS
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Show urls for an existing environment
+```
+
+_See code: [dist/commands/urls.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/urls.ts)_
diff --git a/site/docs/cli-reference/commands/version.md b/site/docs/cli-reference/commands/version.md
new file mode 100644
index 00000000..ca9305dd
--- /dev/null
+++ b/site/docs/cli-reference/commands/version.md
@@ -0,0 +1,27 @@
+`preevy version`
+================
+
+Show Preevy version
+
+* [`preevy version`](#preevy-version)
+
+## `preevy version`
+
+Show Preevy version
+
+```
+USAGE
+  $ preevy version [-D] [-f <value>] [--system-compose-file <value>] [-p <value>] [--json]
+
+GLOBAL FLAGS
+  -D, --debug                       Enable debug logging
+  -f, --file=<value>...             [default: ] Compose configuration file
+  -p, --project=<value>             Project name. Defaults to the Compose project name
+  --json                            Format output as json.
+  --system-compose-file=<value>...  [default: ] Add extra Compose configuration file without overriding the defaults
+
+DESCRIPTION
+  Show Preevy version
+```
+
+_See code: [dist/commands/version.ts](https://github.com/livecycle/preevy/blob/v0.0.40/packages/cli/src/commands/version.ts)_
diff --git a/site/docs/cli-reference/index.md b/site/docs/cli-reference/index.md
new file mode 100644
index 00000000..f2075680
--- /dev/null
+++ b/site/docs/cli-reference/index.md
@@ -0,0 +1,45 @@
+Preevy CLI
+=================
+
+[![Version](https://img.shields.io/npm/v/preevy.svg)](https://npmjs.org/package/preevy)
+[![Downloads/week](https://img.shields.io/npm/dw/preevy.svg)](https://npmjs.org/package/preevy)
+[![License](https://img.shields.io/npm/l/preevy.svg)](https://github.com/livecycle/preevy/blob/main/LICENSE)
+
+Preevy is a CLI tool for easily creating preview environments for your Docker Compose apps on your cloud provider - we currently support AWS and Google, with more on the way.
+
+
+<!-- toc -->
+* [Usage](#usage)
+* [Commands](#commands)
+* [Command Topics](#command-topics)
+<!-- tocstop -->
+# Usage
+<!-- usage -->
+```sh-session
+$ npm install -g preevy
+$ preevy COMMAND
+running command...
+$ preevy (--version)
+preevy/0.0.40 darwin-arm64 node-v18.16.0
+$ preevy --help [COMMAND]
+USAGE
+  $ preevy COMMAND
+...
+```
+<!-- usagestop -->
+# Commands
+<!-- commands -->
+# Command Topics
+
+* [`preevy down`](commands/down.md) - Delete preview environments
+* [`preevy help`](commands/help.md) - Display help for preevy.
+* [`preevy init`](commands/init.md) - Initialize or import a new profile
+* [`preevy logs`](commands/logs.md) - Show logs for an existing environment
+* [`preevy ls`](commands/ls.md) - List preview environments
+* [`preevy profile`](commands/profile.md) - Create a new profile
+* [`preevy purge`](commands/purge.md) - Delete all cloud provider machines, and potentially other resources
+* [`preevy up`](commands/up.md) - Bring up a preview environment
+* [`preevy urls`](commands/urls.md) - Show urls for an existing environment
+* [`preevy version`](commands/version.md) - Show Preevy version
+
+<!-- commandsstop -->
diff --git a/site/docs/drivers/_category_.json b/site/docs/drivers/_category_.json
index 3aa09137..7bb3240c 100644
--- a/site/docs/drivers/_category_.json
+++ b/site/docs/drivers/_category_.json
@@ -1,6 +1,6 @@
 {
   "label": "Drivers",
-  "position": 8,
+  "position": 3,
   "link": {
     "type": "generated-index"
   }
diff --git a/site/docs/drivers/aws-lightsail.md b/site/docs/drivers/aws-lightsail.md
index f0df7751..476af228 100644
--- a/site/docs/drivers/aws-lightsail.md
+++ b/site/docs/drivers/aws-lightsail.md
@@ -17,7 +17,7 @@ AWS lightsail provisioning time for a VM is usually around 2 minutes, and its co
 Preevy uses the AWS JS SDK which supports multiple ways of configuring credentials, according to the [credentials provider chain](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-credentials-node.html).
 The simplest way is to use `aws configure` command or to set the `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables.
 
-In Github Actions, you can also use the [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) action to setup credentials in a secure way.
+In GitHub Actions, you can also use the [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) action to setup credentials in a secure way.
 
 ### Required AWS permissions
 
@@ -28,7 +28,7 @@ Preevy requires the following IAM policy to be able to provision and manage Ligh
   "Statement": [
     {
       "Effect": "Allow",
-      "Action": ["lightsail:*"],
+      "Action": "lightsail:*",
       "Resource": "*"
     }
   ]
@@ -37,7 +37,7 @@ Preevy requires the following IAM policy to be able to provision and manage Ligh
 ```
 
 :::note
-When defining fine grained permissions for Preevy, make sure to add S3 permissions as well when using s3 as profile store.
+When defining fine-grained permissions for Preevy, make sure to add S3 permissions as well when using s3 as profile store.
 We recommend scoping the permissions to a specific bucket and prefix:
 
 ```json
@@ -47,16 +47,12 @@ We recommend scoping the permissions to a specific bucket and prefix:
     {
       "Effect": "Allow",
       "Action": [
-        "s3:HeadBucker",
+        "s3:ListBucket",
         "s3:GetBucketLocation",
-        "s3:ListObjects",
-        "s3:ListObjectsV2",
         "s3:PutObject",
         "s3:GetObject",
-        "s3:PutObjectTagging",
-        "s3:DeleteObjectTagging",
         "s3:DeleteObject",
-        "s3:CreateBucket" //only if bucket doesn't exist
+        "s3:CreateBucket"
       ],
       "Resource": ["arn:aws:s3:::MY_BUCKET", "arn:aws:s3:::MY_BUCKET/*"]
     }
diff --git a/site/docs/drivers/azure.md b/site/docs/drivers/azure.md
new file mode 100644
index 00000000..f1b48a29
--- /dev/null
+++ b/site/docs/drivers/azure.md
@@ -0,0 +1,27 @@
+---
+sidebar_position: 3
+title: Microsoft Azure Driver
+---
+
+# Microsoft Azure Driver
+
+Preevy can provision virtual machines on Microsoft Azure using the `azure` driver.
+Microsoft Azure also offers free 12 months for new users which is suited for trying out preevy.
+
+### Supported flags
+- `--azure-region` - Microsoft Azure region in which resources will be provisioned
+- `--azure-resource-group-name` - Microsoft Azure resource group name
+- `--azure-subscription-id` - Microsoft Azure subscription id
+- `--azure-vm-size` - Machine type to be provisioned, defaults to `Standard_B2s`
+
+### Credentials Configuration
+Preevy uses the Microsoft Azure SDK which can obtain the application [default credentials](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#defaultazurecredential).
+The simplest way is to use `az login` command.
+
+### Required Azure permissions
+
+TBD
+
+
+
+
diff --git a/site/docs/drivers/gcp-gce.md b/site/docs/drivers/gcp-gce.md
index bc61ad9e..ea1d4317 100644
--- a/site/docs/drivers/gcp-gce.md
+++ b/site/docs/drivers/gcp-gce.md
@@ -1,12 +1,12 @@
 ---
-sidebar_position: 1
+sidebar_position: 2
 title: GCP Compute Engine Driver
 ---
 
 # GCP Compute Engine Driver
 
 Preevy can provision virtual machines on GCP using the `gce` driver.
-Google compute engine provisioning time for a VM is usually less then a minute, the default machine size in use is e2-small (2GB, 2vCpu) which cost around $12 per month.
+Google compute engine provisioning time for a VM is usually less than a minute, the default machine size in use is e2-small (2GB, 2vCpu) which costs around $12 per month.
 Google compute also offer $300 free credit for new users which is suited for trying out preevy.
 
 ### Supported flags
@@ -20,4 +20,4 @@ The simplest way is to use `gcloud auth application-default login` command.
 
 ### Required GCE permissions
 
-TBD
\ No newline at end of file
+TBD
diff --git a/site/docs/drivers/kube-pod.md b/site/docs/drivers/kube-pod.md
index 1d8abc92..c9dd565d 100644
--- a/site/docs/drivers/kube-pod.md
+++ b/site/docs/drivers/kube-pod.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 1
+sidebar_position: 4
 title: Kubernetes single Pod driver
 ---