diff --git a/cli/exec/flags.go b/cli/exec/flags.go
index 1acc44ee3..4302c5805 100644
--- a/cli/exec/flags.go
+++ b/cli/exec/flags.go
@@ -125,229 +125,277 @@ var flags = []cli.Flag{
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_SYSTEM_PLATFORM"),
 		Name:    "system-platform",
+		Usage:   "Set the metadata environment variable \"CI_SYSTEM_PLATFORM\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_SYSTEM_HOST"),
 		Name:    "system-host",
+		Usage:   "Set the metadata environment variable \"CI_SYSTEM_HOST\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_SYSTEM_NAME"),
 		Name:    "system-name",
+		Usage:   "Set the metadata environment variable \"CI_SYSTEM_NAME\".",
 		Value:   "woodpecker",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_SYSTEM_URL"),
 		Name:    "system-url",
+		Usage:   "Set the metadata environment variable \"CI_SYSTEM_URL\".",
 		Value:   "https://github.com/woodpecker-ci/woodpecker",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_REPO"),
 		Name:    "repo",
-		Usage:   "full repo name",
+		Usage:   "Set the full name to derive metadata environment variables \"CI_REPO\", \"CI_REPO_NAME\" and \"CI_REPO_OWNER\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_REPO_REMOTE_ID"),
 		Name:    "repo-remote-id",
+		Usage:   "Set the metadata environment variable \"CI_REPO_REMOTE_ID\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_REPO_URL"),
 		Name:    "repo-url",
+		Usage:   "Set the metadata environment variable \"CI_REPO_URL\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_REPO_SCM"),
 		Name:    "repo-scm",
+		Usage:   "Set the metadata environment variable \"CI_REPO_SCM\".",
 		Value:   "git",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_REPO_DEFAULT_BRANCH"),
 		Name:    "repo-default-branch",
+		Usage:   "Set the metadata environment variable \"CI_REPO_DEFAULT_BRANCH\".",
 		Value:   "main",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_REPO_CLONE_URL"),
 		Name:    "repo-clone-url",
+		Usage:   "Set the metadata environment variable \"CI_REPO_CLONE_URL\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_REPO_CLONE_SSH_URL"),
 		Name:    "repo-clone-ssh-url",
+		Usage:   "Set the metadata environment variable \"CI_REPO_CLONE_SSH_URL\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_REPO_PRIVATE"),
 		Name:    "repo-private",
+		Usage:   "Set the metadata environment variable \"CI_REPO_PRIVATE\".",
 	},
 	&cli.BoolFlag{
 		Sources: cli.EnvVars("CI_REPO_TRUSTED"),
 		Name:    "repo-trusted",
+		Usage:   "Set the metadata environment variable \"CI_REPO_TRUSTED\".",
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("CI_PIPELINE_NUMBER"),
 		Name:    "pipeline-number",
+		Usage:   "Set the metadata environment variable \"CI_PIPELINE_NUMBER\".",
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("CI_PIPELINE_PARENT"),
 		Name:    "pipeline-parent",
+		Usage:   "Set the metadata environment variable \"CI_PIPELINE_PARENT\".",
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("CI_PIPELINE_CREATED"),
 		Name:    "pipeline-created",
+		Usage:   "Set the metadata environment variable \"CI_PIPELINE_CREATED\".",
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("CI_PIPELINE_STARTED"),
 		Name:    "pipeline-started",
+		Usage:   "Set the metadata environment variable \"CI_PIPELINE_STARTED\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PIPELINE_EVENT"),
 		Name:    "pipeline-event",
+		Usage:   "Set the metadata environment variable \"CI_PIPELINE_EVENT\".",
 		Value:   "manual",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PIPELINE_FORGE_URL"),
 		Name:    "pipeline-url",
+		Usage:   "Set the metadata environment variable \"CI_PIPELINE_FORGE_URL\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PIPELINE_DEPLOY_TARGET"),
 		Name:    "pipeline-deploy-to",
+		Usage:   "Set the metadata environment variable \"CI_PIPELINE_DEPLOY_TARGET\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PIPELINE_DEPLOY_TASK"),
 		Name:    "pipeline-deploy-task",
+		Usage:   "Set the metadata environment variable \"CI_PIPELINE_DEPLOY_TASK\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PIPELINE_FILES"),
-		Usage:   "either json formatted list of strings, or comma separated string list",
+		Usage:   "Set the metadata environment variable \"CI_PIPELINE_FILES\", either json formatted list of strings, or comma separated string list.",
 		Name:    "pipeline-files",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_COMMIT_SHA"),
 		Name:    "commit-sha",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_SHA\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_COMMIT_REF"),
 		Name:    "commit-ref",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_REF\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_COMMIT_REFSPEC"),
 		Name:    "commit-refspec",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_REFSPEC\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_COMMIT_BRANCH"),
 		Name:    "commit-branch",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_BRANCH\".",
 		Value:   "main",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_COMMIT_MESSAGE"),
 		Name:    "commit-message",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_MESSAGE\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_COMMIT_AUTHOR"),
 		Name:    "commit-author-name",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_AUTHOR\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_COMMIT_AUTHOR_AVATAR"),
 		Name:    "commit-author-avatar",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_AUTHOR_AVATAR\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_COMMIT_AUTHOR_EMAIL"),
 		Name:    "commit-author-email",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_AUTHOR_EMAIL\".",
 	},
 	&cli.StringSliceFlag{
 		Sources: cli.EnvVars("CI_COMMIT_PULL_REQUEST_LABELS"),
 		Name:    "commit-pull-labels",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_PULL_REQUEST_LABELS\".",
 	},
 	&cli.BoolFlag{
 		Sources: cli.EnvVars("CI_COMMIT_PRERELEASE"),
 		Name:    "commit-release-is-pre",
+		Usage:   "Set the metadata environment variable \"CI_COMMIT_PRERELEASE\".",
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("CI_PREV_PIPELINE_NUMBER"),
 		Name:    "prev-pipeline-number",
+		Usage:   "Set the metadata environment variable \"CI_PREV_PIPELINE_NUMBER\".",
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("CI_PREV_PIPELINE_CREATED"),
 		Name:    "prev-pipeline-created",
+		Usage:   "Set the metadata environment variable \"CI_PREV_PIPELINE_CREATED\".",
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("CI_PREV_PIPELINE_STARTED"),
 		Name:    "prev-pipeline-started",
+		Usage:   "Set the metadata environment variable \"CI_PREV_PIPELINE_STARTED\".",
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("CI_PREV_PIPELINE_FINISHED"),
 		Name:    "prev-pipeline-finished",
+		Usage:   "Set the metadata environment variable \"CI_PREV_PIPELINE_FINISHED\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_PIPELINE_STATUS"),
 		Name:    "prev-pipeline-status",
