diff --git a/.golangci.yml b/.golangci.yml
index df7592d27..23cf2547f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -47,6 +47,12 @@ linters-settings:
       - dot
       - prefix(github.com/go-vela)
 
+  # https://golangci-lint.run/usage/linters/#tagalign
+  # ensure struct tags are aligned
+  # will auto fix with `make lintfix`  
+  tagalign:
+    sort: false
+
   # https://github.com/denis-tingaikin/go-header
   goheader:
     template: |-
@@ -100,6 +106,7 @@ linters:
     - revive # linter for go
     - staticcheck # applies static analysis checks, go vet on steroids
     - stylecheck # replacement for golint
+    - tagalign # finds maligned struct tags
     - tenv # analyzer that detects using os.Setenv instead of t.Setenv since Go1.17
     - typecheck # parses and type-checks go code, like the front-end of a go compiler
     - unconvert # remove unnecessary type conversions
diff --git a/api/types/secret.go b/api/types/secret.go
index 1cb9eb48a..0a35572f1 100644
--- a/api/types/secret.go
+++ b/api/types/secret.go
@@ -22,7 +22,7 @@ type Secret struct {
 	Value             *string   `json:"value,omitempty"`
 	Type              *string   `json:"type,omitempty"`
 	Images            *[]string `json:"images,omitempty"`
-	AllowEvents       *Events   `json:"allow_events,omitempty" yaml:"allow_events"`
+	AllowEvents       *Events   `json:"allow_events,omitempty"       yaml:"allow_events"`
 	AllowCommand      *bool     `json:"allow_command,omitempty"`
 	AllowSubstitution *bool     `json:"allow_substitution,omitempty"`
 	CreatedAt         *int64    `json:"created_at,omitempty"`
diff --git a/api/types/settings/compiler.go b/api/types/settings/compiler.go
index 147cade94..7b6db1239 100644
--- a/api/types/settings/compiler.go
+++ b/api/types/settings/compiler.go
@@ -5,8 +5,8 @@ package settings
 import "fmt"
 
 type Compiler struct {
-	CloneImage        *string `json:"clone_image,omitempty" yaml:"clone_image,omitempty"`
-	TemplateDepth     *int    `json:"template_depth,omitempty" yaml:"template_depth,omitempty"`
+	CloneImage        *string `json:"clone_image,omitempty"         yaml:"clone_image,omitempty"`
+	TemplateDepth     *int    `json:"template_depth,omitempty"      yaml:"template_depth,omitempty"`
 	StarlarkExecLimit *uint64 `json:"starlark_exec_limit,omitempty" yaml:"starlark_exec_limit,omitempty"`
 }
 
diff --git a/api/types/settings/platform.go b/api/types/settings/platform.go
index ff7c58ef3..22429663f 100644
--- a/api/types/settings/platform.go
+++ b/api/types/settings/platform.go
@@ -13,13 +13,13 @@ import (
 // swagger:model Platform
 type Platform struct {
 	ID                *int64 `json:"id"`
-	*Compiler         `json:"compiler,omitempty" yaml:"compiler,omitempty"`
-	*Queue            `json:"queue,omitempty" yaml:"queue,omitempty"`
-	RepoAllowlist     *[]string `json:"repo_allowlist,omitempty" yaml:"repo_allowlist,omitempty"`
+	*Compiler         `json:"compiler,omitempty"           yaml:"compiler,omitempty"`
+	*Queue            `json:"queue,omitempty"              yaml:"queue,omitempty"`
+	RepoAllowlist     *[]string `json:"repo_allowlist,omitempty"     yaml:"repo_allowlist,omitempty"`
 	ScheduleAllowlist *[]string `json:"schedule_allowlist,omitempty" yaml:"schedule_allowlist,omitempty"`
-	CreatedAt         *int64    `json:"created_at,omitempty" yaml:"created_at,omitempty"`
-	UpdatedAt         *int64    `json:"updated_at,omitempty" yaml:"updated_at,omitempty"`
-	UpdatedBy         *string   `json:"updated_by,omitempty" yaml:"updated_by,omitempty"`
+	CreatedAt         *int64    `json:"created_at,omitempty"         yaml:"created_at,omitempty"`
+	UpdatedAt         *int64    `json:"updated_at,omitempty"         yaml:"updated_at,omitempty"`
+	UpdatedBy         *string   `json:"updated_by,omitempty"         yaml:"updated_by,omitempty"`
 }
 
 // FromCLIContext returns a new Platform record from a cli context.
diff --git a/compiler/types/pipeline/build.go b/compiler/types/pipeline/build.go
index aef5eaea8..195a353b5 100644
--- a/compiler/types/pipeline/build.go
+++ b/compiler/types/pipeline/build.go
@@ -15,15 +15,15 @@ import (
 //
 // swagger:model PipelineBuild
 type Build struct {
-	ID          string             `json:"id,omitempty"       yaml:"id,omitempty"`
-	Version     string             `json:"version,omitempty"  yaml:"version,omitempty"`
-	Metadata    Metadata           `json:"metadata,omitempty" yaml:"metadata,omitempty"`
+	ID          string             `json:"id,omitempty"          yaml:"id,omitempty"`
+	Version     string             `json:"version,omitempty"     yaml:"version,omitempty"`
+	Metadata    Metadata           `json:"metadata,omitempty"    yaml:"metadata,omitempty"`
 	Environment raw.StringSliceMap `json:"environment,omitempty" yaml:"environment,omitempty"`
-	Worker      Worker             `json:"worker,omitempty"   yaml:"worker,omitempty"`
-	Secrets     SecretSlice        `json:"secrets,omitempty"  yaml:"secrets,omitempty"`
-	Services    ContainerSlice     `json:"services,omitempty" yaml:"services,omitempty"`
-	Stages      StageSlice         `json:"stages,omitempty"   yaml:"stages,omitempty"`
-	Steps       ContainerSlice     `json:"steps,omitempty"    yaml:"steps,omitempty"`
+	Worker      Worker             `json:"worker,omitempty"      yaml:"worker,omitempty"`
+	Secrets     SecretSlice        `json:"secrets,omitempty"     yaml:"secrets,omitempty"`
+	Services    ContainerSlice     `json:"services,omitempty"    yaml:"services,omitempty"`
+	Stages      StageSlice         `json:"stages,omitempty"      yaml:"stages,omitempty"`
+	Steps       ContainerSlice     `json:"steps,omitempty"       yaml:"steps,omitempty"`
 }
 
 // Purge removes the steps, in every stage, that contain a ruleset
diff --git a/compiler/types/pipeline/container.go b/compiler/types/pipeline/container.go
index 246076bd3..5cfb2acf9 100644
--- a/compiler/types/pipeline/container.go
+++ b/compiler/types/pipeline/container.go
@@ -51,8 +51,8 @@ type (
 		Ulimits     UlimitSlice       `json:"ulimits,omitempty"     yaml:"ulimits,omitempty"`
 		Volumes     VolumeSlice       `json:"volumes,omitempty"     yaml:"volumes,omitempty"`
 		User        string            `json:"user,omitempty"        yaml:"user,omitempty"`
-		ReportAs    string            `json:"report_as,omitempty" yaml:"report_as,omitempty"`
-		IDRequest   string            `json:"id_request,omitempty" yaml:"id_request,omitempty"`
+		ReportAs    string            `json:"report_as,omitempty"   yaml:"report_as,omitempty"`
+		IDRequest   string            `json:"id_request,omitempty"  yaml:"id_request,omitempty"`
 	}
 )
 
diff --git a/compiler/types/pipeline/metadata.go b/compiler/types/pipeline/metadata.go
index c4f5fdf87..56c3c7f06 100644
--- a/compiler/types/pipeline/metadata.go
+++ b/compiler/types/pipeline/metadata.go
@@ -6,15 +6,15 @@ package pipeline
 //
 // swagger:model PipelineMetadata
 type Metadata struct {
-	Template    bool           `json:"template,omitempty" yaml:"template,omitempty"`
-	Clone       bool           `json:"clone,omitempty" yaml:"clone,omitempty"`
+	Template    bool           `json:"template,omitempty"    yaml:"template,omitempty"`
+	Clone       bool           `json:"clone,omitempty"       yaml:"clone,omitempty"`
 	Environment []string       `json:"environment,omitempty" yaml:"environment,omitempty"`
 	AutoCancel  *CancelOptions `json:"auto_cancel,omitempty" yaml:"auto_cancel,omitempty"`
 }
 
 // CancelOptions is the pipeline representation of the auto_cancel block for a pipeline.
 type CancelOptions struct {
-	Running       bool `yaml:"running,omitempty" json:"running,omitempty"`
-	Pending       bool `yaml:"pending,omitempty" json:"pending,omitempty"`
+	Running       bool `yaml:"running,omitempty"        json:"running,omitempty"`
+	Pending       bool `yaml:"pending,omitempty"        json:"pending,omitempty"`
 	DefaultBranch bool `yaml:"default_branch,omitempty" json:"default_branch,omitempty"`
 }
diff --git a/compiler/types/pipeline/ruleset.go b/compiler/types/pipeline/ruleset.go
index 6ac19763c..51127abb5 100644
--- a/compiler/types/pipeline/ruleset.go
+++ b/compiler/types/pipeline/ruleset.go
@@ -29,19 +29,19 @@ type (
 	//
 	// swagger:model PipelineRules
 	Rules struct {
-		Branch      Ruletype `json:"branch,omitempty"   yaml:"branch,omitempty"`
-		Comment     Ruletype `json:"comment,omitempty"  yaml:"comment,omitempty"`
-		Event       Ruletype `json:"event,omitempty"    yaml:"event,omitempty"`
-		Path        Ruletype `json:"path,omitempty"     yaml:"path,omitempty"`
-		Repo        Ruletype `json:"repo,omitempty"     yaml:"repo,omitempty"`
-		Sender      Ruletype `json:"sender,omitempty"   yaml:"sender,omitempty"`
-		Status      Ruletype `json:"status,omitempty"   yaml:"status,omitempty"`
+		Branch      Ruletype `json:"branch,omitempty"       yaml:"branch,omitempty"`
+		Comment     Ruletype `json:"comment,omitempty"      yaml:"comment,omitempty"`
+		Event       Ruletype `json:"event,omitempty"        yaml:"event,omitempty"`
+		Path        Ruletype `json:"path,omitempty"         yaml:"path,omitempty"`
+		Repo        Ruletype `json:"repo,omitempty"         yaml:"repo,omitempty"`
+		Sender      Ruletype `json:"sender,omitempty"       yaml:"sender,omitempty"`
+		Status      Ruletype `json:"status,omitempty"       yaml:"status,omitempty"`
 		StageStatus Ruletype `json:"stage_status,omitempty" yaml:"stage_status,omitempty"`
-		Tag         Ruletype `json:"tag,omitempty"      yaml:"tag,omitempty"`
-		Target      Ruletype `json:"target,omitempty"   yaml:"target,omitempty"`
-		Label       Ruletype `json:"label,omitempty"    yaml:"label,omitempty"`
-		Instance    Ruletype `json:"instance,omitempty" yaml:"instance,omitempty"`
-		Parallel    bool     `json:"-"                  yaml:"-"`
+		Tag         Ruletype `json:"tag,omitempty"          yaml:"tag,omitempty"`
+		Target      Ruletype `json:"target,omitempty"       yaml:"target,omitempty"`
+		Label       Ruletype `json:"label,omitempty"        yaml:"label,omitempty"`
+		Instance    Ruletype `json:"instance,omitempty"     yaml:"instance,omitempty"`
+		Parallel    bool     `json:"-"                      yaml:"-"`
 	}
 
 	// Ruletype is the pipeline representation of an element
@@ -53,19 +53,19 @@ type (
 	// RuleData is the data to check our ruleset
 	// against for a step in a pipeline.
 	RuleData struct {
-		Branch      string   `json:"branch,omitempty"   yaml:"branch,omitempty"`
-		Comment     string   `json:"comment,omitempty"  yaml:"comment,omitempty"`
-		Event       string   `json:"event,omitempty"    yaml:"event,omitempty"`
-		Path        []string `json:"path,omitempty"     yaml:"path,omitempty"`
-		Repo        string   `json:"repo,omitempty"     yaml:"repo,omitempty"`
-		Sender      string   `json:"sender,omitempty"   yaml:"sender,omitempty"`
-		Status      string   `json:"status,omitempty"   yaml:"status,omitempty"`
+		Branch      string   `json:"branch,omitempty"       yaml:"branch,omitempty"`
+		Comment     string   `json:"comment,omitempty"      yaml:"comment,omitempty"`
+		Event       string   `json:"event,omitempty"        yaml:"event,omitempty"`
+		Path        []string `json:"path,omitempty"         yaml:"path,omitempty"`
+		Repo        string   `json:"repo,omitempty"         yaml:"repo,omitempty"`
+		Sender      string   `json:"sender,omitempty"       yaml:"sender,omitempty"`
+		Status      string   `json:"status,omitempty"       yaml:"status,omitempty"`
 		StageStatus string   `json:"stage_status,omitempty" yaml:"stage_status,omitempty"`
-		Tag         string   `json:"tag,omitempty"      yaml:"tag,omitempty"`
-		Target      string   `json:"target,omitempty"   yaml:"target,omitempty"`
-		Label       []string `json:"label,omitempty"    yaml:"label,omitempty"`
-		Instance    string   `json:"instance,omitempty" yaml:"instance,omitempty"`
-		Parallel    bool     `json:"-"                  yaml:"-"`
+		Tag         string   `json:"tag,omitempty"          yaml:"tag,omitempty"`
+		Target      string   `json:"target,omitempty"       yaml:"target,omitempty"`
+		Label       []string `json:"label,omitempty"        yaml:"label,omitempty"`
+		Instance    string   `json:"instance,omitempty"     yaml:"instance,omitempty"`
+		Parallel    bool     `json:"-"                      yaml:"-"`
 	}
 )
 
diff --git a/compiler/types/yaml/build.go b/compiler/types/yaml/build.go
index b2d918945..2a9f2b750 100644
--- a/compiler/types/yaml/build.go
+++ b/compiler/types/yaml/build.go
@@ -9,15 +9,15 @@ import (
 
 // Build is the yaml representation of a build for a pipeline.
 type Build struct {
-	Version     string             `yaml:"version,omitempty"   json:"version,omitempty"  jsonschema:"required,minLength=1,description=Provide syntax version used to evaluate the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/version/"`
-	Metadata    Metadata           `yaml:"metadata,omitempty"  json:"metadata,omitempty" jsonschema:"description=Pass extra information.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/"`
+	Version     string             `yaml:"version,omitempty"     json:"version,omitempty"     jsonschema:"required,minLength=1,description=Provide syntax version used to evaluate the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/version/"`
+	Metadata    Metadata           `yaml:"metadata,omitempty"    json:"metadata,omitempty"    jsonschema:"description=Pass extra information.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/"`
 	Environment raw.StringSliceMap `yaml:"environment,omitempty" json:"environment,omitempty" jsonschema:"description=Provide global environment variables injected into the container environment.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-environment-key"`
-	Worker      Worker             `yaml:"worker,omitempty"    json:"worker,omitempty" jsonschema:"description=Limit the pipeline to certain types of workers.\nReference: https://go-vela.github.io/docs/reference/yaml/worker/"`
-	Secrets     SecretSlice        `yaml:"secrets,omitempty"   json:"secrets,omitempty" jsonschema:"description=Provide sensitive information.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/"`
-	Services    ServiceSlice       `yaml:"services,omitempty"  json:"services,omitempty" jsonschema:"description=Provide detached (headless) execution instructions.\nReference: https://go-vela.github.io/docs/reference/yaml/services/"`
-	Stages      StageSlice         `yaml:"stages,omitempty"    json:"stages,omitempty" jsonschema:"oneof_required=stages,description=Provide parallel execution instructions.\nReference: https://go-vela.github.io/docs/reference/yaml/stages/"`
-	Steps       StepSlice          `yaml:"steps,omitempty"     json:"steps,omitempty" jsonschema:"oneof_required=steps,description=Provide sequential execution instructions.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/"`
-	Templates   TemplateSlice      `yaml:"templates,omitempty" json:"templates,omitempty" jsonschema:"description=Provide the name of templates to expand.\nReference: https://go-vela.github.io/docs/reference/yaml/templates/"`
+	Worker      Worker             `yaml:"worker,omitempty"      json:"worker,omitempty"      jsonschema:"description=Limit the pipeline to certain types of workers.\nReference: https://go-vela.github.io/docs/reference/yaml/worker/"`
+	Secrets     SecretSlice        `yaml:"secrets,omitempty"     json:"secrets,omitempty"     jsonschema:"description=Provide sensitive information.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/"`
+	Services    ServiceSlice       `yaml:"services,omitempty"    json:"services,omitempty"    jsonschema:"description=Provide detached (headless) execution instructions.\nReference: https://go-vela.github.io/docs/reference/yaml/services/"`
+	Stages      StageSlice         `yaml:"stages,omitempty"      json:"stages,omitempty"      jsonschema:"oneof_required=stages,description=Provide parallel execution instructions.\nReference: https://go-vela.github.io/docs/reference/yaml/stages/"`
+	Steps       StepSlice          `yaml:"steps,omitempty"       json:"steps,omitempty"       jsonschema:"oneof_required=steps,description=Provide sequential execution instructions.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/"`
+	Templates   TemplateSlice      `yaml:"templates,omitempty"   json:"templates,omitempty"   jsonschema:"description=Provide the name of templates to expand.\nReference: https://go-vela.github.io/docs/reference/yaml/templates/"`
 }
 
 // ToPipelineAPI converts the Build type to an API Pipeline type.
diff --git a/compiler/types/yaml/metadata.go b/compiler/types/yaml/metadata.go
index 83dfe5c31..89d21c369 100644
--- a/compiler/types/yaml/metadata.go
+++ b/compiler/types/yaml/metadata.go
@@ -10,18 +10,18 @@ type (
 	// Metadata is the yaml representation of
 	// the metadata block for a pipeline.
 	Metadata struct {
-		Template     bool           `yaml:"template,omitempty" json:"template,omitempty" jsonschema:"description=Enables compiling the pipeline as a template.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-template-key"`
+		Template     bool           `yaml:"template,omitempty"      json:"template,omitempty"      jsonschema:"description=Enables compiling the pipeline as a template.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-template-key"`
 		RenderInline bool           `yaml:"render_inline,omitempty" json:"render_inline,omitempty" jsonschema:"description=Enables inline compiling for the pipeline templates.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-render-inline-key"`
-		Clone        *bool          `yaml:"clone,omitempty" json:"clone,omitempty" jsonschema:"default=true,description=Enables injecting the default clone process.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-clone-key"`
-		Environment  []string       `yaml:"environment,omitempty" json:"environment,omitempty" jsonschema:"description=Controls which containers processes can have global env injected.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-environment-key"`
-		AutoCancel   *CancelOptions `yaml:"auto_cancel,omitempty" json:"auto_cancel,omitempty" jsonschema:"description=Enables auto canceling of queued or running pipelines that become stale due to new push.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-auto-cancel-key"`
+		Clone        *bool          `yaml:"clone,omitempty"         json:"clone,omitempty"         jsonschema:"default=true,description=Enables injecting the default clone process.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-clone-key"`
+		Environment  []string       `yaml:"environment,omitempty"   json:"environment,omitempty"   jsonschema:"description=Controls which containers processes can have global env injected.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-environment-key"`
+		AutoCancel   *CancelOptions `yaml:"auto_cancel,omitempty"   json:"auto_cancel,omitempty"   jsonschema:"description=Enables auto canceling of queued or running pipelines that become stale due to new push.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-auto-cancel-key"`
 	}
 
 	// CancelOptions is the yaml representation of
 	// the auto_cancel block for a pipeline.
 	CancelOptions struct {
-		Running       *bool `yaml:"running,omitempty" json:"running,omitempty" jsonschema:"description=Enables auto canceling of running pipelines that become stale due to new push.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-auto-cancel-key"`
-		Pending       *bool `yaml:"pending,omitempty" json:"pending,omitempty" jsonschema:"description=Enables auto canceling of queued pipelines that become stale due to new push.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-auto-cancel-key"`
+		Running       *bool `yaml:"running,omitempty"        json:"running,omitempty"        jsonschema:"description=Enables auto canceling of running pipelines that become stale due to new push.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-auto-cancel-key"`
+		Pending       *bool `yaml:"pending,omitempty"        json:"pending,omitempty"        jsonschema:"description=Enables auto canceling of queued pipelines that become stale due to new push.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-auto-cancel-key"`
 		DefaultBranch *bool `yaml:"default_branch,omitempty" json:"default_branch,omitempty" jsonschema:"description=Enables auto canceling of queued or running pipelines that become stale due to new push to default branch.\nReference: https://go-vela.github.io/docs/reference/yaml/metadata/#the-auto-cancel-key"`
 	}
 )
diff --git a/compiler/types/yaml/ruleset.go b/compiler/types/yaml/ruleset.go
index 30e98e0f1..dcdb99d80 100644
--- a/compiler/types/yaml/ruleset.go
+++ b/compiler/types/yaml/ruleset.go
@@ -12,9 +12,9 @@ type (
 	// Ruleset is the yaml representation of a
 	// ruleset block for a step in a pipeline.
 	Ruleset struct {
-		If       Rules  `yaml:"if,omitempty"       json:"if,omitempty" jsonschema:"description=Limit execution to when all rules match.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Unless   Rules  `yaml:"unless,omitempty"   json:"unless,omitempty" jsonschema:"description=Limit execution to when all rules do not match.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Matcher  string `yaml:"matcher,omitempty"  json:"matcher,omitempty" jsonschema:"enum=filepath,enum=regexp,default=filepath,description=Use the defined matching method.\nReference: coming soon"`
+		If       Rules  `yaml:"if,omitempty"       json:"if,omitempty"       jsonschema:"description=Limit execution to when all rules match.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Unless   Rules  `yaml:"unless,omitempty"   json:"unless,omitempty"   jsonschema:"description=Limit execution to when all rules do not match.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Matcher  string `yaml:"matcher,omitempty"  json:"matcher,omitempty"  jsonschema:"enum=filepath,enum=regexp,default=filepath,description=Use the defined matching method.\nReference: coming soon"`
 		Operator string `yaml:"operator,omitempty" json:"operator,omitempty" jsonschema:"enum=or,enum=and,default=and,description=Whether all rule conditions must be met or just any one of them.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
 		Continue bool   `yaml:"continue,omitempty" json:"continue,omitempty" jsonschema:"default=false,description=Limits the execution of a step to continuing on any failure.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
 	}
@@ -22,18 +22,18 @@ type (
 	// Rules is the yaml representation of the ruletypes
 	// from a ruleset block for a step in a pipeline.
 	Rules struct {
-		Branch      []string `yaml:"branch,omitempty,flow"   json:"branch,omitempty" jsonschema:"description=Limits the execution of a step to matching build branches.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Comment     []string `yaml:"comment,omitempty,flow"  json:"comment,omitempty" jsonschema:"description=Limits the execution of a step to matching a pull request comment.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Event       []string `yaml:"event,omitempty,flow"    json:"event,omitempty" jsonschema:"description=Limits the execution of a step to matching build events.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Path        []string `yaml:"path,omitempty,flow"     json:"path,omitempty" jsonschema:"description=Limits the execution of a step to matching files changed in a repository.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Repo        []string `yaml:"repo,omitempty,flow"     json:"repo,omitempty" jsonschema:"description=Limits the execution of a step to matching repos.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Sender      []string `yaml:"sender,omitempty,flow"   json:"sender,omitempty" jsonschema:"description=Limits the execution of a step to matching build senders.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Status      []string `yaml:"status,omitempty,flow"   json:"status,omitempty" jsonschema:"enum=[failure],enum=[success],description=Limits the execution of a step to matching build statuses.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Branch      []string `yaml:"branch,omitempty,flow"       json:"branch,omitempty"       jsonschema:"description=Limits the execution of a step to matching build branches.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Comment     []string `yaml:"comment,omitempty,flow"      json:"comment,omitempty"      jsonschema:"description=Limits the execution of a step to matching a pull request comment.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Event       []string `yaml:"event,omitempty,flow"        json:"event,omitempty"        jsonschema:"description=Limits the execution of a step to matching build events.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Path        []string `yaml:"path,omitempty,flow"         json:"path,omitempty"         jsonschema:"description=Limits the execution of a step to matching files changed in a repository.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Repo        []string `yaml:"repo,omitempty,flow"         json:"repo,omitempty"         jsonschema:"description=Limits the execution of a step to matching repos.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Sender      []string `yaml:"sender,omitempty,flow"       json:"sender,omitempty"       jsonschema:"description=Limits the execution of a step to matching build senders.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Status      []string `yaml:"status,omitempty,flow"       json:"status,omitempty"       jsonschema:"enum=[failure],enum=[success],description=Limits the execution of a step to matching build statuses.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
 		StageStatus []string `yaml:"stage_status,omitempty,flow" json:"stage_status,omitempty" jsonschema:"description=Limits the execution of a step to matching stage statuses.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Tag         []string `yaml:"tag,omitempty,flow"      json:"tag,omitempty" jsonschema:"description=Limits the execution of a step to matching build tag references.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Target      []string `yaml:"target,omitempty,flow"   json:"target,omitempty" jsonschema:"description=Limits the execution of a step to matching build deployment targets.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Label       []string `yaml:"label,omitempty,flow"    json:"label,omitempty" jsonschema:"description=Limits step execution to match on pull requests labels.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Instance    []string `yaml:"instance,omitempty,flow" json:"instance,omitempty" jsonschema:"description=Limits step execution to match on certain instances.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Tag         []string `yaml:"tag,omitempty,flow"          json:"tag,omitempty"          jsonschema:"description=Limits the execution of a step to matching build tag references.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Target      []string `yaml:"target,omitempty,flow"       json:"target,omitempty"       jsonschema:"description=Limits the execution of a step to matching build deployment targets.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Label       []string `yaml:"label,omitempty,flow"        json:"label,omitempty"        jsonschema:"description=Limits step execution to match on pull requests labels.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Instance    []string `yaml:"instance,omitempty,flow"     json:"instance,omitempty"     jsonschema:"description=Limits step execution to match on certain instances.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
 	}
 )
 
diff --git a/compiler/types/yaml/secret.go b/compiler/types/yaml/secret.go
index a99f452e8..d0779e5c6 100644
--- a/compiler/types/yaml/secret.go
+++ b/compiler/types/yaml/secret.go
@@ -20,24 +20,24 @@ type (
 	// Secret is the yaml representation of a secret
 	// from the secrets block for a pipeline.
 	Secret struct {
-		Name   string `yaml:"name,omitempty"   json:"name,omitempty" jsonschema:"required,minLength=1,description=Name of secret to reference in the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-name-key"`
-		Key    string `yaml:"key,omitempty"    json:"key,omitempty" jsonschema:"minLength=1,description=Path to secret to fetch from storage backend.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-key-key"`
+		Name   string `yaml:"name,omitempty"   json:"name,omitempty"   jsonschema:"required,minLength=1,description=Name of secret to reference in the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-name-key"`
+		Key    string `yaml:"key,omitempty"    json:"key,omitempty"    jsonschema:"minLength=1,description=Path to secret to fetch from storage backend.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-key-key"`
 		Engine string `yaml:"engine,omitempty" json:"engine,omitempty" jsonschema:"enum=native,enum=vault,default=native,description=Name of storage backend to fetch secret from.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-engine-key"`
-		Type   string `yaml:"type,omitempty"   json:"type,omitempty" jsonschema:"enum=repo,enum=org,enum=shared,default=repo,description=Type of secret to fetch from storage backend.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-type-key"`
+		Type   string `yaml:"type,omitempty"   json:"type,omitempty"   jsonschema:"enum=repo,enum=org,enum=shared,default=repo,description=Type of secret to fetch from storage backend.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-type-key"`
 		Origin Origin `yaml:"origin,omitempty" json:"origin,omitempty" jsonschema:"description=Declaration to pull secrets from non-internal secret providers.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-origin-key"`
-		Pull   string `yaml:"pull,omitempty"   json:"pull,omitempty" jsonschema:"enum=step_start,enum=build_start,default=build_start,description=When to pull in secrets from storage backend.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-pull-key"`
+		Pull   string `yaml:"pull,omitempty"   json:"pull,omitempty"   jsonschema:"enum=step_start,enum=build_start,default=build_start,description=When to pull in secrets from storage backend.\nReference: https://go-vela.github.io/docs/reference/yaml/secrets/#the-pull-key"`
 	}
 
 	// Origin is the yaml representation of a method
 	// for looking up secrets with a secret plugin.
 	Origin struct {
 		Environment raw.StringSliceMap     `yaml:"environment,omitempty" json:"environment,omitempty" jsonschema:"description=Variables to inject into the container environment.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-environment-key"`
-		Image       string                 `yaml:"image,omitempty"       json:"image,omitempty" jsonschema:"required,minLength=1,description=Docker image to use to create the ephemeral container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-image-key"`
-		Name        string                 `yaml:"name,omitempty"        json:"name,omitempty" jsonschema:"required,minLength=1,description=Unique name for the secret origin.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-name-key"`
-		Parameters  map[string]interface{} `yaml:"parameters,omitempty"  json:"parameters,omitempty" jsonschema:"description=Extra configuration variables for the secret plugin.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-parameters-key"`
-		Secrets     StepSecretSlice        `yaml:"secrets,omitempty"     json:"secrets,omitempty" jsonschema:"description=Secrets to inject that are necessary to retrieve the secrets.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-secrets-key"`
-		Pull        string                 `yaml:"pull,omitempty"        json:"pull,omitempty" jsonschema:"enum=always,enum=not_present,enum=on_start,enum=never,default=not_present,description=Declaration to configure if and when the Docker image is pulled.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-pull-key"`
-		Ruleset     Ruleset                `yaml:"ruleset,omitempty"     json:"ruleset,omitempty" jsonschema:"description=Conditions to limit the execution of the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Image       string                 `yaml:"image,omitempty"       json:"image,omitempty"       jsonschema:"required,minLength=1,description=Docker image to use to create the ephemeral container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-image-key"`
+		Name        string                 `yaml:"name,omitempty"        json:"name,omitempty"        jsonschema:"required,minLength=1,description=Unique name for the secret origin.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-name-key"`
+		Parameters  map[string]interface{} `yaml:"parameters,omitempty"  json:"parameters,omitempty"  jsonschema:"description=Extra configuration variables for the secret plugin.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-parameters-key"`
+		Secrets     StepSecretSlice        `yaml:"secrets,omitempty"     json:"secrets,omitempty"     jsonschema:"description=Secrets to inject that are necessary to retrieve the secrets.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-secrets-key"`
+		Pull        string                 `yaml:"pull,omitempty"        json:"pull,omitempty"        jsonschema:"enum=always,enum=not_present,enum=on_start,enum=never,default=not_present,description=Declaration to configure if and when the Docker image is pulled.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-pull-key"`
+		Ruleset     Ruleset                `yaml:"ruleset,omitempty"     json:"ruleset,omitempty"     jsonschema:"description=Conditions to limit the execution of the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
 	}
 )
 
diff --git a/compiler/types/yaml/service.go b/compiler/types/yaml/service.go
index f5d5103cc..3d08e8cba 100644
--- a/compiler/types/yaml/service.go
+++ b/compiler/types/yaml/service.go
@@ -19,14 +19,14 @@ type (
 	// Service is the yaml representation
 	// of a Service in a pipeline.
 	Service struct {
-		Image       string             `yaml:"image,omitempty"       json:"image,omitempty" jsonschema:"required,minLength=1,description=Docker image used to create ephemeral container.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-image-key"`
-		Name        string             `yaml:"name,omitempty"        json:"name,omitempty" jsonschema:"required,minLength=1,description=Unique identifier for the container in the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-name-key"`
-		Entrypoint  raw.StringSlice    `yaml:"entrypoint,omitempty"  json:"entrypoint,omitempty" jsonschema:"description=Commands to execute inside the container.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-entrypoint-key"`
+		Image       string             `yaml:"image,omitempty"       json:"image,omitempty"       jsonschema:"required,minLength=1,description=Docker image used to create ephemeral container.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-image-key"`
+		Name        string             `yaml:"name,omitempty"        json:"name,omitempty"        jsonschema:"required,minLength=1,description=Unique identifier for the container in the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-name-key"`
+		Entrypoint  raw.StringSlice    `yaml:"entrypoint,omitempty"  json:"entrypoint,omitempty"  jsonschema:"description=Commands to execute inside the container.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-entrypoint-key"`
 		Environment raw.StringSliceMap `yaml:"environment,omitempty" json:"environment,omitempty" jsonschema:"description=Variables to inject into the container environment.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-environment-key"`
-		Ports       raw.StringSlice    `yaml:"ports,omitempty"       json:"ports,omitempty" jsonschema:"description=List of ports to map for the container in the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-ports-key"`
-		Pull        string             `yaml:"pull,omitempty"        json:"pull,omitempty" jsonschema:"enum=always,enum=not_present,enum=on_start,enum=never,default=not_present,description=Declaration to configure if and when the Docker image is pulled.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-pul-key"`
-		Ulimits     UlimitSlice        `yaml:"ulimits,omitempty"     json:"ulimits,omitempty" jsonschema:"description=Set the user limits for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-ulimits-key"`
-		User        string             `yaml:"user,omitempty"        json:"user,omitempty" jsonschema:"description=Set the user for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-user-key"`
+		Ports       raw.StringSlice    `yaml:"ports,omitempty"       json:"ports,omitempty"       jsonschema:"description=List of ports to map for the container in the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-ports-key"`
+		Pull        string             `yaml:"pull,omitempty"        json:"pull,omitempty"        jsonschema:"enum=always,enum=not_present,enum=on_start,enum=never,default=not_present,description=Declaration to configure if and when the Docker image is pulled.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-pul-key"`
+		Ulimits     UlimitSlice        `yaml:"ulimits,omitempty"     json:"ulimits,omitempty"     jsonschema:"description=Set the user limits for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/services/#the-ulimits-key"`
+		User        string             `yaml:"user,omitempty"        json:"user,omitempty"        jsonschema:"description=Set the user for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-user-key"`
 	}
 )
 
diff --git a/compiler/types/yaml/step.go b/compiler/types/yaml/step.go
index 0b579f614..ea583fe95 100644
--- a/compiler/types/yaml/step.go
+++ b/compiler/types/yaml/step.go
@@ -19,23 +19,23 @@ type (
 	// Step is the yaml representation of a step
 	// from the steps block for a pipeline.
 	Step struct {
-		Ruleset     Ruleset                `yaml:"ruleset,omitempty"     json:"ruleset,omitempty" jsonschema:"description=Conditions to limit the execution of the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
-		Commands    raw.StringSlice        `yaml:"commands,omitempty"    json:"commands,omitempty" jsonschema:"description=Execution instructions to run inside the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-commands-key"`
-		Entrypoint  raw.StringSlice        `yaml:"entrypoint,omitempty"  json:"entrypoint,omitempty" jsonschema:"description=Command to execute inside the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-entrypoint-key"`
-		Secrets     StepSecretSlice        `yaml:"secrets,omitempty"     json:"secrets,omitempty" jsonschema:"description=Sensitive variables injected into the container environment.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-secrets-key"`
-		Template    StepTemplate           `yaml:"template,omitempty"    json:"template,omitempty" jsonschema:"oneof_required=template,description=Name of template to expand in the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-template-key"`
-		Ulimits     UlimitSlice            `yaml:"ulimits,omitempty"     json:"ulimits,omitempty" jsonschema:"description=Set the user limits for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ulimits-key"`
-		Volumes     VolumeSlice            `yaml:"volumes,omitempty"     json:"volumes,omitempty" jsonschema:"description=Mount volumes for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-volume-key"`
-		Image       string                 `yaml:"image,omitempty"       json:"image,omitempty" jsonschema:"oneof_required=image,minLength=1,description=Docker image to use to create the ephemeral container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-image-key"`
-		Name        string                 `yaml:"name,omitempty"        json:"name,omitempty" jsonschema:"required,minLength=1,description=Unique name for the step.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-name-key"`
-		Pull        string                 `yaml:"pull,omitempty"        json:"pull,omitempty" jsonschema:"enum=always,enum=not_present,enum=on_start,enum=never,default=not_present,description=Declaration to configure if and when the Docker image is pulled.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-pull-key"`
+		Ruleset     Ruleset                `yaml:"ruleset,omitempty"     json:"ruleset,omitempty"     jsonschema:"description=Conditions to limit the execution of the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ruleset-key"`
+		Commands    raw.StringSlice        `yaml:"commands,omitempty"    json:"commands,omitempty"    jsonschema:"description=Execution instructions to run inside the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-commands-key"`
+		Entrypoint  raw.StringSlice        `yaml:"entrypoint,omitempty"  json:"entrypoint,omitempty"  jsonschema:"description=Command to execute inside the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-entrypoint-key"`
+		Secrets     StepSecretSlice        `yaml:"secrets,omitempty"     json:"secrets,omitempty"     jsonschema:"description=Sensitive variables injected into the container environment.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-secrets-key"`
+		Template    StepTemplate           `yaml:"template,omitempty"    json:"template,omitempty"    jsonschema:"oneof_required=template,description=Name of template to expand in the pipeline.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-template-key"`
+		Ulimits     UlimitSlice            `yaml:"ulimits,omitempty"     json:"ulimits,omitempty"     jsonschema:"description=Set the user limits for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-ulimits-key"`
+		Volumes     VolumeSlice            `yaml:"volumes,omitempty"     json:"volumes,omitempty"     jsonschema:"description=Mount volumes for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-volume-key"`
+		Image       string                 `yaml:"image,omitempty"       json:"image,omitempty"       jsonschema:"oneof_required=image,minLength=1,description=Docker image to use to create the ephemeral container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-image-key"`
+		Name        string                 `yaml:"name,omitempty"        json:"name,omitempty"        jsonschema:"required,minLength=1,description=Unique name for the step.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-name-key"`
+		Pull        string                 `yaml:"pull,omitempty"        json:"pull,omitempty"        jsonschema:"enum=always,enum=not_present,enum=on_start,enum=never,default=not_present,description=Declaration to configure if and when the Docker image is pulled.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-pull-key"`
 		Environment raw.StringSliceMap     `yaml:"environment,omitempty" json:"environment,omitempty" jsonschema:"description=Provide environment variables injected into the container environment.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-environment-key"`
-		Parameters  map[string]interface{} `yaml:"parameters,omitempty"  json:"parameters,omitempty" jsonschema:"description=Extra configuration variables for a plugin.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-parameters-key"`
-		Detach      bool                   `yaml:"detach,omitempty"      json:"detach,omitempty" jsonschema:"description=Run the container in a detached (headless) state.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-detach-key"`
-		Privileged  bool                   `yaml:"privileged,omitempty"  json:"privileged,omitempty" jsonschema:"description=Run the container with extra privileges.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-privileged-key"`
-		User        string                 `yaml:"user,omitempty"        json:"user,omitempty" jsonschema:"description=Set the user for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-user-key"`
-		ReportAs    string                 `yaml:"report_as,omitempty" json:"report_as,omitempty" jsonschema:"description=Set the name of the step to report as.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-report_as-key"`
-		IDRequest   string                 `yaml:"id_request,omitempty" json:"id_request,omitempty" jsonschema:"description=Request ID Request Token for the step.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-id_request-key"`
+		Parameters  map[string]interface{} `yaml:"parameters,omitempty"  json:"parameters,omitempty"  jsonschema:"description=Extra configuration variables for a plugin.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-parameters-key"`
+		Detach      bool                   `yaml:"detach,omitempty"      json:"detach,omitempty"      jsonschema:"description=Run the container in a detached (headless) state.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-detach-key"`
+		Privileged  bool                   `yaml:"privileged,omitempty"  json:"privileged,omitempty"  jsonschema:"description=Run the container with extra privileges.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-privileged-key"`
+		User        string                 `yaml:"user,omitempty"        json:"user,omitempty"        jsonschema:"description=Set the user for the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-user-key"`
+		ReportAs    string                 `yaml:"report_as,omitempty"   json:"report_as,omitempty"   jsonschema:"description=Set the name of the step to report as.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-report_as-key"`
+		IDRequest   string                 `yaml:"id_request,omitempty"  json:"id_request,omitempty"  jsonschema:"description=Request ID Request Token for the step.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-id_request-key"`
 	}
 )
 
diff --git a/compiler/types/yaml/template.go b/compiler/types/yaml/template.go
index 99da1964f..ef2005540 100644
--- a/compiler/types/yaml/template.go
+++ b/compiler/types/yaml/template.go
@@ -14,11 +14,11 @@ type (
 	// Template is the yaml representation of a template
 	// from the templates block for a pipeline.
 	Template struct {
-		Name      string                 `yaml:"name,omitempty"   json:"name,omitempty"  jsonschema:"required,minLength=1,description=Unique identifier for the template.\nReference: https://go-vela.github.io/docs/reference/yaml/templates/#the-name-key"`
+		Name      string                 `yaml:"name,omitempty"   json:"name,omitempty"   jsonschema:"required,minLength=1,description=Unique identifier for the template.\nReference: https://go-vela.github.io/docs/reference/yaml/templates/#the-name-key"`
 		Source    string                 `yaml:"source,omitempty" json:"source,omitempty" jsonschema:"required,minLength=1,description=Path to template in remote system.\nReference: https://go-vela.github.io/docs/reference/yaml/templates/#the-source-key"`
 		Format    string                 `yaml:"format,omitempty" json:"format,omitempty" jsonschema:"enum=starlark,enum=golang,enum=go,default=go,minLength=1,description=language used within the template file \nReference: https://go-vela.github.io/docs/reference/yaml/templates/#the-format-key"`
-		Type      string                 `yaml:"type,omitempty"   json:"type,omitempty" jsonschema:"minLength=1,example=github,description=Type of template provided from the remote system.\nReference: https://go-vela.github.io/docs/reference/yaml/templates/#the-type-key"`
-		Variables map[string]interface{} `yaml:"vars,omitempty"   json:"vars,omitempty" jsonschema:"description=Variables injected into the template.\nReference: https://go-vela.github.io/docs/reference/yaml/templates/#the-variables-key"`
+		Type      string                 `yaml:"type,omitempty"   json:"type,omitempty"   jsonschema:"minLength=1,example=github,description=Type of template provided from the remote system.\nReference: https://go-vela.github.io/docs/reference/yaml/templates/#the-type-key"`
+		Variables map[string]interface{} `yaml:"vars,omitempty"   json:"vars,omitempty"   jsonschema:"description=Variables injected into the template.\nReference: https://go-vela.github.io/docs/reference/yaml/templates/#the-variables-key"`
 	}
 
 	// StepTemplate is the yaml representation of the
diff --git a/compiler/types/yaml/volume.go b/compiler/types/yaml/volume.go
index cc6cd991e..7b7b87d32 100644
--- a/compiler/types/yaml/volume.go
+++ b/compiler/types/yaml/volume.go
@@ -18,7 +18,7 @@ type (
 	// Volume is the yaml representation of a volume
 	// from a volumes block for a step in a pipeline.
 	Volume struct {
-		Source      string `yaml:"source,omitempty"      json:"source,omitempty" jsonschema:"required,minLength=1,description=Set the source directory to be mounted.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-volume-key"`
+		Source      string `yaml:"source,omitempty"      json:"source,omitempty"      jsonschema:"required,minLength=1,description=Set the source directory to be mounted.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-volume-key"`
 		Destination string `yaml:"destination,omitempty" json:"destination,omitempty" jsonschema:"required,minLength=1,description=Set the destination directory for the mount in the container.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-volume-key"`
 		AccessMode  string `yaml:"access_mode,omitempty" json:"access_mode,omitempty" jsonschema:"default=ro,description=Set the access mode for the mounted volume.\nReference: https://go-vela.github.io/docs/reference/yaml/steps/#the-volume-key"`
 	}
diff --git a/compiler/types/yaml/worker.go b/compiler/types/yaml/worker.go
index 85c2a91cd..86710f68c 100644
--- a/compiler/types/yaml/worker.go
+++ b/compiler/types/yaml/worker.go
@@ -7,7 +7,7 @@ import "github.com/go-vela/server/compiler/types/pipeline"
 // Worker is the yaml representation of a worker
 // from a worker block in a pipeline.
 type Worker struct {
-	Flavor   string `yaml:"flavor,omitempty"   json:"flavor,omitempty" jsonschema:"minLength=1,description=Flavor identifier for worker.\nReference: https://go-vela.github.io/docs/reference/yaml/worker/#the-flavor-key,example=large"`
+	Flavor   string `yaml:"flavor,omitempty"   json:"flavor,omitempty"   jsonschema:"minLength=1,description=Flavor identifier for worker.\nReference: https://go-vela.github.io/docs/reference/yaml/worker/#the-flavor-key,example=large"`
 	Platform string `yaml:"platform,omitempty" json:"platform,omitempty" jsonschema:"minLength=1,description=Platform identifier for the worker.\nReference: https://go-vela.github.io/docs/reference/yaml/worker/#the-platform-key,example=kubernetes"`
 }
 
diff --git a/database/types/deployment.go b/database/types/deployment.go
index 965c8dbc6..f7c5f85cf 100644
--- a/database/types/deployment.go
+++ b/database/types/deployment.go
@@ -39,7 +39,7 @@ type Deployment struct {
 	Payload     raw.StringSliceMap `sql:"payload"`
 	CreatedAt   sql.NullInt64      `sql:"created_at"`
 	CreatedBy   sql.NullString     `sql:"created_by"`
-	Builds      pq.StringArray     `sql:"builds" gorm:"type:varchar(50)"`
+	Builds      pq.StringArray     `sql:"builds"      gorm:"type:varchar(50)"`
 
 	Repo Repo `gorm:"foreignKey:RepoID"`
 }
diff --git a/database/types/repo.go b/database/types/repo.go
index e406c0c5c..d769f0c52 100644
--- a/database/types/repo.go
+++ b/database/types/repo.go
@@ -55,7 +55,7 @@ type Repo struct {
 	Link         sql.NullString `sql:"link"`
 	Clone        sql.NullString `sql:"clone"`
 	Branch       sql.NullString `sql:"branch"`
-	Topics       pq.StringArray `sql:"topics" gorm:"type:varchar(1020)"`
+	Topics       pq.StringArray `sql:"topics"        gorm:"type:varchar(1020)"`
 	BuildLimit   sql.NullInt64  `sql:"build_limit"`
 	Timeout      sql.NullInt64  `sql:"timeout"`
 	Counter      sql.NullInt32  `sql:"counter"`
diff --git a/database/types/secret.go b/database/types/secret.go
index 1d4dc130e..c7b8df66d 100644
--- a/database/types/secret.go
+++ b/database/types/secret.go
@@ -50,7 +50,7 @@ type Secret struct {
 	Name              sql.NullString `sql:"name"`
 	Value             sql.NullString `sql:"value"`
 	Type              sql.NullString `sql:"type"`
-	Images            pq.StringArray `sql:"images" gorm:"type:varchar(1000)"`
+	Images            pq.StringArray `sql:"images"             gorm:"type:varchar(1000)"`
 	AllowEvents       sql.NullInt64  `sql:"allow_events"`
 	AllowCommand      sql.NullBool   `sql:"allow_command"`
 	AllowSubstitution sql.NullBool   `sql:"allow_substitution"`
diff --git a/database/types/settings.go b/database/types/settings.go
index ea0d47a2a..7bc29a6ca 100644
--- a/database/types/settings.go
+++ b/database/types/settings.go
@@ -28,7 +28,7 @@ type (
 		Compiler
 		Queue
 
-		RepoAllowlist     pq.StringArray `json:"repo_allowlist" sql:"repo_allowlist" gorm:"type:varchar(1000)"`
+		RepoAllowlist     pq.StringArray `json:"repo_allowlist"     sql:"repo_allowlist"     gorm:"type:varchar(1000)"`
 		ScheduleAllowlist pq.StringArray `json:"schedule_allowlist" sql:"schedule_allowlist" gorm:"type:varchar(1000)"`
 
 		CreatedAt sql.NullInt64  `sql:"created_at"`
@@ -38,8 +38,8 @@ type (
 
 	// Compiler is the database representation of compiler settings.
 	Compiler struct {
-		CloneImage        sql.NullString `json:"clone_image" sql:"clone_image"`
-		TemplateDepth     sql.NullInt64  `json:"template_depth" sql:"template_depth"`
+		CloneImage        sql.NullString `json:"clone_image"         sql:"clone_image"`
+		TemplateDepth     sql.NullInt64  `json:"template_depth"      sql:"template_depth"`
 		StarlarkExecLimit sql.NullInt64  `json:"starlark_exec_limit" sql:"starlark_exec_limit"`
 	}
 
diff --git a/database/types/user.go b/database/types/user.go
index bde757a6b..893336664 100644
--- a/database/types/user.go
+++ b/database/types/user.go
@@ -51,10 +51,10 @@ type User struct {
 	Name         sql.NullString `sql:"name"`
 	RefreshToken sql.NullString `sql:"refresh_token"`
 	Token        sql.NullString `sql:"token"`
-	Favorites    pq.StringArray `sql:"favorites" gorm:"type:varchar(5000)"`
+	Favorites    pq.StringArray `sql:"favorites"     gorm:"type:varchar(5000)"`
 	Active       sql.NullBool   `sql:"active"`
 	Admin        sql.NullBool   `sql:"admin"`
-	Dashboards   pq.StringArray `sql:"dashboards" gorm:"type:varchar(5000)"`
+	Dashboards   pq.StringArray `sql:"dashboards"    gorm:"type:varchar(5000)"`
 }
 
 // Decrypt will manipulate the existing user tokens by
diff --git a/database/types/worker.go b/database/types/worker.go
index 7dfe1ffab..6af93ae97 100644
--- a/database/types/worker.go
+++ b/database/types/worker.go
@@ -33,11 +33,11 @@ type Worker struct {
 	ID                  sql.NullInt64  `sql:"id"`
 	Hostname            sql.NullString `sql:"hostname"`
 	Address             sql.NullString `sql:"address"`
-	Routes              pq.StringArray `sql:"routes" gorm:"type:varchar(1000)"`
+	Routes              pq.StringArray `sql:"routes"                 gorm:"type:varchar(1000)"`
 	Active              sql.NullBool   `sql:"active"`
 	Status              sql.NullString `sql:"status"`
 	LastStatusUpdateAt  sql.NullInt64  `sql:"last_status_update_at"`
-	RunningBuildIDs     pq.StringArray `sql:"running_build_ids" gorm:"type:varchar(500)"`
+	RunningBuildIDs     pq.StringArray `sql:"running_build_ids"      gorm:"type:varchar(500)"`
 	LastBuildStartedAt  sql.NullInt64  `sql:"last_build_started_at"`
 	LastBuildFinishedAt sql.NullInt64  `sql:"last_build_finished_at"`
 	LastCheckedIn       sql.NullInt64  `sql:"last_checked_in"`