diff --git a/go.mod b/go.mod
index 9e55131..cef9f98 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,6 @@ module github.com/drone-plugins/drone-plugin-lib
 go 1.12
 
 require (
-	github.com/sirupsen/logrus v1.4.2 // indirect
-	github.com/urfave/cli v1.21.0
+	github.com/sirupsen/logrus v1.4.2
+	github.com/urfave/cli/v2 v2.0.0
 )
diff --git a/go.sum b/go.sum
index d7bdccd..8b7fd44 100644
--- a/go.sum
+++ b/go.sum
@@ -1,14 +1,24 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/urfave/cli v1.21.0 h1:wYSSj06510qPIzGSua9ZqsncMmWE3Zr55KBERygyrxE=
-github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ=
+github.com/urfave/cli/v2 v2.0.0 h1:+HU9SCbu8GnEUFtIBfuUNXN39ofWViIEJIp6SURMpCg=
+github.com/urfave/cli/v2 v2.0.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/pkg/urfave/logging.go b/pkg/urfave/logging.go
index 00ee68f..357bbac 100644
--- a/pkg/urfave/logging.go
+++ b/pkg/urfave/logging.go
@@ -7,17 +7,17 @@ package urfave
 
 import (
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
 const logLevelFlag = "log-level"
 
 func loggingFlags() []cli.Flag {
 	return []cli.Flag{
-		cli.StringFlag{
-			Name:   logLevelFlag,
-			Usage:  "logging-level",
-			EnvVar: "PLUGIN_LOG_LEVEL",
+		&cli.StringFlag{
+			Name:    logLevelFlag,
+			Usage:   "logging-level",
+			EnvVars: []string{"PLUGIN_LOG_LEVEL"},
 		},
 	}
 }
diff --git a/pkg/urfave/network.go b/pkg/urfave/network.go
index 3c441c2..7134a1a 100644
--- a/pkg/urfave/network.go
+++ b/pkg/urfave/network.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
 //---------------------------------------------------------------------
@@ -37,10 +37,10 @@ const networkSkipVerifyFlag = "transport.skip-verify"
 // networkFlags has the cli.Flags for the Transport.
 func networkFlags() []cli.Flag {
 	return []cli.Flag{
-		cli.BoolFlag{
-			Name:   networkSkipVerifyFlag,
-			Usage:  "skip ssl verify",
-			EnvVar: "PLUGIN_SKIP_VERIFY",
+		&cli.BoolFlag{
+			Name:    networkSkipVerifyFlag,
+			Usage:   "skip ssl verify",
+			EnvVars: []string{"PLUGIN_SKIP_VERIFY"},
 		},
 	}
 }
diff --git a/pkg/urfave/urfave.go b/pkg/urfave/urfave.go
index 770bc0b..84a8350 100644
--- a/pkg/urfave/urfave.go
+++ b/pkg/urfave/urfave.go
@@ -37,7 +37,7 @@ package urfave
 import (
 	"time"
 
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 
 	"github.com/drone-plugins/drone-plugin-lib/internal/environ"
 	"github.com/drone-plugins/drone-plugin-lib/pkg/plugin"
@@ -113,80 +113,80 @@ const (
 // buildFlags has the cli.Flags for the plugin.Build.
 func buildFlags() []cli.Flag {
 	return []cli.Flag{
-		cli.StringFlag{
-			Name:   buildActionFlag,
-			Usage:  "build action",
-			EnvVar: environ.BuildActionEnvVar,
+		&cli.StringFlag{
+			Name:    buildActionFlag,
+			Usage:   "build action",
+			EnvVars: []string{environ.BuildActionEnvVar},
 		},
-		cli.StringFlag{
-			Name:   buildCreatedFlag,
-			Usage:  "build created",
-			EnvVar: environ.BuildCreatedEnvVar,
+		&cli.StringFlag{
+			Name:    buildCreatedFlag,
+			Usage:   "build created",
+			EnvVars: []string{environ.BuildCreatedEnvVar},
 		},
-		cli.StringFlag{
-			Name:   buildDeployToFlag,
-			Usage:  "build deploy to",
-			EnvVar: environ.BuildDeployToEnvVar,
+		&cli.StringFlag{
+			Name:    buildDeployToFlag,
+			Usage:   "build deploy to",
+			EnvVars: []string{environ.BuildDeployToEnvVar},
 		},
-		cli.StringFlag{
-			Name:   buildEventFlag,
-			Usage:  "build event",
-			EnvVar: environ.BuildEventEnvVar,
+		&cli.StringFlag{
+			Name:    buildEventFlag,
+			Usage:   "build event",
+			EnvVars: []string{environ.BuildEventEnvVar},
 		},
-		cli.StringSliceFlag{
-			Name:   buildFailedStagesFlag,
-			Usage:  "build failed stages",
-			EnvVar: environ.BuildFailedStagesEnvVar,
+		&cli.StringSliceFlag{
+			Name:    buildFailedStagesFlag,
+			Usage:   "build failed stages",
+			EnvVars: []string{environ.BuildFailedStagesEnvVar},
 		},
-		cli.StringSliceFlag{
-			Name:   buildFailedStepsFlag,
-			Usage:  "build failed steps",
-			EnvVar: environ.BuildFailedStepsEnvVar,
+		&cli.StringSliceFlag{
+			Name:    buildFailedStepsFlag,
+			Usage:   "build failed steps",
+			EnvVars: []string{environ.BuildFailedStepsEnvVar},
 		},
-		cli.StringFlag{
-			Name:   buildFinishedFlag,
-			Usage:  "build finished",
-			EnvVar: environ.BuildFinishedEnvVar,
+		&cli.StringFlag{
+			Name:    buildFinishedFlag,
+			Usage:   "build finished",
+			EnvVars: []string{environ.BuildFinishedEnvVar},
 		},
-		cli.IntFlag{
-			Name:   buildNumberFlag,
-			Usage:  "build number",
-			EnvVar: environ.BuildNumberEnvVar,
+		&cli.IntFlag{
+			Name:    buildNumberFlag,
+			Usage:   "build number",
+			EnvVars: []string{environ.BuildNumberEnvVar},
 		},
-		cli.IntFlag{
-			Name:   buildParentFlag,
-			Usage:  "build parent",
-			EnvVar: environ.BuildParentEnvVar,
+		&cli.IntFlag{
+			Name:    buildParentFlag,
+			Usage:   "build parent",
+			EnvVars: []string{environ.BuildParentEnvVar},
 		},
-		cli.IntFlag{
-			Name:   buildPullRequestFlag,
-			Usage:  "build pull request",
-			EnvVar: environ.BuildPullRequestEnvVar,
+		&cli.IntFlag{
+			Name:    buildPullRequestFlag,
+			Usage:   "build pull request",
+			EnvVars: []string{environ.BuildPullRequestEnvVar},
 		},
-		cli.StringFlag{
-			Name:   buildSourceBranchFlag,
-			Usage:  "build source branch",
-			EnvVar: environ.BuildSourceBranchEnvVar,
+		&cli.StringFlag{
+			Name:    buildSourceBranchFlag,
+			Usage:   "build source branch",
+			EnvVars: []string{environ.BuildSourceBranchEnvVar},
 		},
-		cli.StringFlag{
-			Name:   buildStartedFlag,
-			Usage:  "build started",
-			EnvVar: environ.BuildStartedEnvVar,
+		&cli.StringFlag{
+			Name:    buildStartedFlag,
+			Usage:   "build started",
+			EnvVars: []string{environ.BuildStartedEnvVar},
 		},
-		cli.StringFlag{
-			Name:   buildStatusFlag,
-			Usage:  "build status",
-			EnvVar: environ.BuildStatusEnvVar,
+		&cli.StringFlag{
+			Name:    buildStatusFlag,
+			Usage:   "build status",
+			EnvVars: []string{environ.BuildStatusEnvVar},
 		},
-		cli.StringFlag{
-			Name:   buildTagFlag,
-			Usage:  "build tag",
-			EnvVar: environ.BuildTagEnvVar,
+		&cli.StringFlag{
+			Name:    buildTagFlag,
+			Usage:   "build tag",
+			EnvVars: []string{environ.BuildTagEnvVar},
 		},
-		cli.StringFlag{
-			Name:   buildTargetBranchFlag,
-			Usage:  "build target branch",
-			EnvVar: environ.BuildTargetBranchEnvVar,
+		&cli.StringFlag{
+			Name:    buildTargetBranchFlag,
+			Usage:   "build target branch",
+			EnvVars: []string{environ.BuildTargetBranchEnvVar},
 		},
 	}
 }
@@ -231,50 +231,50 @@ const (
 // repoFlags has the cli.Flags for the plugin.Repo
 func repoFlags() []cli.Flag {
 	return []cli.Flag{
-		cli.StringFlag{
-			Name:   repoDefaultBranchFlag,
-			Usage:  "repo default branch",
-			EnvVar: environ.RepoDefaultBranchEnvVar,
+		&cli.StringFlag{
+			Name:    repoDefaultBranchFlag,
+			Usage:   "repo default branch",
+			EnvVars: []string{environ.RepoDefaultBranchEnvVar},
 		},
-		cli.StringFlag{
-			Name:   repoFullNameFlag,
-			Usage:  "repo full name",
-			EnvVar: environ.RepoFullNameEnvVar,
+		&cli.StringFlag{
+			Name:    repoFullNameFlag,
+			Usage:   "repo full name",
+			EnvVars: []string{environ.RepoFullNameEnvVar},
 		},
-		cli.StringFlag{
-			Name:   repoLinkFlag,
-			Usage:  "repo link",
-			EnvVar: environ.RepoLinkEnvVar,
+		&cli.StringFlag{
+			Name:    repoLinkFlag,
+			Usage:   "repo link",
+			EnvVars: []string{environ.RepoLinkEnvVar},
 		},
-		cli.StringFlag{
-			Name:   repoNameFlag,
-			Usage:  "repo name",
-			EnvVar: environ.RepoNameEnvVar,
+		&cli.StringFlag{
+			Name:    repoNameFlag,
+			Usage:   "repo name",
+			EnvVars: []string{environ.RepoNameEnvVar},
 		},
-		cli.StringFlag{
-			Name:   repoOwnerFlag,
-			Usage:  "repo owner",
-			EnvVar: environ.RepoOwnerEnvVar,
+		&cli.StringFlag{
+			Name:    repoOwnerFlag,
+			Usage:   "repo owner",
+			EnvVars: []string{environ.RepoOwnerEnvVar},
 		},
-		cli.BoolFlag{
-			Name:   repoPrivateFlag,
-			Usage:  "repo private",
-			EnvVar: environ.RepoPrivateEnvVar,
+		&cli.BoolFlag{
+			Name:    repoPrivateFlag,
+			Usage:   "repo private",
+			EnvVars: []string{environ.RepoPrivateEnvVar},
 		},
-		cli.StringFlag{
-			Name:   repoRemoteURLFlag,
-			Usage:  "repo remote url",
-			EnvVar: environ.RepoRemoteURLEnvVar,
+		&cli.StringFlag{
+			Name:    repoRemoteURLFlag,
+			Usage:   "repo remote url",
+			EnvVars: []string{environ.RepoRemoteURLEnvVar},
 		},
-		cli.StringFlag{
-			Name:   repoSCMFlag,
-			Usage:  "repo scm",
-			EnvVar: environ.RepoSCMEnvVar,
+		&cli.StringFlag{
+			Name:    repoSCMFlag,
+			Usage:   "repo scm",
+			EnvVars: []string{environ.RepoSCMEnvVar},
 		},
-		cli.StringFlag{
-			Name:   repoVisibilityFlag,
-			Usage:  "repo visibility",
-			EnvVar: environ.RepoVisibilityEnvVar,
+		&cli.StringFlag{
+			Name:    repoVisibilityFlag,
+			Usage:   "repo visibility",
+			EnvVars: []string{environ.RepoVisibilityEnvVar},
 		},
 	}
 }
@@ -315,60 +315,60 @@ const (
 // commitFlags has the cli.Flags for the plugin.Commit.
 func commitFlags() []cli.Flag {
 	return []cli.Flag{
-		cli.StringFlag{
-			Name:   commitAfterFlag,
-			Usage:  "commit after",
-			EnvVar: environ.CommitAfterEnvVar,
+		&cli.StringFlag{
+			Name:    commitAfterFlag,
+			Usage:   "commit after",
+			EnvVars: []string{environ.CommitAfterEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitAuthorFlag,
-			Usage:  "commit author",
-			EnvVar: environ.CommitAuthorEnvVar,
+		&cli.StringFlag{
+			Name:    commitAuthorFlag,
+			Usage:   "commit author",
+			EnvVars: []string{environ.CommitAuthorEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitAuthorAvatarFlag,
-			Usage:  "commit author avatar",
-			EnvVar: environ.CommitAuthorAvatarEnvVar,
+		&cli.StringFlag{
+			Name:    commitAuthorAvatarFlag,
+			Usage:   "commit author avatar",
+			EnvVars: []string{environ.CommitAuthorAvatarEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitAuthorEmailFlag,
-			Usage:  "commit author email",
-			EnvVar: environ.CommitAuthorEmailEnvVar,
+		&cli.StringFlag{
+			Name:    commitAuthorEmailFlag,
+			Usage:   "commit author email",
+			EnvVars: []string{environ.CommitAuthorEmailEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitAuthorNameFlag,
-			Usage:  "commit author name",
-			EnvVar: environ.CommitAuthorNameEnvVar,
+		&cli.StringFlag{
+			Name:    commitAuthorNameFlag,
+			Usage:   "commit author name",
+			EnvVars: []string{environ.CommitAuthorNameEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitBeforeFlag,
-			Usage:  "commit before",
-			EnvVar: environ.CommitBeforeEnvVar,
+		&cli.StringFlag{
+			Name:    commitBeforeFlag,
+			Usage:   "commit before",
+			EnvVars: []string{environ.CommitBeforeEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitBranchFlag,
-			Usage:  "commit branch",
-			EnvVar: environ.CommitBranchEnvVar,
+		&cli.StringFlag{
+			Name:    commitBranchFlag,
+			Usage:   "commit branch",
+			EnvVars: []string{environ.CommitBranchEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitLinkFlag,
-			Usage:  "commit link",
-			EnvVar: environ.CommitLinkEnvVar,
+		&cli.StringFlag{
+			Name:    commitLinkFlag,
+			Usage:   "commit link",
+			EnvVars: []string{environ.CommitLinkEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitMessageFlag,
-			Usage:  "commit message",
-			EnvVar: environ.CommitMessageEnvVar,
+		&cli.StringFlag{
+			Name:    commitMessageFlag,
+			Usage:   "commit message",
+			EnvVars: []string{environ.CommitMessageEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitRefFlag,
-			Usage:  "commit ref",
-			EnvVar: environ.CommitRefEnvVar,
+		&cli.StringFlag{
+			Name:    commitRefFlag,
+			Usage:   "commit ref",
+			EnvVars: []string{environ.CommitRefEnvVar},
 		},
-		cli.StringFlag{
-			Name:   commitSHAFlag,
-			Usage:  "commit sha",
-			EnvVar: environ.CommitSHAEnvVar,
+		&cli.StringFlag{
+			Name:    commitSHAFlag,
+			Usage:   "commit sha",
+			EnvVars: []string{environ.CommitSHAEnvVar},
 		},
 	}
 }
@@ -413,60 +413,70 @@ const (
 // stageFlags has the cli.Flags for the plugin.Stage
 func stageFlags() []cli.Flag {
 	return []cli.Flag{
-		cli.StringFlag{
-			Name:   stageArchFlag,
-			Usage:  "stage arch",
-			EnvVar: environ.StageArchEnvVar,
+		&cli.StringFlag{
+			Name:    stageArchFlag,
+			Usage:   "stage arch",
+			EnvVars: []string{environ.StageArchEnvVar},
 		},
-		cli.StringSliceFlag{
-			Name:   stageDependsOnFlag,
-			Usage:  "stage depends on",
-			EnvVar: environ.StageDependsOnEnvVar,
+		&cli.StringSliceFlag{
+			Name:    stageDependsOnFlag,
+			Usage:   "stage depends on",
+			EnvVars: []string{environ.StageDependsOnEnvVar},
 		},
-		cli.Int64Flag{
-			Name:   stageFinishedFlag,
-			Usage:  "stage finished",
-			EnvVar: environ.StageFinishedEnvVar,
-		}, cli.StringFlag{
-			Name:   stageKindFlag,
-			Usage:  "stage kind",
-			EnvVar: environ.StageKindEnvVar,
-		}, cli.StringFlag{
-			Name:   stageMachineFlag,
-			Usage:  "stage machine",
-			EnvVar: environ.StageMachineEnvVar,
-		}, cli.StringFlag{
-			Name:   stageNameFlag,
-			Usage:  "stage name",
-			EnvVar: environ.StageNameEnvVar,
-		}, cli.IntFlag{
-			Name:   stageNumberFlag,
-			Usage:  "stage number",
-			EnvVar: environ.StageNumberEnvVar,
-		}, cli.StringFlag{
-			Name:   stageOSFlag,
-			Usage:  "stage os",
-			EnvVar: environ.StageOSEnvVar,
-		}, cli.Int64Flag{
-			Name:   stageStartedFlag,
-			Usage:  "stage started",
-			EnvVar: environ.StageStartedEnvVar,
-		}, cli.StringFlag{
-			Name:   stageStatusFlag,
-			Usage:  "stage status",
-			EnvVar: environ.StageStatusEnvVar,
-		}, cli.StringFlag{
-			Name:   stageTypeFlag,
-			Usage:  "stage type",
-			EnvVar: environ.StageTypeEnvVar,
-		}, cli.StringFlag{
-			Name:   stageVariantFlag,
-			Usage:  "stage variant",
-			EnvVar: environ.StageVariantEnvVar,
-		}, cli.StringFlag{
-			Name:   stageVersionFlag,
-			Usage:  "stage version",
-			EnvVar: environ.StageVersionEnvVar,
+		&cli.Int64Flag{
+			Name:    stageFinishedFlag,
+			Usage:   "stage finished",
+			EnvVars: []string{environ.StageFinishedEnvVar},
+		},
+		&cli.StringFlag{
+			Name:    stageKindFlag,
+			Usage:   "stage kind",
+			EnvVars: []string{environ.StageKindEnvVar},
+		},
+		&cli.StringFlag{
+			Name:    stageMachineFlag,
+			Usage:   "stage machine",
+			EnvVars: []string{environ.StageMachineEnvVar},
+		},
+		&cli.StringFlag{
+			Name:    stageNameFlag,
+			Usage:   "stage name",
+			EnvVars: []string{environ.StageNameEnvVar},
+		},
+		&cli.IntFlag{
+			Name:    stageNumberFlag,
+			Usage:   "stage number",
+			EnvVars: []string{environ.StageNumberEnvVar},
+		},
+		&cli.StringFlag{
+			Name:    stageOSFlag,
+			Usage:   "stage os",
+			EnvVars: []string{environ.StageOSEnvVar},
+		},
+		&cli.Int64Flag{
+			Name:    stageStartedFlag,
+			Usage:   "stage started",
+			EnvVars: []string{environ.StageStartedEnvVar},
+		},
+		&cli.StringFlag{
+			Name:    stageStatusFlag,
+			Usage:   "stage status",
+			EnvVars: []string{environ.StageStatusEnvVar},
+		},
+		&cli.StringFlag{
+			Name:    stageTypeFlag,
+			Usage:   "stage type",
+			EnvVars: []string{environ.StageTypeEnvVar},
+		},
+		&cli.StringFlag{
+			Name:    stageVariantFlag,
+			Usage:   "stage variant",
+			EnvVars: []string{environ.StageVariantEnvVar},
+		},
+		&cli.StringFlag{
+			Name:    stageVersionFlag,
+			Usage:   "stage version",
+			EnvVars: []string{environ.StageVersionEnvVar},
 		},
 	}
 }
@@ -504,15 +514,15 @@ const (
 // stepFlags has the cli.Flags for the plugin.Step.
 func stepFlags() []cli.Flag {
 	return []cli.Flag{
-		cli.StringFlag{
-			Name:   stepNameFlag,
-			Usage:  "step name",
-			EnvVar: environ.StepNameEnvVar,
+		&cli.StringFlag{
+			Name:    stepNameFlag,
+			Usage:   "step name",
+			EnvVars: []string{environ.StepNameEnvVar},
 		},
-		cli.StringFlag{
-			Name:   stepNumberFlag,
-			Usage:  "step number",
-			EnvVar: environ.StepNumberEnvVar,
+		&cli.StringFlag{
+			Name:    stepNumberFlag,
+			Usage:   "step number",
+			EnvVars: []string{environ.StepNumberEnvVar},
 		},
 	}
 }
@@ -543,45 +553,45 @@ const (
 // semVerFlags has the cli.Flags for the plugin.SemVer.
 func semVerFlags() []cli.Flag {
 	return []cli.Flag{
-		cli.StringFlag{
-			Name:   semVerBuildFlag,
-			Usage:  "semver build",
-			EnvVar: environ.SemVerBuildEnvVar,
+		&cli.StringFlag{
+			Name:    semVerBuildFlag,
+			Usage:   "semver build",
+			EnvVars: []string{environ.SemVerBuildEnvVar},
 		},
-		cli.StringFlag{
-			Name:   semVerErrorFlag,
-			Usage:  "semver error",
-			EnvVar: environ.SemVerErrorEnvVar,
+		&cli.StringFlag{
+			Name:    semVerErrorFlag,
+			Usage:   "semver error",
+			EnvVars: []string{environ.SemVerErrorEnvVar},
 		},
-		cli.StringFlag{
-			Name:   semVerMajorFlag,
-			Usage:  "semver major",
-			EnvVar: environ.SemVerMajorEnvVar,
+		&cli.StringFlag{
+			Name:    semVerMajorFlag,
+			Usage:   "semver major",
+			EnvVars: []string{environ.SemVerMajorEnvVar},
 		},
-		cli.StringFlag{
-			Name:   semVerMinorFlag,
-			Usage:  "semver minor",
-			EnvVar: environ.SemVerMinorEnvVar,
+		&cli.StringFlag{
+			Name:    semVerMinorFlag,
+			Usage:   "semver minor",
+			EnvVars: []string{environ.SemVerMinorEnvVar},
 		},
-		cli.StringFlag{
-			Name:   semVerPatchFlag,
-			Usage:  "semver patch",
-			EnvVar: environ.SemVerPatchEnvVar,
+		&cli.StringFlag{
+			Name:    semVerPatchFlag,
+			Usage:   "semver patch",
+			EnvVars: []string{environ.SemVerPatchEnvVar},
 		},
-		cli.StringFlag{
-			Name:   semVerPrereleaseFlag,
-			Usage:  "semver prerelease",
-			EnvVar: environ.SemVerPrereleaseEnvVar,
+		&cli.StringFlag{
+			Name:    semVerPrereleaseFlag,
+			Usage:   "semver prerelease",
+			EnvVars: []string{environ.SemVerPrereleaseEnvVar},
 		},
-		cli.StringFlag{
-			Name:   semVerShortFlag,
-			Usage:  "semver short",
-			EnvVar: environ.SemVerShortEnvVar,
+		&cli.StringFlag{
+			Name:    semVerShortFlag,
+			Usage:   "semver short",
+			EnvVars: []string{environ.SemVerShortEnvVar},
 		},
-		cli.StringFlag{
-			Name:   semVerVersionFlag,
-			Usage:  "semver version",
-			EnvVar: environ.SemVerVersionEnvVar,
+		&cli.StringFlag{
+			Name:    semVerVersionFlag,
+			Usage:   "semver version",
+			EnvVars: []string{environ.SemVerVersionEnvVar},
 		},
 	}
 }