diff --git a/cmd/porter/main.go b/cmd/porter/main.go
index 1232073de..d14bfe60c 100644
--- a/cmd/porter/main.go
+++ b/cmd/porter/main.go
@@ -66,7 +66,7 @@ func buildRootCommandFrom(p *porter.Porter) *cobra.Command {
 	globalFlags := cmd.PersistentFlags()
 	globalFlags.BoolVar(&p.Debug, "debug", false, "Enable debug logging")
 	globalFlags.BoolVar(&p.DebugPlugins, "debug-plugins", false, "Enable plugin debug logging")
-	globalFlags.StringSliceVar(&p.Data.ExperimentalFlags, "experimental", nil, "Comma separated list of experimental features to enable. See https://porter.sh/experimental for available feature flags.")
+	globalFlags.StringSliceVar(&p.Data.ExperimentalFlags, "experimental", nil, "Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.")
 
 	// Flags for just the porter command only, does not apply to sub-commands
 	cmd.Flags().BoolVarP(&printVersion, "version", "v", false, "Print the application version")
diff --git a/docs/content/cli/archive.md b/docs/content/cli/archive.md
index 61d0e7f06..4933afa75 100644
--- a/docs/content/cli/archive.md
+++ b/docs/content/cli/archive.md
@@ -35,8 +35,9 @@ porter archive FILENAME --reference PUBLISHED_BUNDLE [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/build.md b/docs/content/cli/build.md
index 3ab7082bd..6c8a652f3 100644
--- a/docs/content/cli/build.md
+++ b/docs/content/cli/build.md
@@ -30,6 +30,7 @@ porter build [flags]
 
 ```
   -d, --dir string         Path to the build context directory where all bundle assets are located.
+      --driver string      Experimental. Driver for building the invocation image. Allowed values are: docker, buildkit (default "docker")
   -f, --file porter.yaml   Path to the Porter manifest. Defaults to porter.yaml in the current directory.
   -h, --help               help for build
       --name string        Override the bundle name
@@ -41,8 +42,9 @@ porter build [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles.md b/docs/content/cli/bundles.md
index 8f67d0948..f1c072205 100644
--- a/docs/content/cli/bundles.md
+++ b/docs/content/cli/bundles.md
@@ -20,8 +20,9 @@ Commands for working with bundles. These all have shortcuts so that you can call
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_archive.md b/docs/content/cli/bundles_archive.md
index 250e9412a..a2d47a136 100644
--- a/docs/content/cli/bundles_archive.md
+++ b/docs/content/cli/bundles_archive.md
@@ -35,8 +35,9 @@ porter bundles archive FILENAME --reference PUBLISHED_BUNDLE [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_build.md b/docs/content/cli/bundles_build.md
index ac28a89e1..2b258cb12 100644
--- a/docs/content/cli/bundles_build.md
+++ b/docs/content/cli/bundles_build.md
@@ -30,6 +30,7 @@ porter bundles build [flags]
 
 ```
   -d, --dir string         Path to the build context directory where all bundle assets are located.
+      --driver string      Experimental. Driver for building the invocation image. Allowed values are: docker, buildkit (default "docker")
   -f, --file porter.yaml   Path to the Porter manifest. Defaults to porter.yaml in the current directory.
   -h, --help               help for build
       --name string        Override the bundle name
@@ -41,8 +42,9 @@ porter bundles build [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_copy.md b/docs/content/cli/bundles_copy.md
index ac1b5e2c4..7232fd639 100644
--- a/docs/content/cli/bundles_copy.md
+++ b/docs/content/cli/bundles_copy.md
@@ -40,8 +40,9 @@ porter bundles copy [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_create.md b/docs/content/cli/bundles_create.md
index fcc4e98e2..5751b7e16 100644
--- a/docs/content/cli/bundles_create.md
+++ b/docs/content/cli/bundles_create.md
@@ -24,8 +24,9 @@ porter bundles create [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_explain.md b/docs/content/cli/bundles_explain.md
index 5a1cebaaf..4a44a897b 100644
--- a/docs/content/cli/bundles_explain.md
+++ b/docs/content/cli/bundles_explain.md
@@ -43,8 +43,9 @@ porter bundles explain [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_inspect.md b/docs/content/cli/bundles_inspect.md
index d520bd012..7164d0803 100644
--- a/docs/content/cli/bundles_inspect.md
+++ b/docs/content/cli/bundles_inspect.md
@@ -45,8 +45,9 @@ porter bundles inspect [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_install.md b/docs/content/cli/bundles_install.md
index 697d1a802..00f174450 100644
--- a/docs/content/cli/bundles_install.md
+++ b/docs/content/cli/bundles_install.md
@@ -52,8 +52,9 @@ porter bundles install [INSTALLATION] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_invoke.md b/docs/content/cli/bundles_invoke.md
index 0bb8c9998..6ae9f34ea 100644
--- a/docs/content/cli/bundles_invoke.md
+++ b/docs/content/cli/bundles_invoke.md
@@ -53,8 +53,9 @@ porter bundles invoke [INSTALLATION] --action ACTION [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_lint.md b/docs/content/cli/bundles_lint.md
index 534886cf5..30a99e2a4 100644
--- a/docs/content/cli/bundles_lint.md
+++ b/docs/content/cli/bundles_lint.md
@@ -38,8 +38,9 @@ porter bundles lint [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_uninstall.md b/docs/content/cli/bundles_uninstall.md
index c11b9bd3a..e48e448a7 100644
--- a/docs/content/cli/bundles_uninstall.md
+++ b/docs/content/cli/bundles_uninstall.md
@@ -56,8 +56,9 @@ porter bundles uninstall [INSTALLATION] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/bundles_upgrade.md b/docs/content/cli/bundles_upgrade.md
index 97a4c5c25..003eed754 100644
--- a/docs/content/cli/bundles_upgrade.md
+++ b/docs/content/cli/bundles_upgrade.md
@@ -52,8 +52,9 @@ porter bundles upgrade [INSTALLATION] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/copy.md b/docs/content/cli/copy.md
index 934bf42c6..7be8c696a 100644
--- a/docs/content/cli/copy.md
+++ b/docs/content/cli/copy.md
@@ -40,8 +40,9 @@ porter copy [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/create.md b/docs/content/cli/create.md
index c8e68175c..d340aaf1b 100644
--- a/docs/content/cli/create.md
+++ b/docs/content/cli/create.md
@@ -24,8 +24,9 @@ porter create [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/credentials.md b/docs/content/cli/credentials.md
index 16cadf915..f2b92371f 100644
--- a/docs/content/cli/credentials.md
+++ b/docs/content/cli/credentials.md
@@ -20,8 +20,9 @@ Credentials commands
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/credentials_delete.md b/docs/content/cli/credentials_delete.md
index 747d33c84..e8df82479 100644
--- a/docs/content/cli/credentials_delete.md
+++ b/docs/content/cli/credentials_delete.md
@@ -24,8 +24,9 @@ porter credentials delete NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/credentials_edit.md b/docs/content/cli/credentials_edit.md
index ee54a5b90..062a74f7e 100644
--- a/docs/content/cli/credentials_edit.md
+++ b/docs/content/cli/credentials_edit.md
@@ -24,8 +24,9 @@ porter credentials edit [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/credentials_generate.md b/docs/content/cli/credentials_generate.md
index 7d45b5cfb..f5ae754c1 100644
--- a/docs/content/cli/credentials_generate.md
+++ b/docs/content/cli/credentials_generate.md
@@ -56,8 +56,9 @@ porter credentials generate [NAME] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/credentials_list.md b/docs/content/cli/credentials_list.md
index d293a749e..31dddc498 100644
--- a/docs/content/cli/credentials_list.md
+++ b/docs/content/cli/credentials_list.md
@@ -31,8 +31,9 @@ porter credentials list [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/credentials_show.md b/docs/content/cli/credentials_show.md
index a0eab45ab..20e9dc6a6 100644
--- a/docs/content/cli/credentials_show.md
+++ b/docs/content/cli/credentials_show.md
@@ -31,8 +31,9 @@ porter credentials show [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/explain.md b/docs/content/cli/explain.md
index 2ded05a44..713404bdb 100644
--- a/docs/content/cli/explain.md
+++ b/docs/content/cli/explain.md
@@ -43,8 +43,9 @@ porter explain [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/inspect.md b/docs/content/cli/inspect.md
index 908ffd0e8..133898c0f 100644
--- a/docs/content/cli/inspect.md
+++ b/docs/content/cli/inspect.md
@@ -45,8 +45,9 @@ porter inspect [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/install.md b/docs/content/cli/install.md
index f6df0d1b3..ceff54ce5 100644
--- a/docs/content/cli/install.md
+++ b/docs/content/cli/install.md
@@ -52,8 +52,9 @@ porter install [INSTALLATION] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/installations.md b/docs/content/cli/installations.md
index b8bba2676..31162c783 100644
--- a/docs/content/cli/installations.md
+++ b/docs/content/cli/installations.md
@@ -20,8 +20,9 @@ Commands for working with installations of a bundle
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/installations_delete.md b/docs/content/cli/installations_delete.md
index 8b561c31d..4ee35e3d9 100644
--- a/docs/content/cli/installations_delete.md
+++ b/docs/content/cli/installations_delete.md
@@ -34,8 +34,9 @@ porter installations delete [INSTALLATION] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/installations_list.md b/docs/content/cli/installations_list.md
index 085b7ce7c..d15e10c60 100644
--- a/docs/content/cli/installations_list.md
+++ b/docs/content/cli/installations_list.md
@@ -36,8 +36,9 @@ porter installations list [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/installations_logs.md b/docs/content/cli/installations_logs.md
index ef138bbf5..bf91bf42e 100644
--- a/docs/content/cli/installations_logs.md
+++ b/docs/content/cli/installations_logs.md
@@ -20,8 +20,9 @@ Commands for working with installation logs
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/installations_logs_show.md b/docs/content/cli/installations_logs_show.md
index 6f8fe6bc4..149acae97 100644
--- a/docs/content/cli/installations_logs_show.md
+++ b/docs/content/cli/installations_logs_show.md
@@ -35,8 +35,9 @@ porter installations logs show [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/installations_output.md b/docs/content/cli/installations_output.md
index 9113ef9e2..b2ba7af3b 100644
--- a/docs/content/cli/installations_output.md
+++ b/docs/content/cli/installations_output.md
@@ -20,8 +20,9 @@ Output commands
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/installations_output_list.md b/docs/content/cli/installations_output_list.md
index 26ea13089..5adbd8d46 100644
--- a/docs/content/cli/installations_output_list.md
+++ b/docs/content/cli/installations_output_list.md
@@ -34,8 +34,9 @@ porter installations output list [--installation|i INSTALLATION] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/installations_output_show.md b/docs/content/cli/installations_output_show.md
index 5097c4ae4..8f906ac3c 100644
--- a/docs/content/cli/installations_output_show.md
+++ b/docs/content/cli/installations_output_show.md
@@ -32,8 +32,9 @@ porter installations output show NAME [--installation|-i INSTALLATION] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/installations_show.md b/docs/content/cli/installations_show.md
index d75597973..e77d7ed48 100644
--- a/docs/content/cli/installations_show.md
+++ b/docs/content/cli/installations_show.md
@@ -35,8 +35,9 @@ Optional output formats include json and yaml.
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/invoke.md b/docs/content/cli/invoke.md
index f91bc73de..a8f54b64f 100644
--- a/docs/content/cli/invoke.md
+++ b/docs/content/cli/invoke.md
@@ -53,8 +53,9 @@ porter invoke [INSTALLATION] --action ACTION [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/lint.md b/docs/content/cli/lint.md
index 5d459a621..5d7ef5910 100644
--- a/docs/content/cli/lint.md
+++ b/docs/content/cli/lint.md
@@ -38,8 +38,9 @@ porter lint [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/list.md b/docs/content/cli/list.md
index 4e21f0fa9..be6c94eb4 100644
--- a/docs/content/cli/list.md
+++ b/docs/content/cli/list.md
@@ -36,8 +36,9 @@ porter list [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/logs.md b/docs/content/cli/logs.md
index 4994cf93d..63b7ed95f 100644
--- a/docs/content/cli/logs.md
+++ b/docs/content/cli/logs.md
@@ -35,8 +35,9 @@ porter logs [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/mixins.md b/docs/content/cli/mixins.md
index 362736d24..d9957e008 100644
--- a/docs/content/cli/mixins.md
+++ b/docs/content/cli/mixins.md
@@ -20,8 +20,9 @@ Mixin commands. Mixins assist with authoring bundles.
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/mixins_feed.md b/docs/content/cli/mixins_feed.md
index 5f47b1f2a..20014820a 100644
--- a/docs/content/cli/mixins_feed.md
+++ b/docs/content/cli/mixins_feed.md
@@ -20,8 +20,9 @@ Feed commands
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/mixins_feed_generate.md b/docs/content/cli/mixins_feed_generate.md
index f98e538af..622d9f9f9 100644
--- a/docs/content/cli/mixins_feed_generate.md
+++ b/docs/content/cli/mixins_feed_generate.md
@@ -51,8 +51,9 @@ porter mixins feed generate [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/mixins_feed_template.md b/docs/content/cli/mixins_feed_template.md
index 00a076e49..78b66a894 100644
--- a/docs/content/cli/mixins_feed_template.md
+++ b/docs/content/cli/mixins_feed_template.md
@@ -24,8 +24,9 @@ porter mixins feed template [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/mixins_install.md b/docs/content/cli/mixins_install.md
index b3dd1983f..909cf55d0 100644
--- a/docs/content/cli/mixins_install.md
+++ b/docs/content/cli/mixins_install.md
@@ -39,8 +39,9 @@ porter mixins install NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/mixins_list.md b/docs/content/cli/mixins_list.md
index a04880953..aa250e12c 100644
--- a/docs/content/cli/mixins_list.md
+++ b/docs/content/cli/mixins_list.md
@@ -25,8 +25,9 @@ porter mixins list [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/mixins_search.md b/docs/content/cli/mixins_search.md
index f18f9c916..9dcd8de9a 100644
--- a/docs/content/cli/mixins_search.md
+++ b/docs/content/cli/mixins_search.md
@@ -36,8 +36,9 @@ porter mixins search [QUERY] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/mixins_uninstall.md b/docs/content/cli/mixins_uninstall.md
index 3b23d919f..0ace0b059 100644
--- a/docs/content/cli/mixins_uninstall.md
+++ b/docs/content/cli/mixins_uninstall.md
@@ -30,8 +30,9 @@ porter mixins uninstall NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/parameters.md b/docs/content/cli/parameters.md
index 1e982246c..f3cea6153 100644
--- a/docs/content/cli/parameters.md
+++ b/docs/content/cli/parameters.md
@@ -20,8 +20,9 @@ Parameter set commands
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/parameters_delete.md b/docs/content/cli/parameters_delete.md
index bd977c2d9..47c751cc0 100644
--- a/docs/content/cli/parameters_delete.md
+++ b/docs/content/cli/parameters_delete.md
@@ -24,8 +24,9 @@ porter parameters delete NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/parameters_edit.md b/docs/content/cli/parameters_edit.md
index 4efdeab7f..17a6fe56f 100644
--- a/docs/content/cli/parameters_edit.md
+++ b/docs/content/cli/parameters_edit.md
@@ -24,8 +24,9 @@ porter parameters edit [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/parameters_generate.md b/docs/content/cli/parameters_generate.md
index 342f98fa6..42402aa54 100644
--- a/docs/content/cli/parameters_generate.md
+++ b/docs/content/cli/parameters_generate.md
@@ -56,8 +56,9 @@ porter parameters generate [NAME] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/parameters_list.md b/docs/content/cli/parameters_list.md
index 7b8f78717..2fc760b2f 100644
--- a/docs/content/cli/parameters_list.md
+++ b/docs/content/cli/parameters_list.md
@@ -31,8 +31,9 @@ porter parameters list [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/parameters_show.md b/docs/content/cli/parameters_show.md
index 7b81cf2da..cda8abf6d 100644
--- a/docs/content/cli/parameters_show.md
+++ b/docs/content/cli/parameters_show.md
@@ -31,8 +31,9 @@ porter parameters show [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/plugins.md b/docs/content/cli/plugins.md
index 1683ffbfa..ae25cc1a8 100644
--- a/docs/content/cli/plugins.md
+++ b/docs/content/cli/plugins.md
@@ -20,8 +20,9 @@ Plugin commands. Plugins enable Porter to work on different cloud providers and
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/plugins_install.md b/docs/content/cli/plugins_install.md
index ef6c72ead..c1787ac30 100644
--- a/docs/content/cli/plugins_install.md
+++ b/docs/content/cli/plugins_install.md
@@ -40,8 +40,9 @@ porter plugins install NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/plugins_list.md b/docs/content/cli/plugins_list.md
index b1a58cd21..dff366942 100644
--- a/docs/content/cli/plugins_list.md
+++ b/docs/content/cli/plugins_list.md
@@ -25,8 +25,9 @@ porter plugins list [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/plugins_search.md b/docs/content/cli/plugins_search.md
index e918415f5..c05708045 100644
--- a/docs/content/cli/plugins_search.md
+++ b/docs/content/cli/plugins_search.md
@@ -36,8 +36,9 @@ porter plugins search [QUERY] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/plugins_show.md b/docs/content/cli/plugins_show.md
index 996d03c53..343f86a3e 100644
--- a/docs/content/cli/plugins_show.md
+++ b/docs/content/cli/plugins_show.md
@@ -25,8 +25,9 @@ porter plugins show [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/plugins_uninstall.md b/docs/content/cli/plugins_uninstall.md
index f47965de8..7be7438b6 100644
--- a/docs/content/cli/plugins_uninstall.md
+++ b/docs/content/cli/plugins_uninstall.md
@@ -30,8 +30,9 @@ porter plugins uninstall NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/porter.md b/docs/content/cli/porter.md
index ce5a3f449..b6df8d8b9 100644
--- a/docs/content/cli/porter.md
+++ b/docs/content/cli/porter.md
@@ -27,10 +27,11 @@ porter [flags]
 ### Options
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
-  -h, --help            help for porter
-  -v, --version         Print the application version
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
+  -h, --help                   help for porter
+  -v, --version                Print the application version
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/publish.md b/docs/content/cli/publish.md
index c718b9887..7b0af8320 100644
--- a/docs/content/cli/publish.md
+++ b/docs/content/cli/publish.md
@@ -45,8 +45,9 @@ porter publish [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/schema.md b/docs/content/cli/schema.md
index e3416b0ac..039e5cb3d 100644
--- a/docs/content/cli/schema.md
+++ b/docs/content/cli/schema.md
@@ -24,8 +24,9 @@ porter schema [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/show.md b/docs/content/cli/show.md
index b292ecfbc..7628c5a02 100644
--- a/docs/content/cli/show.md
+++ b/docs/content/cli/show.md
@@ -35,8 +35,9 @@ Optional output formats include json and yaml.
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/storage.md b/docs/content/cli/storage.md
index 165335b77..e135ee2ea 100644
--- a/docs/content/cli/storage.md
+++ b/docs/content/cli/storage.md
@@ -21,8 +21,9 @@ Manage the data stored by Porter, such as credentials and installation data.
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/storage_migrate.md b/docs/content/cli/storage_migrate.md
index 6fb6e9497..b4a9dc555 100644
--- a/docs/content/cli/storage_migrate.md
+++ b/docs/content/cli/storage_migrate.md
@@ -26,8 +26,9 @@ porter storage migrate [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/uninstall.md b/docs/content/cli/uninstall.md
index 77bb659e2..3e8909a5f 100644
--- a/docs/content/cli/uninstall.md
+++ b/docs/content/cli/uninstall.md
@@ -56,8 +56,9 @@ porter uninstall [INSTALLATION] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/upgrade.md b/docs/content/cli/upgrade.md
index c85f879f6..e205add51 100644
--- a/docs/content/cli/upgrade.md
+++ b/docs/content/cli/upgrade.md
@@ -52,8 +52,9 @@ porter upgrade [INSTALLATION] [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO
diff --git a/docs/content/cli/version.md b/docs/content/cli/version.md
index ecc151167..a1f7b0433 100644
--- a/docs/content/cli/version.md
+++ b/docs/content/cli/version.md
@@ -26,8 +26,9 @@ porter version [flags]
 ### Options inherited from parent commands
 
 ```
-      --debug           Enable debug logging
-      --debug-plugins   Enable plugin debug logging
+      --debug                  Enable debug logging
+      --debug-plugins          Enable plugin debug logging
+      --experimental strings   Comma separated list of experimental features to enable. See https://porter.sh/configuration/#experimental-feature-flags for available feature flags.
 ```
 
 ### SEE ALSO