diff --git a/Dockerfile b/Dockerfile
index 9c7812794..8c6aeda5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ CMD ["/app"]
 
 FROM alpine:3.13.5 as generic-alpine
 ARG COMPONENT
-
+ARG BRANCH=main
 # Copy common CA certificates from Builder image (installed by default with ca-certificates package)
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 
@@ -47,6 +47,9 @@ RUN apk add --no-cache 'git=>2.30' 'openssh=~8.4' && \
     chmod 700 /root/.ssh && \
     ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 
+# hadolint ignore=DL3059
+RUN git clone --depth 1 --branch $BRANCH https://github.com/capactio/hub-manifests.git /hub-manifests
+
 LABEL source=git@github.com:capactio/capact.git
 LABEL app=$COMPONENT
 
diff --git a/cmd/cli/cmd/alpha/archive-images/helm_charts.go b/cmd/cli/cmd/alpha/archive-images/helm_charts.go
index 7efec2af2..2252c047e 100644
--- a/cmd/cli/cmd/alpha/archive-images/helm_charts.go
+++ b/cmd/cli/cmd/alpha/archive-images/helm_charts.go
@@ -19,7 +19,6 @@ func NewFromHelmCharts() *cobra.Command {
 	opts := archiveimages.HelmArchiveImagesOptions{
 		CapactOpts: capact.Options{
 			DryRun:     true,
-			Replace:    true,
 			ClientOnly: true,
 		},
 	}
@@ -30,10 +29,10 @@ func NewFromHelmCharts() *cobra.Command {
 			# Archive images from the stable Capact Helm repository from version 0.5.0
 			<cli> alpha archive-images helm --version 0.5.0 --output ./capact-images-0.5.0.tar
 
-			# Archive images from  Helm Chart released from the the '0fbf562' commit on the main branch
-			<cli> alpha archive-images helm --version 0.4.0-0fbf562 --helm-repo-url @latest --output-stdout > ./capact-images-0.4.0-0fbf562.tar
+			# Archive images from the Helm Chart released from the '0fbf562' commit on the main branch
+			<cli> alpha archive-images helm --version 0.4.0-0fbf562 --helm-repo @latest --output-stdout > ./capact-images-0.4.0-0fbf562.tar
 
-			# You can use gzip to save the image file and make the backup smaller.
+			# You can use gzip to compress the output and make the backup smaller.
 			<cli> alpha archive-images helm --version 0.5.0 --output ./capact-images-0.5.0.tar.gz --compress gzip
 
 			# You can pipe output to use custom gzip
@@ -62,7 +61,7 @@ func NewFromHelmCharts() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&opts.CapactOpts.Parameters.Version, "version", capact.LatestVersionTag, "Capact version. Possible values @latest, @local, 0.3.0, ...")
-	cmd.Flags().StringVar(&opts.CapactOpts.Parameters.Override.HelmRepoURL, "helm-repo-url", capact.HelmRepoStable, fmt.Sprintf("Capact Helm chart repository URL. Use %s tag to select repository which holds the latest Helm chart versions.", capact.LatestVersionTag))
+	cmd.Flags().StringVar(&opts.CapactOpts.Parameters.Override.HelmRepo, "helm-repo", capact.HelmRepoStable, fmt.Sprintf("Capact Helm chart repository location. It can be relative path to current working directory or URL. Use %s tag to select repository which holds the latest Helm chart versions.", capact.LatestVersionTag))
 	cmd.Flags().StringVarP(&opts.Output.Path, "output", "o", "", "Write output to a file, instead of standard output.")
 	cmd.Flags().BoolVar(&opts.Output.ToStdout, "output-stdout", false, "Write output to a standard output, instead of file.")
 	cmd.Flags().StringVar(&opts.Compress, "compress", "", fmt.Sprintf("Use a given compress algorithm. Allowed values: %s", archiveimages.CompressGzip))
@@ -72,7 +71,7 @@ func NewFromHelmCharts() *cobra.Command {
 		return []string{archiveimages.CompressGzip}, cobra.ShellCompDirectiveNoFileComp
 	})
 	_ = cmd.RegisterFlagCompletionFunc("version", cobra.NoFileCompletions)
-	_ = cmd.RegisterFlagCompletionFunc("helm-repo-url", cobra.NoFileCompletions)
+	_ = cmd.RegisterFlagCompletionFunc("helm-repo", cobra.NoFileCompletions)
 	_ = cmd.RegisterFlagCompletionFunc("output-stdout", cobra.NoFileCompletions)
 
 	return cmd