+		Usage:   "Set the metadata environment variable \"CI_PREV_PIPELINE_STATUS\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_PIPELINE_EVENT"),
 		Name:    "prev-pipeline-event",
+		Usage:   "Set the metadata environment variable \"CI_PREV_PIPELINE_EVENT\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_PIPELINE_FORGE_URL"),
 		Name:    "prev-pipeline-url",
+		Usage:   "Set the metadata environment variable \"CI_PREV_PIPELINE_FORGE_URL\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_PIPELINE_DEPLOY_TARGET"),
 		Name:    "prev-pipeline-deploy-to",
+		Usage:   "Set the metadata environment variable \"CI_PREV_PIPELINE_DEPLOY_TARGET\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_PIPELINE_DEPLOY_TASK"),
 		Name:    "prev-pipeline-deploy-task",
+		Usage:   "Set the metadata environment variable \"CI_PREV_PIPELINE_DEPLOY_TASK\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_COMMIT_SHA"),
 		Name:    "prev-commit-sha",
+		Usage:   "Set the metadata environment variable \"CI_PREV_COMMIT_SHA\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_COMMIT_REF"),
 		Name:    "prev-commit-ref",
+		Usage:   "Set the metadata environment variable \"CI_PREV_COMMIT_REF\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_COMMIT_REFSPEC"),
 		Name:    "prev-commit-refspec",
+		Usage:   "Set the metadata environment variable \"CI_PREV_COMMIT_REFSPEC\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_COMMIT_BRANCH"),
 		Name:    "prev-commit-branch",
+		Usage:   "Set the metadata environment variable \"CI_PREV_COMMIT_BRANCH\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_COMMIT_MESSAGE"),
 		Name:    "prev-commit-message",
+		Usage:   "Set the metadata environment variable \"CI_PREV_COMMIT_MESSAGE\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_COMMIT_AUTHOR"),
 		Name:    "prev-commit-author-name",
+		Usage:   "Set the metadata environment variable \"CI_PREV_COMMIT_AUTHOR\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_COMMIT_AUTHOR_AVATAR"),
 		Name:    "prev-commit-author-avatar",
+		Usage:   "Set the metadata environment variable \"CI_PREV_COMMIT_AUTHOR_AVATAR\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_PREV_COMMIT_AUTHOR_EMAIL"),
 		Name:    "prev-commit-author-email",
+		Usage:   "Set the metadata environment variable \"CI_PREV_COMMIT_AUTHOR_EMAIL\".",
 	},
-	&cli.IntFlag{
+	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_WORKFLOW_NAME"),
 		Name:    "workflow-name",
+		Usage:   "Set the metadata environment variable \"CI_WORKFLOW_NAME\".",
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("CI_WORKFLOW_NUMBER"),
 		Name:    "workflow-number",
-	},
-	&cli.IntFlag{
-		Sources: cli.EnvVars("CI_STEP_NAME"),
-		Name:    "step-name",
+		Usage:   "Set the metadata environment variable \"CI_WORKFLOW_NUMBER\".",
 	},
 	&cli.StringSliceFlag{
 		Sources: cli.EnvVars("CI_ENV"),
 		Name:    "env",
+		Usage:   "Set the metadata environment variable \"CI_ENV\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_FORGE_TYPE"),
 		Name:    "forge-type",
+		Usage:   "Set the metadata environment variable \"CI_FORGE_TYPE\".",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("CI_FORGE_URL"),
 		Name:    "forge-url",
+		Usage:   "Set the metadata environment variable \"CI_FORGE_URL\".",
 	},
 }
diff --git a/cli/exec/metadata.go b/cli/exec/metadata.go
index db2f9d95f..9e83bff91 100644
--- a/cli/exec/metadata.go
+++ b/cli/exec/metadata.go
@@ -121,10 +121,6 @@ func metadataFromContext(_ context.Context, c *cli.Command, axis matrix.Axis) (m
 			Number: int(c.Int("workflow-number")),
 			Matrix: axis,
 		},
-		Step: metadata.Step{
-			Name:   c.String("step-name"),
-			Number: int(c.Int("step-number")),
-		},
 		Sys: metadata.System{
 			Name:     c.String("system-name"),
 			URL:      c.String("system-url"),