diff --git a/cmd/build.go b/cmd/build.go
index 2adfa511..8ea0d77b 100644
--- a/cmd/build.go
+++ b/cmd/build.go
@@ -10,12 +10,12 @@ import (
 // NewBuildCmd returns build subcmd
 func NewBuildCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	buildOptions := config.NewBuildOptions()
-	buildImpl := config.NewBuildImpl(globalCfg, buildOptions)
 
 	cmd := &cobra.Command{
 		Use:   "build",
 		Short: "Build all resources from state file",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			buildImpl := config.NewBuildImpl(globalCfg, buildOptions)
 			err := config.NewCLIConfigImpl(buildImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/charts.go b/cmd/charts.go
index 7cb27636..094354ac 100644
--- a/cmd/charts.go
+++ b/cmd/charts.go
@@ -10,12 +10,12 @@ import (
 // NewChartsCmd returns charts subcmd
 func NewChartsCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	chartsOptions := config.NewChartsOptions()
-	chartsImpl := config.NewChartsImpl(globalCfg, chartsOptions)
 
 	cmd := &cobra.Command{
 		Use:   "charts",
 		Short: "DEPRECATED: sync releases from state file (helm upgrade --install)",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			chartsImpl := config.NewChartsImpl(globalCfg, chartsOptions)
 			err := config.NewCLIConfigImpl(chartsImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/delete.go b/cmd/delete.go
index 09d4c105..3044c394 100644
--- a/cmd/delete.go
+++ b/cmd/delete.go
@@ -10,12 +10,12 @@ import (
 // NewDeleteCmd returns delete subcmd
 func NewDeleteCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	deleteOptions := config.NewDeleteOptions()
-	deleteImpl := config.NewDeleteImpl(globalCfg, deleteOptions)
 
 	cmd := &cobra.Command{
 		Use:   "delete",
 		Short: "DEPRECATED: delete releases from state file (helm delete)",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			deleteImpl := config.NewDeleteImpl(globalCfg, deleteOptions)
 			err := config.NewCLIConfigImpl(deleteImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/deps.go b/cmd/deps.go
index 8adde992..0d9e3e8e 100644
--- a/cmd/deps.go
+++ b/cmd/deps.go
@@ -10,12 +10,12 @@ import (
 // NewDepsCmd returns deps subcmd
 func NewDepsCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	depsOptions := config.NewDepsOptions()
-	depsImpl := config.NewDepsImpl(globalCfg, depsOptions)
 
 	cmd := &cobra.Command{
 		Use:   "deps",
 		Short: "Update charts based on their requirements",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			depsImpl := config.NewDepsImpl(globalCfg, depsOptions)
 			err := config.NewCLIConfigImpl(depsImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/destroy.go b/cmd/destroy.go
index c2ba93d7..c78789ef 100644
--- a/cmd/destroy.go
+++ b/cmd/destroy.go
@@ -10,12 +10,12 @@ import (
 // NewDestroyCmd returns destroy subcmd
 func NewDestroyCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	destroyOptions := config.NewDestroyOptions()
-	destroyImpl := config.NewDestroyImpl(globalCfg, destroyOptions)
 
 	cmd := &cobra.Command{
 		Use:   "destroy",
 		Short: "Destroys and then purges releases",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			destroyImpl := config.NewDestroyImpl(globalCfg, destroyOptions)
 			err := config.NewCLIConfigImpl(destroyImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/diff.go b/cmd/diff.go
index 3c69c67a..85c8cea6 100644
--- a/cmd/diff.go
+++ b/cmd/diff.go
@@ -10,12 +10,12 @@ import (
 // NewDiffCmd returns diff subcmd
 func NewDiffCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	diffOptions := config.NewDiffOptions()
-	diffImpl := config.NewDiffImpl(globalCfg, diffOptions)
 
 	cmd := &cobra.Command{
 		Use:   "diff",
 		Short: "Diff releases defined in state file",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			diffImpl := config.NewDiffImpl(globalCfg, diffOptions)
 			err := config.NewCLIConfigImpl(diffImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/fetch.go b/cmd/fetch.go
index 91ee7157..06fa8e15 100644
--- a/cmd/fetch.go
+++ b/cmd/fetch.go
@@ -10,12 +10,12 @@ import (
 // NewFetchCmd returns diff subcmd
 func NewFetchCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	fetchOptions := config.NewFetchOptions()
-	fetchImpl := config.NewFetchImpl(globalCfg, fetchOptions)
 
 	cmd := &cobra.Command{
 		Use:   "fetch",
 		Short: "Fetch charts from state file",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			fetchImpl := config.NewFetchImpl(globalCfg, fetchOptions)
 			err := config.NewCLIConfigImpl(fetchImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/lint.go b/cmd/lint.go
index b6d64645..2e01d314 100644
--- a/cmd/lint.go
+++ b/cmd/lint.go
@@ -10,12 +10,12 @@ import (
 // NewLintCmd returns lint subcmd
 func NewLintCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	lintOptions := config.NewLintOptions()
-	lintImpl := config.NewLintImpl(globalCfg, lintOptions)
 
 	cmd := &cobra.Command{
 		Use:   "lint",
 		Short: "Lint charts from state file (helm lint)",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			lintImpl := config.NewLintImpl(globalCfg, lintOptions)
 			err := config.NewCLIConfigImpl(lintImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/list.go b/cmd/list.go
index 26488d41..55def2b5 100644
--- a/cmd/list.go
+++ b/cmd/list.go
@@ -10,12 +10,12 @@ import (
 // NewListCmd returns list subcmd
 func NewListCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	listOptions := config.NewListOptions()
-	listImpl := config.NewListImpl(globalCfg, listOptions)
 
 	cmd := &cobra.Command{
 		Use:   "list",
 		Short: "List releases defined in state file",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			listImpl := config.NewListImpl(globalCfg, listOptions)
 			err := config.NewCLIConfigImpl(listImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/repos.go b/cmd/repos.go
index 963c6e84..e3ef221a 100644
--- a/cmd/repos.go
+++ b/cmd/repos.go
@@ -10,12 +10,12 @@ import (
 // NewReposCmd returns repos subcmd
 func NewReposCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	reposOptions := config.NewReposOptions()
-	reposImpl := config.NewReposImpl(globalCfg, reposOptions)
 
 	cmd := &cobra.Command{
 		Use:   "repos",
 		Short: "Repos releases defined in state file",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			reposImpl := config.NewReposImpl(globalCfg, reposOptions)
 			err := config.NewCLIConfigImpl(reposImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/status.go b/cmd/status.go
index 5419b080..3f8e332f 100644
--- a/cmd/status.go
+++ b/cmd/status.go
@@ -10,12 +10,12 @@ import (
 // NewStatusCmd returns status subcmd
 func NewStatusCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	statusOptions := config.NewStatusOptions()
-	statusImpl := config.NewStatusImpl(globalCfg, statusOptions)
 
 	cmd := &cobra.Command{
 		Use:   "status",
 		Short: "Retrieve status of releases in state file",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			statusImpl := config.NewStatusImpl(globalCfg, statusOptions)
 			err := config.NewCLIConfigImpl(statusImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/sync.go b/cmd/sync.go
index 63431a48..60ad1a99 100644
--- a/cmd/sync.go
+++ b/cmd/sync.go
@@ -10,12 +10,12 @@ import (
 // NewSyncCmd returns sync subcmd
 func NewSyncCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	syncOptions := config.NewSyncOptions()
-	syncImpl := config.NewSyncImpl(globalCfg, syncOptions)
 
 	cmd := &cobra.Command{
 		Use:   "sync",
 		Short: "Sync releases defined in state file",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			syncImpl := config.NewSyncImpl(globalCfg, syncOptions)
 			err := config.NewCLIConfigImpl(syncImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/template.go b/cmd/template.go
index e75a74e4..31693f11 100644
--- a/cmd/template.go
+++ b/cmd/template.go
@@ -10,12 +10,12 @@ import (
 // NewTemplateCmd returm template subcmd
 func NewTemplateCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	templateOptions := config.NewTemplateOptions()
-	templateImpl := config.NewTemplateImpl(globalCfg, templateOptions)
 
 	cmd := &cobra.Command{
 		Use:   "template",
 		Short: "Template releases defined in state file",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			templateImpl := config.NewTemplateImpl(globalCfg, templateOptions)
 			err := config.NewCLIConfigImpl(templateImpl.GlobalImpl)
 			if err != nil {
 				return err
diff --git a/cmd/write-values.go b/cmd/write-values.go
index c547a9d4..2840cd11 100644
--- a/cmd/write-values.go
+++ b/cmd/write-values.go
@@ -10,12 +10,12 @@ import (
 // NewWriteValuesCmd returns write subcmd
 func NewWriteValuesCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	writeValuesOptions := config.NewWriteValuesOptions()
-	writeValuesImpl := config.NewWriteValuesImpl(globalCfg, writeValuesOptions)
 
 	cmd := &cobra.Command{
 		Use:   "write-values",
 		Short: "Write values files for releases. Similar to `helmfile template`, write values files instead of manifests.",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			writeValuesImpl := config.NewWriteValuesImpl(globalCfg, writeValuesOptions)
 			err := config.NewCLIConfigImpl(writeValuesImpl.GlobalImpl)
 			if err != nil {
 				return err