diff --git a/cmd/cli/cmd/install.go b/cmd/cli/cmd/install.go
index 803e8d1ed..5d9896802 100644
--- a/cmd/cli/cmd/install.go
+++ b/cmd/cli/cmd/install.go
@@ -60,7 +60,8 @@ func NewInstall() *cobra.Command {
 	flags.DurationVar(&opts.Timeout, "timeout", 10*time.Minute, `Maximum time during which the upgrade process is being watched, where "0" means "infinite". Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".`)
 	flags.BoolVar(&opts.UpdateHostsFile, "update-hosts-file", true, "Updates /etc/hosts with entry for Capact GraphQL Gateway.")
 	flags.BoolVar(&opts.UpdateTrustedCerts, "update-trusted-certs", true, "Add Capact GraphQL Gateway certificate.")
-	flags.StringVar(&opts.Parameters.Override.HelmRepoURL, "helm-repo-url", capact.HelmRepoStable, fmt.Sprintf("Capact Helm chart repository URL. Use %s tag to select repository which holds the latest Helm chart versions.", capact.LatestVersionTag))
+	flags.StringVar(&opts.Parameters.Override.HelmRepo, "helm-repo", capact.HelmRepoStable, fmt.Sprintf("Capact Helm chart repository location. It can be relative path to current working directory or URL. Use %s tag to select repository which holds the latest Helm chart versions.", capact.LatestVersionTag))
+	flags.StringVar(&opts.Parameters.ActionCRDLocation, "crd", capact.CRDUrl, "Capact Action CRD location.")
 	flags.BoolVar(&opts.LocalRegistryEnabled, "enable-registry", false, "If specified, Capact images are pushed to Capact local Docker registry.")
 	flags.StringSliceVar(&opts.Parameters.Override.CapactStringOverrides, "capact-overrides", []string{}, "Overrides for Capact component.")
 	flags.StringSliceVar(&opts.Parameters.Override.IngressStringOverrides, "ingress-controller-overrides", []string{}, "Overrides for Ingress controller component.")
diff --git a/cmd/cli/cmd/upgrade.go b/cmd/cli/cmd/upgrade.go
index 03d15bf01..073099fab 100644
--- a/cmd/cli/cmd/upgrade.go
+++ b/cmd/cli/cmd/upgrade.go
@@ -40,12 +40,13 @@ func NewUpgrade() *cobra.Command {
 
 	flags := cmd.Flags()
 	flags.StringVar(&opts.Parameters.Version, "version", capact.LatestVersionTag, "Capact version.")
-	flags.StringVar(&opts.Parameters.Override.HelmRepoURL, "helm-repo-url", capact.HelmRepoStable, fmt.Sprintf("Capact Helm chart repository URL. Use %s tag to select repository which holds the latest Helm chart versions.", capact.LatestVersionTag))
+	flags.StringVar(&opts.Parameters.Override.HelmRepo, "helm-repo", capact.HelmRepoStable, fmt.Sprintf("Capact Helm chart repository URL. Use %s tag to select repository which holds the latest Helm chart versions.", capact.LatestVersionTag))
 	flags.StringVar(&opts.Parameters.Override.CapactValues.Global.ContainerRegistry.Tag, "override-capact-image-tag", "", "Allows you to override Docker image tag for Capact components. By default, Docker image tag from Helm chart is used.")
 	flags.StringVar(&opts.Parameters.Override.CapactValues.Global.ContainerRegistry.Path, "override-capact-image-repo", "", "Allows you to override Docker image repository for Capact components. By default, Docker image repository from Helm chart is used.")
 	flags.BoolVar(&opts.Parameters.IncreaseResourceLimits, "increase-resource-limits", true, "Enables higher resource requests and limits for components.")
 	flags.BoolVar(&opts.Parameters.Override.CapactValues.Engine.TestSetup.Enabled, "enable-test-setup", false, "Enables test setup for the Capact E2E validation scenarios.")
 	flags.BoolVar(&opts.Parameters.Override.CapactValues.Notes.PrintInsecure, "print-insecure-helm-release-notes", false, "Prints the base64-encoded Gateway password directly in Helm release notes.")
+	flags.StringVar(&opts.Parameters.ActionCRDLocation, "crd", capact.CRDUrl, "Capact Action CRD location.")
 	flags.StringVar(&opts.ActionNamePrefix, "action-name-prefix", "capact-upgrade-", "Specifies Capact upgrade Action name prefix.")
 	flags.DurationVar(&opts.Timeout, "timeout", 10*time.Minute, `Maximum time during which the upgrade process is being watched, where "0" means "infinite". Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".`)
 	flags.BoolVarP(&opts.Wait, "wait", "w", true, `Waits for the upgrade process until it's finished or the defined "--timeout" has occurred.`)
diff --git a/cmd/cli/docs/capact.md b/cmd/cli/docs/capact.md
index ea1b09a08..493c6b305 100644
--- a/cmd/cli/docs/capact.md
+++ b/cmd/cli/docs/capact.md
@@ -53,7 +53,7 @@ capact [flags]
 ```
   -c, --config string                 Path to the YAML config file
   -h, --help                          help for capact
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_action.md b/cmd/cli/docs/capact_action.md
index e548acc3b..8a7285b9f 100644
--- a/cmd/cli/docs/capact_action.md
+++ b/cmd/cli/docs/capact_action.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to interact with target Actions
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_action_create.md b/cmd/cli/docs/capact_action_create.md
index eaac2b937..d02c781d4 100644
--- a/cmd/cli/docs/capact_action_create.md
+++ b/cmd/cli/docs/capact_action_create.md
@@ -32,7 +32,7 @@ capact action create INTERFACE [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_action_delete.md b/cmd/cli/docs/capact_action_delete.md
index 04a05224e..d65863701 100644
--- a/cmd/cli/docs/capact_action_delete.md
+++ b/cmd/cli/docs/capact_action_delete.md
@@ -36,7 +36,7 @@ capact action delete --name-regex='upgrade-*' --namespace=foo
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_action_get.md b/cmd/cli/docs/capact_action_get.md
index d68f100ed..a6a9270f2 100644
--- a/cmd/cli/docs/capact_action_get.md
+++ b/cmd/cli/docs/capact_action_get.md
@@ -34,7 +34,7 @@ capact action get funny-stallman -ojson
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_action_run.md b/cmd/cli/docs/capact_action_run.md
index 673201b05..d8e902d37 100644
--- a/cmd/cli/docs/capact_action_run.md
+++ b/cmd/cli/docs/capact_action_run.md
@@ -22,7 +22,7 @@ capact action run ACTION [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_action_watch.md b/cmd/cli/docs/capact_action_watch.md
index 18584281c..40d9e45a6 100644
--- a/cmd/cli/docs/capact_action_watch.md
+++ b/cmd/cli/docs/capact_action_watch.md
@@ -44,7 +44,7 @@ capact action watch @latest
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_alpha.md b/cmd/cli/docs/capact_alpha.md
index 782b6bd1c..8c3836e32 100644
--- a/cmd/cli/docs/capact_alpha.md
+++ b/cmd/cli/docs/capact_alpha.md
@@ -20,7 +20,7 @@ Subcommand for alpha features in the CLI
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_alpha_archive-images.md b/cmd/cli/docs/capact_alpha_archive-images.md
index e948a84d9..689b02784 100644
--- a/cmd/cli/docs/capact_alpha_archive-images.md
+++ b/cmd/cli/docs/capact_alpha_archive-images.md
@@ -20,7 +20,7 @@ Subcommand for various manifest generation operations
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_alpha_archive-images_helm.md b/cmd/cli/docs/capact_alpha_archive-images_helm.md
index 4853df96e..90bbed4b3 100644
--- a/cmd/cli/docs/capact_alpha_archive-images_helm.md
+++ b/cmd/cli/docs/capact_alpha_archive-images_helm.md
@@ -16,10 +16,10 @@ capact alpha archive-images helm [flags]
 # Archive images from the stable Capact Helm repository from version 0.5.0
 capact alpha archive-images helm --version 0.5.0 --output ./capact-images-0.5.0.tar
 
-# Archive images from  Helm Chart released from the the '0fbf562' commit on the main branch
-capact alpha archive-images helm --version 0.4.0-0fbf562 --helm-repo-url @latest --output-stdout > ./capact-images-0.4.0-0fbf562.tar
+# Archive images from the Helm Chart released from the '0fbf562' commit on the main branch
+capact alpha archive-images helm --version 0.4.0-0fbf562 --helm-repo @latest --output-stdout > ./capact-images-0.4.0-0fbf562.tar
 
-# You can use gzip to save the image file and make the backup smaller.
+# You can use gzip to compress the output and make the backup smaller.
 capact alpha archive-images helm --version 0.5.0 --output ./capact-images-0.5.0.tar.gz --compress gzip
 
 # You can pipe output to use custom gzip
@@ -31,7 +31,7 @@ capact alpha archive-images helm --version 0.5.0 --output-stdout | gzip > myimag
 
 ```
       --compress string          Use a given compress algorithm. Allowed values: gzip
-      --helm-repo-url string     Capact Helm chart repository URL. Use @latest tag to select repository which holds the latest Helm chart versions. (default "https://storage.googleapis.com/capactio-stable-charts")
+      --helm-repo string         Capact Helm chart repository location. It can be relative path to current working directory or URL. Use @latest tag to select repository which holds the latest Helm chart versions. (default "https://storage.googleapis.com/capactio-stable-charts")
   -h, --help                     help for helm
   -o, --output string            Write output to a file, instead of standard output.
       --output-stdout            Write output to a standard output, instead of file.
@@ -43,7 +43,7 @@ capact alpha archive-images helm --version 0.5.0 --output-stdout | gzip > myimag
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_alpha_manifest-gen.md b/cmd/cli/docs/capact_alpha_manifest-gen.md
index 93710040b..aa399e44d 100644
--- a/cmd/cli/docs/capact_alpha_manifest-gen.md
+++ b/cmd/cli/docs/capact_alpha_manifest-gen.md
@@ -22,7 +22,7 @@ Subcommand for various manifest generation operations
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_alpha_manifest-gen_implementation.md b/cmd/cli/docs/capact_alpha_manifest-gen_implementation.md
index 9919dfbda..3b9f13aca 100644
--- a/cmd/cli/docs/capact_alpha_manifest-gen_implementation.md
+++ b/cmd/cli/docs/capact_alpha_manifest-gen_implementation.md
@@ -22,7 +22,7 @@ Generate new Implementation manifests for various tools.
   -c, --config string                 Path to the YAML config file
   -o, --output string                 Path to the output directory for the generated manifests (default "generated")
       --overwrite                     Overwrite existing manifest files
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_alpha_manifest-gen_implementation_helm.md b/cmd/cli/docs/capact_alpha_manifest-gen_implementation_helm.md
index b7c8dffa9..8d45e7e3d 100644
--- a/cmd/cli/docs/capact_alpha_manifest-gen_implementation_helm.md
+++ b/cmd/cli/docs/capact_alpha_manifest-gen_implementation_helm.md
@@ -30,7 +30,7 @@ capact alpha manifest-gen implementation helm [MANIFEST_PATH] [HELM_CHART_NAME]
   -c, --config string                 Path to the YAML config file
   -o, --output string                 Path to the output directory for the generated manifests (default "generated")
       --overwrite                     Overwrite existing manifest files
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_alpha_manifest-gen_implementation_terraform.md b/cmd/cli/docs/capact_alpha_manifest-gen_implementation_terraform.md
index 8bc5a37b8..4e2e47638 100644
--- a/cmd/cli/docs/capact_alpha_manifest-gen_implementation_terraform.md
+++ b/cmd/cli/docs/capact_alpha_manifest-gen_implementation_terraform.md
@@ -43,7 +43,7 @@ capact alpha manifest-gen implementation terraform cap.implementation.gcp.clouds
   -c, --config string                 Path to the YAML config file
   -o, --output string                 Path to the output directory for the generated manifests (default "generated")
       --overwrite                     Overwrite existing manifest files
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_alpha_manifest-gen_interface.md b/cmd/cli/docs/capact_alpha_manifest-gen_interface.md
index 9d1b7b1c5..3121aec05 100644
--- a/cmd/cli/docs/capact_alpha_manifest-gen_interface.md
+++ b/cmd/cli/docs/capact_alpha_manifest-gen_interface.md
@@ -34,7 +34,7 @@ capact alpha content interface cap.interface.database.postgresql install
   -c, --config string                 Path to the YAML config file
   -o, --output string                 Path to the output directory for the generated manifests (default "generated")
       --overwrite                     Overwrite existing manifest files
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_completion.md b/cmd/cli/docs/capact_completion.md
index c2cd2bec6..4cd372814 100644
--- a/cmd/cli/docs/capact_completion.md
+++ b/cmd/cli/docs/capact_completion.md
@@ -47,7 +47,7 @@ capact completion [bash|zsh|fish|powershell] [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_config.md b/cmd/cli/docs/capact_config.md
index 2398d244a..8bea68e84 100644
--- a/cmd/cli/docs/capact_config.md
+++ b/cmd/cli/docs/capact_config.md
@@ -20,7 +20,7 @@ Display or change configuration settings for the Hub
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_config_get-contexts.md b/cmd/cli/docs/capact_config_get-contexts.md
index 75fbd499e..9a47ff078 100644
--- a/cmd/cli/docs/capact_config_get-contexts.md
+++ b/cmd/cli/docs/capact_config_get-contexts.md
@@ -28,7 +28,7 @@ capact config get-contexts
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_config_set-context.md b/cmd/cli/docs/capact_config_set-context.md
index 5ec680a0a..2e67418db 100644
--- a/cmd/cli/docs/capact_config_set-context.md
+++ b/cmd/cli/docs/capact_config_set-context.md
@@ -31,7 +31,7 @@ capact config set-context localhost:8080
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_environment.md b/cmd/cli/docs/capact_environment.md
index 91b10ccd7..679a4fc97 100644
--- a/cmd/cli/docs/capact_environment.md
+++ b/cmd/cli/docs/capact_environment.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to interact with a Capact environm
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_environment_create.md b/cmd/cli/docs/capact_environment_create.md
index b9e0be9b0..cd3e010cc 100644
--- a/cmd/cli/docs/capact_environment_create.md
+++ b/cmd/cli/docs/capact_environment_create.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to create a Capact environment
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_environment_create_k3d.md b/cmd/cli/docs/capact_environment_create_k3d.md
index 6919186e7..fda2c1da8 100644
--- a/cmd/cli/docs/capact_environment_create_k3d.md
+++ b/cmd/cli/docs/capact_environment_create_k3d.md
@@ -63,7 +63,7 @@ capact environment create k3d [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_environment_create_kind.md b/cmd/cli/docs/capact_environment_create_kind.md
index 89f5182c0..ef4d02f2f 100644
--- a/cmd/cli/docs/capact_environment_create_kind.md
+++ b/cmd/cli/docs/capact_environment_create_kind.md
@@ -15,7 +15,7 @@ capact environment create kind [flags]
 ```
       --cluster-config string   path to a kind config file
   -h, --help                    help for kind
-      --image string            node docker image to use for booting the cluster (default "kindest/node:v1.19.1")
+      --image string            node docker image to use for booting the cluster (default "kindest/node:v1.20.7")
       --kubeconfig string       sets kubeconfig path instead of $KUBECONFIG or $HOME/.kube/config
       --name string             cluster name, overrides config (default "dev-capact")
       --retain                  retain nodes for debugging when cluster creation fails
@@ -26,7 +26,7 @@ capact environment create kind [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_environment_delete.md b/cmd/cli/docs/capact_environment_delete.md
index 6d8f3e38a..b505adef5 100644
--- a/cmd/cli/docs/capact_environment_delete.md
+++ b/cmd/cli/docs/capact_environment_delete.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to delete created Capact environme
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_environment_delete_k3d.md b/cmd/cli/docs/capact_environment_delete_k3d.md
index c4e100527..db9eb3f9a 100644
--- a/cmd/cli/docs/capact_environment_delete_k3d.md
+++ b/cmd/cli/docs/capact_environment_delete_k3d.md
@@ -22,7 +22,7 @@ capact environment delete k3d [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_environment_delete_kind.md b/cmd/cli/docs/capact_environment_delete_kind.md
index 4c8606995..f2b6dbc4e 100644
--- a/cmd/cli/docs/capact_environment_delete_kind.md
+++ b/cmd/cli/docs/capact_environment_delete_kind.md
@@ -21,7 +21,7 @@ capact environment delete kind [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_hub.md b/cmd/cli/docs/capact_hub.md
index 99591e347..345a59ee2 100644
--- a/cmd/cli/docs/capact_hub.md
+++ b/cmd/cli/docs/capact_hub.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to interact with Hub server.
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_hub_implementation.md b/cmd/cli/docs/capact_hub_implementation.md
index b82ced513..9d7a43cd2 100644
--- a/cmd/cli/docs/capact_hub_implementation.md
+++ b/cmd/cli/docs/capact_hub_implementation.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to interact with Implementations s
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_hub_implementation_get.md b/cmd/cli/docs/capact_hub_implementation_get.md
index 1889453c6..3925dd051 100644
--- a/cmd/cli/docs/capact_hub_implementation_get.md
+++ b/cmd/cli/docs/capact_hub_implementation_get.md
@@ -33,7 +33,7 @@ capact hub implementations get cap.interface.database.postgresql.install -oyaml
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_hub_interface.md b/cmd/cli/docs/capact_hub_interface.md
index f62ded316..05260c768 100644
--- a/cmd/cli/docs/capact_hub_interface.md
+++ b/cmd/cli/docs/capact_hub_interface.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to interact with Interfaces stored
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_hub_interface_browse.md b/cmd/cli/docs/capact_hub_interface_browse.md
index afac7542c..beda899c3 100644
--- a/cmd/cli/docs/capact_hub_interface_browse.md
+++ b/cmd/cli/docs/capact_hub_interface_browse.md
@@ -30,7 +30,7 @@ capact hub interface browse [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_hub_interface_get.md b/cmd/cli/docs/capact_hub_interface_get.md
index 5af285e10..6187266ea 100644
--- a/cmd/cli/docs/capact_hub_interface_get.md
+++ b/cmd/cli/docs/capact_hub_interface_get.md
@@ -33,7 +33,7 @@ capact hub interfaces get cap.interface.database.postgresql.install -ojson
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_install.md b/cmd/cli/docs/capact_install.md
index c97903b14..ec9682b28 100644
--- a/cmd/cli/docs/capact_install.md
+++ b/cmd/cli/docs/capact_install.md
@@ -33,9 +33,10 @@ capact install --version @local
       --build-image strings                    Local images names that should be build when using @local version. Takes comma-separated list. (default [argo-actions,argo-runner,e2e-test,gateway,hub-js,k8s-engine,populator])
       --capact-overrides strings               Overrides for Capact component.
       --cert-manager-overrides strings         Overrides for Cert Manager component.
+      --crd string                             Capact Action CRD location. (default "https://raw.githubusercontent.com/capactio/capact/main/deploy/kubernetes/crds/core.capact.io_actions.yaml")
       --enable-registry                        If specified, Capact images are pushed to Capact local Docker registry.
       --environment string                     Capact environment. (default "kind")
-      --helm-repo-url string                   Capact Helm chart repository URL. Use @latest tag to select repository which holds the latest Helm chart versions. (default "https://storage.googleapis.com/capactio-stable-charts")
+      --helm-repo string                       Capact Helm chart repository location. It can be relative path to current working directory or URL. Use @latest tag to select repository which holds the latest Helm chart versions. (default "https://storage.googleapis.com/capactio-stable-charts")
   -h, --help                                   help for install
       --increase-resource-limits               Enables higher resource requests and limits for components. (default true)
       --ingress-controller-overrides strings   Overrides for Ingress controller component.
@@ -52,7 +53,7 @@ capact install --version @local
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_login.md b/cmd/cli/docs/capact_login.md
index a8aa033a0..8b6feaf1f 100644
--- a/cmd/cli/docs/capact_login.md
+++ b/cmd/cli/docs/capact_login.md
@@ -34,7 +34,7 @@ capact login localhost:8080 -u user
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_logout.md b/cmd/cli/docs/capact_logout.md
index bb83dbede..98ee6cf36 100644
--- a/cmd/cli/docs/capact_logout.md
+++ b/cmd/cli/docs/capact_logout.md
@@ -31,7 +31,7 @@ capact logout localhost:8080
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_manifest.md b/cmd/cli/docs/capact_manifest.md
index 216434b50..95b8a80d2 100644
--- a/cmd/cli/docs/capact_manifest.md
+++ b/cmd/cli/docs/capact_manifest.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to interact with OCF manifests
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_manifest_validate.md b/cmd/cli/docs/capact_manifest_validate.md
index f17e4c1c2..ba1b781c0 100644
--- a/cmd/cli/docs/capact_manifest_validate.md
+++ b/cmd/cli/docs/capact_manifest_validate.md
@@ -39,7 +39,7 @@ capact manifest validate -s my/ocf/spec/directory ocf-spec/0.0.1/examples/interf
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_policy.md b/cmd/cli/docs/capact_policy.md
index 8710de34b..6a3cf7615 100644
--- a/cmd/cli/docs/capact_policy.md
+++ b/cmd/cli/docs/capact_policy.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to interact with Policy
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_policy_apply.md b/cmd/cli/docs/capact_policy_apply.md
index 6b831d312..1f38935a3 100644
--- a/cmd/cli/docs/capact_policy_apply.md
+++ b/cmd/cli/docs/capact_policy_apply.md
@@ -30,7 +30,7 @@ capact policy apply -f /tmp/policy.yaml
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_policy_edit.md b/cmd/cli/docs/capact_policy_edit.md
index ddfca06d3..aba2840de 100644
--- a/cmd/cli/docs/capact_policy_edit.md
+++ b/cmd/cli/docs/capact_policy_edit.md
@@ -29,7 +29,7 @@ capact policy edit
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_policy_get.md b/cmd/cli/docs/capact_policy_get.md
index f1e728ecc..e20b87462 100644
--- a/cmd/cli/docs/capact_policy_get.md
+++ b/cmd/cli/docs/capact_policy_get.md
@@ -22,7 +22,7 @@ capact policy get [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_typeinstance.md b/cmd/cli/docs/capact_typeinstance.md
index 9453a4bbe..d4a5cf1a8 100644
--- a/cmd/cli/docs/capact_typeinstance.md
+++ b/cmd/cli/docs/capact_typeinstance.md
@@ -16,7 +16,7 @@ This command consists of multiple subcommands to interact with target TypeInstan
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_typeinstance_apply.md b/cmd/cli/docs/capact_typeinstance_apply.md
index c1a0541c4..93d2da0de 100644
--- a/cmd/cli/docs/capact_typeinstance_apply.md
+++ b/cmd/cli/docs/capact_typeinstance_apply.md
@@ -37,7 +37,7 @@ capact typeinstance apply -f /tmp/typeinstances.yaml
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_typeinstance_create.md b/cmd/cli/docs/capact_typeinstance_create.md
index eb2b164d4..5c16cc8fc 100644
--- a/cmd/cli/docs/capact_typeinstance_create.md
+++ b/cmd/cli/docs/capact_typeinstance_create.md
@@ -57,7 +57,7 @@ capact typeinstance create -f ./tmp/typeinstances.yaml
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_typeinstance_delete.md b/cmd/cli/docs/capact_typeinstance_delete.md
index 53cd94358..25245d215 100644
--- a/cmd/cli/docs/capact_typeinstance_delete.md
+++ b/cmd/cli/docs/capact_typeinstance_delete.md
@@ -29,7 +29,7 @@ capact typeinstance delete c49b 4793
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_typeinstance_edit.md b/cmd/cli/docs/capact_typeinstance_edit.md
index b8907347d..d32d400b1 100644
--- a/cmd/cli/docs/capact_typeinstance_edit.md
+++ b/cmd/cli/docs/capact_typeinstance_edit.md
@@ -27,7 +27,7 @@ capact typeinstance edit TYPE_INSTANCE_ID [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_typeinstance_get.md b/cmd/cli/docs/capact_typeinstance_get.md
index 382ede0bf..66655492e 100644
--- a/cmd/cli/docs/capact_typeinstance_get.md
+++ b/cmd/cli/docs/capact_typeinstance_get.md
@@ -35,7 +35,7 @@ capact typeinstance get c49b 4793 -oyaml --export > /tmp/typeinstances.yaml
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_upgrade.md b/cmd/cli/docs/capact_upgrade.md
index a4e9bc6ad..265eba5c1 100644
--- a/cmd/cli/docs/capact_upgrade.md
+++ b/cmd/cli/docs/capact_upgrade.md
@@ -28,8 +28,9 @@ capact upgrade --version 0.1.0
 
 ```
       --action-name-prefix string           Specifies Capact upgrade Action name prefix. (default "capact-upgrade-")
+      --crd string                          Capact Action CRD location. (default "https://raw.githubusercontent.com/capactio/capact/main/deploy/kubernetes/crds/core.capact.io_actions.yaml")
       --enable-test-setup                   Enables test setup for the Capact E2E validation scenarios.
-      --helm-repo-url string                Capact Helm chart repository URL. Use @latest tag to select repository which holds the latest Helm chart versions. (default "https://storage.googleapis.com/capactio-stable-charts")
+      --helm-repo string                    Capact Helm chart repository URL. Use @latest tag to select repository which holds the latest Helm chart versions. (default "https://storage.googleapis.com/capactio-stable-charts")
   -h, --help                                help for upgrade
       --increase-resource-limits            Enables higher resource requests and limits for components. (default true)
       --max-queue-time duration             Maximum waiting time for the completion of other, currently running upgrade tasks. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". (default 10m0s)
@@ -45,7 +46,7 @@ capact upgrade --version 0.1.0
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/cmd/cli/docs/capact_version.md b/cmd/cli/docs/capact_version.md
index 72ff6f464..942be5e8a 100644
--- a/cmd/cli/docs/capact_version.md
+++ b/cmd/cli/docs/capact_version.md
@@ -21,7 +21,7 @@ capact version [flags]
 
 ```
   -c, --config string                 Path to the YAML config file
-  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - tracing (default 0 - disable)
+  -v, --verbose int/string[=simple]   Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable)
 ```
 
 ### SEE ALSO
diff --git a/deploy/kubernetes/charts/capact/charts/hub-local/templates/deployment.yaml b/deploy/kubernetes/charts/capact/charts/hub-local/templates/deployment.yaml
index 2b52d99b7..e0f7a815b 100644
--- a/deploy/kubernetes/charts/capact/charts/hub-local/templates/deployment.yaml
+++ b/deploy/kubernetes/charts/capact/charts/hub-local/templates/deployment.yaml
@@ -51,15 +51,9 @@ spec:
               containerPort: 8080
               protocol: TCP
           livenessProbe:
-            initialDelaySeconds: {{ .Values.probe.initialDelaySeconds }}
-            httpGet:
-              path: /healthz
-              port: 8080
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
-            initialDelaySeconds: {{ .Values.probe.initialDelaySeconds }}
-            httpGet:
-              path: /healthz
-              port: 8080
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/deploy/kubernetes/charts/capact/charts/hub-local/values.yaml b/deploy/kubernetes/charts/capact/charts/hub-local/values.yaml
index 69dd20412..5ba6c7648 100644
--- a/deploy/kubernetes/charts/capact/charts/hub-local/values.yaml
+++ b/deploy/kubernetes/charts/capact/charts/hub-local/values.yaml
@@ -54,5 +54,20 @@ tolerations: []
 
 affinity: {}
 
-probe:
-  initialDelaySeconds: 60
+readinessProbe:
+  initialDelaySeconds: 10
+  failureThreshold: 30
+  timeoutSeconds: 3
+  periodSeconds: 10
+  httpGet:
+    path: /healthz
+    port: 8080
+
+livenessProbe:
+  initialDelaySeconds: 10
+  failureThreshold: 30
+  timeoutSeconds: 3
+  periodSeconds: 10
+  httpGet:
+    path: /healthz
+    port: 8080
diff --git a/deploy/kubernetes/charts/capact/charts/hub-public/templates/_helpers.tpl b/deploy/kubernetes/charts/capact/charts/hub-public/templates/_helpers.tpl
index d3ae3aff9..0e0893773 100644
--- a/deploy/kubernetes/charts/capact/charts/hub-public/templates/_helpers.tpl
+++ b/deploy/kubernetes/charts/capact/charts/hub-public/templates/_helpers.tpl
@@ -65,9 +65,13 @@ Create the name of the service account to use
 Create the manifest source path
 */}}
 {{- define "populator.manifestPath" -}}
+{{- if .Values.populator.manifestsLocation.local -}}
+/hub-manifests
+{{- else }}
 {{- .Values.populator.manifestsLocation.repository -}}
 ?ref={{ .Values.populator.manifestsLocation.branch -}}
 {{- if .Values.populator.manifestsLocation.sshKey -}}
 &sshkey={{ .Values.populator.manifestsLocation.sshKey -}}
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/deploy/kubernetes/charts/capact/charts/hub-public/templates/deployment.yaml b/deploy/kubernetes/charts/capact/charts/hub-public/templates/deployment.yaml
index 61fb3aa00..f780e3ccf 100644
--- a/deploy/kubernetes/charts/capact/charts/hub-public/templates/deployment.yaml
+++ b/deploy/kubernetes/charts/capact/charts/hub-public/templates/deployment.yaml
@@ -82,15 +82,9 @@ spec:
               containerPort: 8080
               protocol: TCP
           livenessProbe:
-            initialDelaySeconds: {{ .Values.probe.initialDelaySeconds }}
-            httpGet:
-              path: /healthz
-              port: 8080
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
-            initialDelaySeconds: {{ .Values.probe.initialDelaySeconds }}
-            httpGet:
-              path: /healthz
-              port: 8080
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/deploy/kubernetes/charts/capact/charts/hub-public/values.yaml b/deploy/kubernetes/charts/capact/charts/hub-public/values.yaml
index 0369fc4b9..1668ab7c1 100644
--- a/deploy/kubernetes/charts/capact/charts/hub-public/values.yaml
+++ b/deploy/kubernetes/charts/capact/charts/hub-public/values.yaml
@@ -54,8 +54,23 @@ tolerations: []
 
 affinity: {}
 
-probe:
-  initialDelaySeconds: 60
+readinessProbe:
+  initialDelaySeconds: 10
+  failureThreshold: 30
+  timeoutSeconds: 3
+  periodSeconds: 10
+  httpGet:
+    path: /healthz
+    port: 8080
+
+livenessProbe:
+  initialDelaySeconds: 10
+  failureThreshold: 30
+  timeoutSeconds: 3
+  periodSeconds: 10
+  httpGet:
+    path: /healthz
+    port: 8080
 
 populator:
   enabled: true
@@ -65,6 +80,7 @@ populator:
   port: 8081
   updateOnGitCommit: true
   manifestsLocation:
+    local: false
     # It's public repository
     repository: github.com/capactio/hub-manifests
     branch: main
diff --git a/deploy/kubernetes/charts/ingress-nginx/.helmignore b/deploy/kubernetes/charts/ingress-controller/.helmignore
similarity index 100%
rename from deploy/kubernetes/charts/ingress-nginx/.helmignore
rename to deploy/kubernetes/charts/ingress-controller/.helmignore
diff --git a/deploy/kubernetes/charts/ingress-nginx/Chart.lock b/deploy/kubernetes/charts/ingress-controller/Chart.lock
similarity index 100%
rename from deploy/kubernetes/charts/ingress-nginx/Chart.lock
rename to deploy/kubernetes/charts/ingress-controller/Chart.lock
diff --git a/deploy/kubernetes/charts/ingress-nginx/Chart.yaml b/deploy/kubernetes/charts/ingress-controller/Chart.yaml
similarity index 100%
rename from deploy/kubernetes/charts/ingress-nginx/Chart.yaml
rename to deploy/kubernetes/charts/ingress-controller/Chart.yaml
diff --git a/deploy/kubernetes/charts/ingress-nginx/charts/ingress-nginx-3.34.0.tgz b/deploy/kubernetes/charts/ingress-controller/charts/ingress-nginx-3.34.0.tgz
similarity index 100%
rename from deploy/kubernetes/charts/ingress-nginx/charts/ingress-nginx-3.34.0.tgz
rename to deploy/kubernetes/charts/ingress-controller/charts/ingress-nginx-3.34.0.tgz
diff --git a/deploy/kubernetes/charts/ingress-nginx/templates/domain-cert.yaml b/deploy/kubernetes/charts/ingress-controller/templates/domain-cert.yaml
similarity index 100%
rename from deploy/kubernetes/charts/ingress-nginx/templates/domain-cert.yaml
rename to deploy/kubernetes/charts/ingress-controller/templates/domain-cert.yaml
diff --git a/deploy/kubernetes/charts/ingress-nginx/values.yaml b/deploy/kubernetes/charts/ingress-controller/values.yaml
similarity index 100%
rename from deploy/kubernetes/charts/ingress-nginx/values.yaml
rename to deploy/kubernetes/charts/ingress-controller/values.yaml
diff --git a/hack/release-charts.sh b/hack/release-charts.sh
index d6d61aff6..47eb9bdd4 100755
--- a/hack/release-charts.sh
+++ b/hack/release-charts.sh
@@ -20,7 +20,7 @@ readonly CAPACTIO_LATEST_BUCKET="capactio-latest-charts"
 
 readonly charts=(
   "argo"
-  "ingress-nginx"
+  "ingress-controller"
   "kubed"
   "cert-manager"
   "monitoring"
diff --git a/internal/cli/capact/capact.go b/internal/cli/capact/capact.go
index 7497f27a6..321b7d913 100644
--- a/internal/cli/capact/capact.go
+++ b/internal/cli/capact/capact.go
@@ -36,8 +36,8 @@ const (
 
 	// CRDUrl Capact CRD URL
 	CRDUrl = "https://raw.githubusercontent.com/capactio/capact/main/deploy/kubernetes/crds/core.capact.io_actions.yaml"
-	// CRDLocalPath is a path to CRD definition in the repository
-	CRDLocalPath = "deploy/kubernetes/crds/core.capact.io_actions.yaml"
+	// LocalCRDPath is a path to CRD definition in the repository
+	LocalCRDPath = "deploy/kubernetes/crds/core.capact.io_actions.yaml"
 
 	// Name Capact name
 	Name = "capact"
@@ -68,7 +68,6 @@ type Options struct {
 
 	// Helm client opts
 	DryRun     bool
-	Replace    bool
 	ClientOnly bool
 }
 
diff --git a/internal/cli/capact/components.go b/internal/cli/capact/components.go
index 603f5e7ee..1c64f77a3 100644
--- a/internal/cli/capact/components.go
+++ b/internal/cli/capact/components.go
@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"strings"
 	"time"
 
 	"capact.io/capact/internal/cli"
@@ -57,7 +58,6 @@ func (i components) All() []string {
 // ComponentData information about component
 type ComponentData struct {
 	ReleaseName string
-	LocalPath   string
 	ChartName   string
 	Wait        bool
 
@@ -86,7 +86,6 @@ func (c *ComponentData) Chart() string {
 func (c *ComponentData) installAction(version string) *action.Install {
 	installCli := action.NewInstall(c.configuration)
 
-	installCli.Replace = c.opts.Replace
 	installCli.ClientOnly = c.opts.ClientOnly
 
 	installCli.DryRun = c.opts.DryRun
@@ -94,7 +93,6 @@ func (c *ComponentData) installAction(version string) *action.Install {
 	installCli.Timeout = c.opts.Timeout
 
 	installCli.ChartPathOptions.Version = version
-	installCli.ChartPathOptions.RepoURL = c.opts.Parameters.Override.HelmRepoURL
 
 	installCli.NameTemplate = c.Name()
 	installCli.ReleaseName = c.Name()
@@ -113,7 +111,6 @@ func (c *ComponentData) upgradeAction(version string) *action.Upgrade {
 	upgradeAction.Timeout = c.opts.Timeout
 
 	upgradeAction.ChartPathOptions.Version = version
-	upgradeAction.ChartPathOptions.RepoURL = c.opts.Parameters.Override.HelmRepoURL
 
 	upgradeAction.Wait = c.Wait
 
@@ -139,17 +136,17 @@ func (c *ComponentData) runUpgrade(upgradeCli *action.Upgrade, values map[string
 	if _, err := histClient.Run(c.Name()); err == driver.ErrReleaseNotFound {
 		return c.RunInstall(upgradeCli.Version, values)
 	}
-	var chartPath string
-	var err error
-	var location string
 
-	if upgradeCli.Version == LocalVersionTag {
-		location = c.LocalPath
+	var location string
+	if isLocalDir(c.opts.Parameters.Override.HelmRepo) {
+		location = path.Join(c.opts.Parameters.Override.HelmRepo, c.Chart())
+		upgradeCli.ChartPathOptions.RepoURL = ""
 	} else {
 		location = c.Chart()
+		upgradeCli.ChartPathOptions.RepoURL = c.opts.Parameters.Override.HelmRepo
 	}
 
-	chartPath, err = upgradeCli.ChartPathOptions.LocateChart(location, &helmcli.EnvSettings{
+	chartPath, err := upgradeCli.ChartPathOptions.LocateChart(location, &helmcli.EnvSettings{
 		RepositoryCache: RepositoryCache,
 	})
 	if err != nil {
@@ -167,7 +164,7 @@ func (c *ComponentData) runUpgrade(upgradeCli *action.Upgrade, values map[string
 	err = retry.Do(func() error {
 		r, err = upgradeCli.Run(c.Name(), chartData, values)
 		return errors.Wrapf(err, "while upgrading Helm chart [%s]", c.Name())
-	}, retry.Attempts(3))
+	}, retry.Attempts(3), retry.Delay(time.Second))
 	if err != nil {
 		return nil, err
 	}
@@ -178,17 +175,16 @@ func (c *ComponentData) runUpgrade(upgradeCli *action.Upgrade, values map[string
 func (c *ComponentData) RunInstall(version string, values map[string]interface{}) (*release.Release, error) {
 	installCli := c.installAction(version)
 
-	var chartPath string
-	var err error
 	var location string
-
-	if installCli.Version == LocalVersionTag {
-		location = c.LocalPath
+	if isLocalDir(c.opts.Parameters.Override.HelmRepo) {
+		location = path.Join(c.opts.Parameters.Override.HelmRepo, c.Chart())
+		installCli.ChartPathOptions.RepoURL = ""
 	} else {
 		location = c.Chart()
+		installCli.ChartPathOptions.RepoURL = c.opts.Parameters.Override.HelmRepo
 	}
 
-	chartPath, err = installCli.ChartPathOptions.LocateChart(location, &helmcli.EnvSettings{
+	chartPath, err := installCli.ChartPathOptions.LocateChart(location, &helmcli.EnvSettings{
 		RepositoryCache: RepositoryCache,
 	})
 	if err != nil {
@@ -206,7 +202,7 @@ func (c *ComponentData) RunInstall(version string, values map[string]interface{}
 	err = retry.Do(func() error {
 		r, err = installCli.Run(chartData, values)
 		return errors.Wrapf(err, "while installing Helm chart [%s]", installCli.ReleaseName)
-	}, retry.Attempts(3))
+	}, retry.Attempts(3), retry.Delay(time.Second))
 	if err != nil {
 		return nil, err
 	}
@@ -229,15 +225,12 @@ func (h Helm) writeStatus(out io.Writer, r *release.Release) {
 	fmt.Fprintf(out, "\tDESCRIPTION: %s\n", r.Info.Description)
 }
 
-func (h Helm) writeHelmDetails(out io.Writer) {
-	fmt.Fprintf(out, "\n  Installation details:\n")
+func (h Helm) helmInstallDetails() string {
+	out := &strings.Builder{}
 	fmt.Fprintf(out, "\tVersion: %s\n", h.opts.Parameters.Version)
+	fmt.Fprintf(out, "\tHelm repository: %s\n\n", h.opts.Parameters.Override.HelmRepo)
 
-	helmRepo := h.opts.Parameters.Override.HelmRepoURL
-	if h.opts.Parameters.Version == LocalVersionTag {
-		helmRepo = LocalChartsPath
-	}
-	fmt.Fprintf(out, "\tHelm repository: %s\n\n", helmRepo)
+	return out.String()
 }
 
 // Components is a list of all Capact components available to install.
@@ -246,7 +239,6 @@ var Components = components{
 		ComponentData{
 			configuration: new(action.Configuration),
 			ReleaseName:   "neo4j",
-			LocalPath:     path.Join(LocalChartsPath, "neo4j"),
 			Wait:          true,
 		},
 	},
@@ -255,7 +247,6 @@ var Components = components{
 			configuration: new(action.Configuration),
 			ReleaseName:   "ingress-nginx",
 			ChartName:     "ingress-controller",
-			LocalPath:     path.Join(LocalChartsPath, "ingress-nginx"),
 			Wait:          true,
 		},
 	},
@@ -263,14 +254,12 @@ var Components = components{
 		ComponentData{
 			configuration: new(action.Configuration),
 			ReleaseName:   "argo",
-			LocalPath:     path.Join(LocalChartsPath, "argo"),
 		},
 	},
 	&CertManager{
 		ComponentData{
 			configuration: new(action.Configuration),
 			ReleaseName:   "cert-manager",
-			LocalPath:     path.Join(LocalChartsPath, "cert-manager"),
 			Wait:          true,
 		},
 	},
@@ -278,21 +267,18 @@ var Components = components{
 		ComponentData{
 			configuration: new(action.Configuration),
 			ReleaseName:   "kubed",
-			LocalPath:     path.Join(LocalChartsPath, "kubed"),
 		},
 	},
 	&Monitoring{
 		ComponentData{
 			configuration: new(action.Configuration),
 			ReleaseName:   "monitoring",
-			LocalPath:     path.Join(LocalChartsPath, "monitoring"),
 		},
 	},
 	&Capact{
 		ComponentData{
 			configuration: new(action.Configuration),
 			ReleaseName:   "capact",
-			LocalPath:     path.Join(LocalChartsPath, "capact"),
 			Wait:          true,
 		},
 	},
@@ -615,9 +601,7 @@ func NewHelm(configuration *action.Configuration, opts Options) *Helm {
 // InstallComponents installs Helm components
 func (h *Helm) InstallComponents(ctx context.Context, w io.Writer, status printer.Status) error {
 	if cli.VerboseMode.IsEnabled() {
-		status.Step("Resolving installation config")
-		status.End(true)
-		h.writeHelmDetails(w)
+		status.InfoWithBody("Installation details:", h.helmInstallDetails())
 	}
 
 	for _, component := range Components {
@@ -645,17 +629,17 @@ func (h *Helm) InstallComponents(ctx context.Context, w io.Writer, status printe
 // InstallCRD installs Capact CRD
 func (h *Helm) InstallCRD() error {
 	var reader io.Reader
-	if h.opts.Parameters.Version == LocalVersionTag {
-		f, err := os.Open(CRDLocalPath)
+	if isLocalFile(h.opts.Parameters.ActionCRDLocation) {
+		f, err := os.Open(h.opts.Parameters.ActionCRDLocation)
 		if err != nil {
-			return errors.Wrapf(err, "while opening local CRD file%s", CRDLocalPath)
+			return errors.Wrapf(err, "while opening local CRD file%s", h.opts.Parameters.ActionCRDLocation)
 		}
 		defer f.Close()
 		reader = f
 	} else {
-		resp, err := http.Get(CRDUrl)
+		resp, err := http.Get(h.opts.Parameters.ActionCRDLocation)
 		if err != nil {
-			return errors.Wrapf(err, "while getting CRD %s", CRDUrl)
+			return errors.Wrapf(err, "while getting CRD %s", h.opts.Parameters.ActionCRDLocation)
 		}
 		defer resp.Body.Close()
 		reader = resp.Body
@@ -663,7 +647,7 @@ func (h *Helm) InstallCRD() error {
 
 	content, err := ioutil.ReadAll(reader)
 	if err != nil {
-		return errors.Wrapf(err, "while downloading CRD %s", CRDUrl)
+		return errors.Wrapf(err, "while reading CRD %s", h.opts.Parameters.ActionCRDLocation)
 	}
 	return createObject(h.configuration, content)
 }
@@ -697,3 +681,13 @@ func ignoreAlreadyExistError(err error) error {
 	}
 	return err
 }
+
+func isLocalDir(in string) bool {
+	f, err := os.Stat(in)
+	return err == nil && f.IsDir()
+}
+
+func isLocalFile(in string) bool {
+	f, err := os.Stat(in)
+	return err == nil && !f.IsDir()
+}
diff --git a/internal/cli/capact/components_test.go b/internal/cli/capact/components_test.go
index 05397c0a2..ad6ca763e 100644
--- a/internal/cli/capact/components_test.go
+++ b/internal/cli/capact/components_test.go
@@ -7,13 +7,12 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/apimachinery/pkg/runtime/schema"
-
 	"github.com/stretchr/testify/assert"
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/kube"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/cli-runtime/pkg/resource"
 )
 
diff --git a/internal/cli/capact/os.go b/internal/cli/capact/os.go
index 0b946e40c..01ddb24e8 100644
--- a/internal/cli/capact/os.go
+++ b/internal/cli/capact/os.go
@@ -56,7 +56,6 @@ func TrustSelfSigned() error {
 		return err
 	}
 
-	fmt.Printf("   * Trusting self-signed CA certificate if not already trusted. Entering sudo password may be required\n")
 	switch os := runtime.GOOS; os {
 	case "darwin":
 		return trustSelfSignedDarwin(tmpFileName)
@@ -79,6 +78,7 @@ func trustSelfSignedDarwin(tmpCertPath string) error {
 		return nil
 	}
 
+	fmt.Printf("   * Trusting self-signed CA certificate. Entering sudo password may be required\n")
 	addCertCmd := "sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain %s"
 	// #nosec G204
 	cmd = exec.Command("/bin/sh", "-c", fmt.Sprintf(addCertCmd, tmpCertPath))
@@ -99,25 +99,27 @@ func trustSelfSignedLinux(tmpCertPath string) error {
 	}
 	certData = string(data)
 
-	if certData != tlsCrt {
-		// #nosec G204
-		cmd := exec.Command("/bin/sh", "-c", fmt.Sprintf("sudo cp %s %s", tmpCertPath, certPath))
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Stdin = os.Stdin
-
-		err = cmd.Run()
-		if err != nil {
-			return err
-		}
-
-		// #nosec G204
-		cmd = exec.Command("/bin/sh", "-c", "sudo update-ca-certificates")
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Stdin = os.Stdin
-
-		return cmd.Run()
+	if certData == tlsCrt {
+		return nil
 	}
-	return nil
+
+	fmt.Printf("   * Trusting self-signed CA certificate. Entering sudo password may be required\n")
+	// #nosec G204
+	cmd := exec.Command("/bin/sh", "-c", fmt.Sprintf("sudo cp %s %s", tmpCertPath, certPath))
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Stdin = os.Stdin
+
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
+
+	// #nosec G204
+	cmd = exec.Command("/bin/sh", "-c", "sudo update-ca-certificates")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Stdin = os.Stdin
+
+	return cmd.Run()
 }
diff --git a/internal/cli/capact/parameters.go b/internal/cli/capact/parameters.go
index 3bd9a52c2..790bd81ea 100644
--- a/internal/cli/capact/parameters.go
+++ b/internal/cli/capact/parameters.go
@@ -12,12 +12,13 @@ type (
 	InputParameters struct {
 		Version                string `json:"version"`
 		IncreaseResourceLimits bool   `json:"-"`
+		ActionCRDLocation      string `json:"-"`
 		Override               struct {
 			CapactStringOverrides      []string
 			IngressStringOverrides     []string
 			CertManagerStringOverrides []string
 
-			HelmRepoURL  string      `json:"helmRepoURL"`
+			HelmRepo     string      `json:"helmRepoURL"`
 			CapactValues Values      `json:"capactValues,omitempty"`
 			Neo4jValues  Neo4jValues `json:"neo4jValues,omitempty"`
 		} `json:"override"`
@@ -137,18 +138,21 @@ func IncreasedNeo4jResources() Resources {
 	}
 }
 
-//ResolveVersion resolves @latest tag
+// ResolveVersion resolves @latest tag
 func (i *InputParameters) ResolveVersion() error {
-	if i.Override.HelmRepoURL == LatestVersionTag {
-		i.Override.HelmRepoURL = HelmRepoLatest
+	if i.Override.HelmRepo == LatestVersionTag {
+		i.Override.HelmRepo = HelmRepoLatest
 	}
 	if i.Version == LatestVersionTag {
-		ver, err := NewHelmHelper().GetLatestVersion(i.Override.HelmRepoURL, Name)
+		ver, err := NewHelmHelper().GetLatestVersion(i.Override.HelmRepo, Name)
 		if err != nil {
 			return err
 		}
 		i.Version = ver
 	} else if i.Version == LocalVersionTag {
+		i.Override.HelmRepo = LocalChartsPath
+		i.ActionCRDLocation = LocalCRDPath
+
 		if i.Override.CapactValues.Global.ContainerRegistry.Path == "" {
 			i.Override.CapactValues.Global.ContainerRegistry.Path = LocalDockerPath
 		}
diff --git a/internal/cli/environment/create/k3d_defaults.go b/internal/cli/environment/create/k3d_defaults.go
index 5323e6eee..435110f1f 100644
--- a/internal/cli/environment/create/k3d_defaults.go
+++ b/internal/cli/environment/create/k3d_defaults.go
@@ -9,7 +9,7 @@ var k3dDefaultConfigTmpl string
 
 const (
 	// k3dDefaultNodeImage defines default Kubernetes image for a new k3d cluster.
-	k3dDefaultNodeImage = "docker.io/rancher/k3s:v1.20.7-k3s1"
+	k3dDefaultNodeImage = "docker.io/rancher/k3s:v1.20.10-k3s1"
 	// K3dDockerNetwork defines default Docker network name k3d cluster.
 	K3dDockerNetwork = "capact"
 )
diff --git a/internal/cli/environment/create/kind_defaults.go b/internal/cli/environment/create/kind_defaults.go
index f8f388374..d22e48309 100644
--- a/internal/cli/environment/create/kind_defaults.go
+++ b/internal/cli/environment/create/kind_defaults.go
@@ -10,7 +10,7 @@ nodeRegistration:
 
 const (
 	// KindDefaultNodeImage defines default Kubernetes image for a new kind cluster.
-	KindDefaultNodeImage = "kindest/node:v1.19.1"
+	KindDefaultNodeImage = "kindest/node:v1.20.7"
 )
 
 // KindDefaultConfig holds kind cluster configuration suitable for Capact installation.
diff --git a/internal/cli/verbose.go b/internal/cli/verbose.go
index e2da33d0d..f6e3f4b87 100644
--- a/internal/cli/verbose.go
+++ b/internal/cli/verbose.go
@@ -29,7 +29,7 @@ const (
 var VerboseModeHumanMapping = map[VerboseModeFlag]string{
 	VerboseModeDisabled: "disable",
 	VerboseModeSimple:   "simple",
-	VerboseModeTracing:  "tracing",
+	VerboseModeTracing:  "trace",
 }
 
 // ErrInvalidFormatType is returned when an unsupported verbose mode is used.
diff --git a/internal/cli/verbose_test.go b/internal/cli/verbose_test.go
index f2926f630..9530e280c 100644
--- a/internal/cli/verbose_test.go
+++ b/internal/cli/verbose_test.go
@@ -31,7 +31,7 @@ func TestVerboseModeFlagHappPath(t *testing.T) {
 			expectedMode:   cli.VerboseModeSimple,
 		},
 		"Should parse tracing verbose by human name": {
-			givenRawOption: "-v=tracing",
+			givenRawOption: "-v=trace",
 			expectedMode:   cli.VerboseModeTracing,
 		},
 		"Should parse disable verbose by human name": {