diff --git a/agent/tracer.go b/agent/tracer.go
index 91fcdbc8d..64633210f 100644
--- a/agent/tracer.go
+++ b/agent/tracer.go
@@ -76,23 +76,11 @@ func (r *Runner) createTracer(ctxmeta context.Context, logger zerolog.Logger, wo
 		state.Pipeline.Step.Environment["CI_STEP_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10)
 		state.Pipeline.Step.Environment["CI_STEP_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10)
 
-		state.Pipeline.Step.Environment["CI_SYSTEM_ARCH"] = runtime.GOOS + "/" + runtime.GOARCH
-
-		// DEPRECATED
-		state.Pipeline.Step.Environment["CI_BUILD_STATUS"] = "success"
-		state.Pipeline.Step.Environment["CI_BUILD_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10)
-		state.Pipeline.Step.Environment["CI_BUILD_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10)
-		state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success"
-		state.Pipeline.Step.Environment["CI_JOB_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10)
-		state.Pipeline.Step.Environment["CI_JOB_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10)
+		state.Pipeline.Step.Environment["CI_SYSTEM_PLATFORM"] = runtime.GOOS + "/" + runtime.GOARCH
 
 		if state.Pipeline.Error != nil {
 			state.Pipeline.Step.Environment["CI_PIPELINE_STATUS"] = "failure"
 			state.Pipeline.Step.Environment["CI_STEP_STATUS"] = "failure"
-
-			// DEPRECATED
-			state.Pipeline.Step.Environment["CI_BUILD_STATUS"] = "failure"
-			state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "failure"
 		}
 
 		return nil
diff --git a/cli/exec/flags.go b/cli/exec/flags.go
index 0e4fd3792..b4692f46a 100644
--- a/cli/exec/flags.go
+++ b/cli/exec/flags.go
@@ -110,7 +110,7 @@ var flags = []cli.Flag{
 		Value:   "woodpecker",
 	},
 	&cli.StringFlag{
-		EnvVars: []string{"CI_SYSTEM_URL", "CI_SYSTEM_LINK"},
+		EnvVars: []string{"CI_SYSTEM_URL"},
 		Name:    "system-link",
 		Value:   "https://github.com/woodpecker-ci/woodpecker",
 	},
@@ -124,11 +124,11 @@ var flags = []cli.Flag{
 		Name:    "repo-remote-id",
 	},
 	&cli.StringFlag{
-		EnvVars: []string{"CI_REPO_URL", "CI_REPO_LINK"},
+		EnvVars: []string{"CI_REPO_URL"},
 		Name:    "repo-link",
 	},
 	&cli.StringFlag{
-		EnvVars: []string{"CI_REPO_CLONE_URL", "CI_REPO_REMOTE"},
+		EnvVars: []string{"CI_REPO_CLONE_URL"},
 		Name:    "repo-clone-url",
 	},
 	&cli.StringFlag{
@@ -169,7 +169,7 @@ var flags = []cli.Flag{
 		Value:   "manual",
 	},
 	&cli.StringFlag{
-		EnvVars: []string{"CI_PIPELINE_URL", "CI_PIPELINE_LINK"},
+		EnvVars: []string{"CI_PIPELINE_URL"},
 		Name:    "pipeline-link",
 	},
 	&cli.StringFlag{
@@ -233,7 +233,7 @@ var flags = []cli.Flag{
 		Name:    "prev-pipeline-event",
 	},
 	&cli.StringFlag{
-		EnvVars: []string{"CI_PREV_PIPELINE_URL", "CI_PREV_PIPELINE_LINK"},
+		EnvVars: []string{"CI_PREV_PIPELINE_URL"},
 		Name:    "prev-pipeline-link",
 	},
 	&cli.StringFlag{
@@ -273,11 +273,11 @@ var flags = []cli.Flag{
 		Name:    "workflow-name",
 	},
 	&cli.IntFlag{
-		EnvVars: []string{"CI_WORKFLOW_NUMBER", "CI_JOB_NUMBER"},
+		EnvVars: []string{"CI_WORKFLOW_NUMBER"},
 		Name:    "workflow-number",
 	},
 	&cli.IntFlag{
-		EnvVars: []string{"CI_STEP_NAME", "CI_JOB_NUMBER"},
+		EnvVars: []string{"CI_STEP_NAME"},
 		Name:    "step-name",
 	},
 	&cli.StringSliceFlag{
diff --git a/docs/docs/20-usage/20-pipeline-syntax.md b/docs/docs/20-usage/20-pipeline-syntax.md
index c674e3ce3..57cb05504 100644
--- a/docs/docs/20-usage/20-pipeline-syntax.md
+++ b/docs/docs/20-usage/20-pipeline-syntax.md
@@ -452,7 +452,7 @@ Run on pushes to the default branch for the repository `owner/repo`:
 
 ```yaml
 when:
-  - evaluate: 'CI_BUILD_EVENT == "push" && CI_REPO == "owner/repo" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
+  - evaluate: 'CI_PIPELINE_EVENT == "push" && CI_REPO == "owner/repo" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
 ```
 
 Run on commits created by user `woodpecker-ci`:
diff --git a/docs/docs/20-usage/50-environment.md b/docs/docs/20-usage/50-environment.md
index cb2bf2362..fd3100782 100644
--- a/docs/docs/20-usage/50-environment.md
+++ b/docs/docs/20-usage/50-environment.md
@@ -65,8 +65,8 @@ This is the reference list of all environment variables available to your pipeli
 | `CI_COMMIT_REF`                  | commit ref                                                                                   |
 | `CI_COMMIT_REFSPEC`              | commit ref spec                                                                              |
 | `CI_COMMIT_BRANCH`               | commit branch (equals target branch for pull requests)                                       |
-| `CI_COMMIT_SOURCE_BRANCH`        | commit source branch                                                                         |
-| `CI_COMMIT_TARGET_BRANCH`        | commit target branch                                                                         |
+| `CI_COMMIT_SOURCE_BRANCH`        | commit source branch (empty if event is not `pull_request`)                                  |
+| `CI_COMMIT_TARGET_BRANCH`        | commit target branch (empty if event is not `pull_request`)                                  |
 | `CI_COMMIT_TAG`                  | commit tag name (empty if event is not `tag`)                                                |
 | `CI_COMMIT_PULL_REQUEST`         | commit pull request number (empty if event is not `pull_request`)                            |
 | `CI_COMMIT_PULL_REQUEST_LABELS`  | labels assigned to pull request (empty if event is not `pull_request`)                       |
diff --git a/docs/docs/30-administration/22-backends/40-kubernetes.md b/docs/docs/30-administration/22-backends/40-kubernetes.md
index 51c1958f7..9ab79b7e6 100644
--- a/docs/docs/30-administration/22-backends/40-kubernetes.md
+++ b/docs/docs/30-administration/22-backends/40-kubernetes.md
@@ -55,7 +55,7 @@ See the [kubernetes documentation](https://kubernetes.io/docs/concepts/security/
 ### nodeSelector
 
 Specify the label which is used to select the node where the job should be executed. Labels defined here will be appended to a list already containing "kubernetes.io/arch".
-By default the pod will use "kubernetes.io/arch" inferred from top-level "platform" setting which is deducted from the agents' environment variable CI_SYSTEM_ARCH. To overwrite this, you need to specify this label in the nodeSelector section.
+By default the pod will use "kubernetes.io/arch" inferred from top-level "platform" setting which is deducted from the agents' environment variable CI_SYSTEM_PLATFORM. To overwrite this, you need to specify this label in the nodeSelector section.
 See the [kubernetes documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) for more information on using nodeSelector.
 
 Example pipeline configuration:
diff --git a/docs/docs/91-migrations.md b/docs/docs/91-migrations.md
index 1cb3d3b68..f4ceb6207 100644
--- a/docs/docs/91-migrations.md
+++ b/docs/docs/91-migrations.md
@@ -2,9 +2,9 @@
 
 Some versions need some changes to the server configuration or the pipeline configuration files.
 
-## next
+## next (1.1.0)
 
-No breaking changes
+- Drop deprecated `CI_BUILD_*`, `CI_PREV_BUILD_*`, `CI_JOB_*`, `*_LINK`, `CI_SYSTEM_ARCH`, `CI_REPO_REMOTE` built-in environment variables
 
 ## 1.0.0
 
diff --git a/docs/versioned_docs/version-1.0/20-usage/20-pipeline-syntax.md b/docs/versioned_docs/version-1.0/20-usage/20-pipeline-syntax.md
index c674e3ce3..57cb05504 100644
--- a/docs/versioned_docs/version-1.0/20-usage/20-pipeline-syntax.md
+++ b/docs/versioned_docs/version-1.0/20-usage/20-pipeline-syntax.md
@@ -452,7 +452,7 @@ Run on pushes to the default branch for the repository `owner/repo`:
 
 ```yaml
 when:
-  - evaluate: 'CI_BUILD_EVENT == "push" && CI_REPO == "owner/repo" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
+  - evaluate: 'CI_PIPELINE_EVENT == "push" && CI_REPO == "owner/repo" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
 ```
 
 Run on commits created by user `woodpecker-ci`:
diff --git a/docs/versioned_docs/version-1.0/20-usage/50-environment.md b/docs/versioned_docs/version-1.0/20-usage/50-environment.md
index cb2bf2362..fd3100782 100644
--- a/docs/versioned_docs/version-1.0/20-usage/50-environment.md
+++ b/docs/versioned_docs/version-1.0/20-usage/50-environment.md
@@ -65,8 +65,8 @@ This is the reference list of all environment variables available to your pipeli
 | `CI_COMMIT_REF`                  | commit ref                                                                                   |
 | `CI_COMMIT_REFSPEC`              | commit ref spec                                                                              |
 | `CI_COMMIT_BRANCH`               | commit branch (equals target branch for pull requests)                                       |
-| `CI_COMMIT_SOURCE_BRANCH`        | commit source branch                                                                         |
-| `CI_COMMIT_TARGET_BRANCH`        | commit target branch                                                                         |
+| `CI_COMMIT_SOURCE_BRANCH`        | commit source branch (empty if event is not `pull_request`)                                  |
+| `CI_COMMIT_TARGET_BRANCH`        | commit target branch (empty if event is not `pull_request`)                                  |
 | `CI_COMMIT_TAG`                  | commit tag name (empty if event is not `tag`)                                                |
 | `CI_COMMIT_PULL_REQUEST`         | commit pull request number (empty if event is not `pull_request`)                            |
 | `CI_COMMIT_PULL_REQUEST_LABELS`  | labels assigned to pull request (empty if event is not `pull_request`)                       |
diff --git a/docs/versioned_docs/version-1.0/30-administration/22-backends/40-kubernetes.md b/docs/versioned_docs/version-1.0/30-administration/22-backends/40-kubernetes.md
index 51c1958f7..9ab79b7e6 100644
--- a/docs/versioned_docs/version-1.0/30-administration/22-backends/40-kubernetes.md
+++ b/docs/versioned_docs/version-1.0/30-administration/22-backends/40-kubernetes.md
@@ -55,7 +55,7 @@ See the [kubernetes documentation](https://kubernetes.io/docs/concepts/security/
 ### nodeSelector
 
 Specify the label which is used to select the node where the job should be executed. Labels defined here will be appended to a list already containing "kubernetes.io/arch".
-By default the pod will use "kubernetes.io/arch" inferred from top-level "platform" setting which is deducted from the agents' environment variable CI_SYSTEM_ARCH. To overwrite this, you need to specify this label in the nodeSelector section.
+By default the pod will use "kubernetes.io/arch" inferred from top-level "platform" setting which is deducted from the agents' environment variable CI_SYSTEM_PLATFORM. To overwrite this, you need to specify this label in the nodeSelector section.
 See the [kubernetes documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) for more information on using nodeSelector.
 
 Example pipeline configuration:
diff --git a/pipeline/backend/kubernetes/pod.go b/pipeline/backend/kubernetes/pod.go
index 2d4b160d7..1ab91478a 100644
--- a/pipeline/backend/kubernetes/pod.go
+++ b/pipeline/backend/kubernetes/pod.go
@@ -95,7 +95,7 @@ func Pod(namespace string, step *types.Step, labels, annotations map[string]stri
 	labels["step"] = podName
 
 	var nodeSelector map[string]string
-	platform, exist := step.Environment["CI_SYSTEM_ARCH"]
+	platform, exist := step.Environment["CI_SYSTEM_PLATFORM"]
 	if exist && platform != "" {
 		arch := strings.Split(platform, "/")[1]
 		nodeSelector = map[string]string{v1.LabelArchStable: arch}
diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go
index 854e39f3b..73efb0d3d 100644
--- a/pipeline/frontend/metadata/drone_compatibility_test.go
+++ b/pipeline/frontend/metadata/drone_compatibility_test.go
@@ -10,17 +10,9 @@ import (
 
 func TestSetDroneEnviron(t *testing.T) {
 	woodpeckerVars := `CI=woodpecker
-CI_BUILD_CREATED=1685749339
-CI_BUILD_EVENT=pull_request
-CI_BUILD_FINISHED=1685749350
-CI_BUILD_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/9
-CI_BUILD_NUMBER=41
-CI_BUILD_STARTED=1685749339
-CI_BUILD_STATUS=success
 CI_COMMIT_AUTHOR=6543
 CI_COMMIT_AUTHOR_AVATAR=https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173
 CI_COMMIT_BRANCH=main
-CI_COMMIT_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/9
 CI_COMMIT_MESSAGE=fix testscript
 CI_COMMIT_PULL_REQUEST=9
 CI_COMMIT_REF=refs/pull/9/head
@@ -28,28 +20,16 @@ CI_COMMIT_REFSPEC=fix_fail-on-err:main
 CI_COMMIT_SHA=a778b069d9f5992786d2db9be493b43868cfce76
 CI_COMMIT_SOURCE_BRANCH=fix_fail-on-err
 CI_COMMIT_TARGET_BRANCH=main
-CI_JOB_FINISHED=1685749350
-CI_JOB_STARTED=1685749339
-CI_JOB_STATUS=success
 CI_MACHINE=7939910e431b
 CI_PIPELINE_CREATED=1685749339
 CI_PIPELINE_EVENT=pull_request
 CI_PIPELINE_FINISHED=1685749350
-CI_PIPELINE_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/9
 CI_PIPELINE_NUMBER=41
 CI_PIPELINE_STARTED=1685749339
 CI_PIPELINE_STATUS=success
-CI_PREV_BUILD_CREATED=1685748680
-CI_PREV_BUILD_EVENT=pull_request
-CI_PREV_BUILD_FINISHED=1685748704
-CI_PREV_BUILD_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/13
-CI_PREV_BUILD_NUMBER=40
-CI_PREV_BUILD_STARTED=1685748680
-CI_PREV_BUILD_STATUS=success
 CI_PREV_COMMIT_AUTHOR=6543
 CI_PREV_COMMIT_AUTHOR_AVATAR=https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173
 CI_PREV_COMMIT_BRANCH=main
-CI_PREV_COMMIT_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/13
 CI_PREV_COMMIT_MESSAGE=Print filename and linenuber on fail
 CI_PREV_COMMIT_REF=refs/pull/13/head
 CI_PREV_COMMIT_REFSPEC=print_file_and_line:main
@@ -57,25 +37,21 @@ CI_PREV_COMMIT_SHA=e246aff5a9466df2e522efc9007823a7496d9d41
 CI_PREV_PIPELINE_CREATED=1685748680
 CI_PREV_PIPELINE_EVENT=pull_request
 CI_PREV_PIPELINE_FINISHED=1685748704
-CI_PREV_PIPELINE_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/13
 CI_PREV_PIPELINE_NUMBER=40
 CI_PREV_PIPELINE_STARTED=1685748680
 CI_PREV_PIPELINE_STATUS=success
 CI_REPO=Epsilon_02/todo-checker
 CI_REPO_CLONE_URL=https://codeberg.org/Epsilon_02/todo-checker.git
 CI_REPO_DEFAULT_BRANCH=main
-CI_REPO_LINK=https://codeberg.org/Epsilon_02/todo-checker
 CI_REPO_NAME=todo-checker
 CI_REPO_OWNER=Epsilon_02
-CI_REPO_REMOTE=https://codeberg.org/Epsilon_02/todo-checker.git
 CI_REPO_SCM=git
 CI_STEP_FINISHED=1685749350
 CI_STEP_NAME=wp_01h1z7v5d1tskaqjexw0ng6w7d_0_step_3
 CI_STEP_STARTED=1685749339
 CI_STEP_STATUS=success
-CI_SYSTEM_ARCH=linux/amd64
+CI_SYSTEM_PLATFORM=linux/amd64
 CI_SYSTEM_HOST=ci.codeberg.org
-CI_SYSTEM_LINK=https://ci.codeberg.org
 CI_SYSTEM_NAME=woodpecker
 CI_SYSTEM_VERSION=next-dd644da3
 CI_WORKFLOW_NAME=woodpecker
diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go
index 30a80381e..6827b35a1 100644
--- a/pipeline/frontend/metadata/environment.go
+++ b/pipeline/frontend/metadata/environment.go
@@ -111,43 +111,6 @@ func (m *Metadata) Environ() map[string]string {
 
 		"CI_FORGE_TYPE": m.Forge.Type,
 		"CI_FORGE_URL":  m.Forge.URL,
-
-		// DEPRECATED
-		"CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version
-		// use CI_PIPELINE_*
-		"CI_BUILD_NUMBER":        strconv.FormatInt(m.Curr.Number, 10),
-		"CI_BUILD_PARENT":        strconv.FormatInt(m.Curr.Parent, 10),
-		"CI_BUILD_EVENT":         m.Curr.Event,
-		"CI_BUILD_LINK":          m.Curr.Link,
-		"CI_BUILD_DEPLOY_TARGET": m.Curr.Target,
-		"CI_BUILD_STATUS":        m.Curr.Status,
-		"CI_BUILD_CREATED":       strconv.FormatInt(m.Curr.Created, 10),
-		"CI_BUILD_STARTED":       strconv.FormatInt(m.Curr.Started, 10),
-		"CI_BUILD_FINISHED":      strconv.FormatInt(m.Curr.Finished, 10),
-		// use CI_PREV_PIPELINE_*
-		"CI_PREV_BUILD_NUMBER":        strconv.FormatInt(m.Prev.Number, 10),
-		"CI_PREV_BUILD_PARENT":        strconv.FormatInt(m.Prev.Parent, 10),
-		"CI_PREV_BUILD_EVENT":         m.Prev.Event,
-		"CI_PREV_BUILD_LINK":          m.Prev.Link,
-		"CI_PREV_BUILD_DEPLOY_TARGET": m.Prev.Target,
-		"CI_PREV_BUILD_STATUS":        m.Prev.Status,
-		"CI_PREV_BUILD_CREATED":       strconv.FormatInt(m.Prev.Created, 10),
-		"CI_PREV_BUILD_STARTED":       strconv.FormatInt(m.Prev.Started, 10),
-		"CI_PREV_BUILD_FINISHED":      strconv.FormatInt(m.Prev.Finished, 10),
-		// use CI_STEP_*
-		"CI_JOB_NUMBER":   strconv.Itoa(m.Step.Number),
-		"CI_JOB_STATUS":   "", // will be set by agent
-		"CI_JOB_STARTED":  "", // will be set by agent
-		"CI_JOB_FINISHED": "", // will be set by agent
-		// CI_REPO_CLONE_URL
-		"CI_REPO_REMOTE": m.Repo.CloneURL,
-		// use *_URL
-		"CI_REPO_LINK":          m.Repo.Link,
-		"CI_COMMIT_LINK":        m.Curr.Link,
-		"CI_PIPELINE_LINK":      m.Curr.Link,
-		"CI_PREV_COMMIT_LINK":   m.Prev.Link,
-		"CI_PREV_PIPELINE_LINK": m.Prev.Link,
-		"CI_SYSTEM_LINK":        m.Sys.Link,
 	}
 	if m.Curr.Event == EventTag {
 		params["CI_COMMIT_TAG"] = strings.TrimPrefix(m.Curr.Commit.Ref, "refs/tags/")
diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go
index 9574e67f5..f381c0cef 100644
--- a/pipeline/frontend/metadata_test.go
+++ b/pipeline/frontend/metadata_test.go
@@ -70,19 +70,18 @@ func TestMetadataFromStruct(t *testing.T) {
 			name:             "Test with empty info",
 			expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}},
 			expectedEnviron: map[string]string{
-				"CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_NUMBER": "0", "CI_BUILD_PARENT": "0",
-				"CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "",
+				"CI":               "woodpecker",
+				"CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "",
 				"CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "",
-				"CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "",
-				"CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0",
-				"CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "",
-				"CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_NUMBER": "0", "CI_PREV_BUILD_PARENT": "0", "CI_PREV_BUILD_STARTED": "0",
-				"CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "",
+				"CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "",
+				"CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_NUMBER": "0",
+				"CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "",
+				"CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "",
 				"CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0",
-				"CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0",
-				"CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_LINK": "", "CI_REPO_REMOTE_ID": "",
-				"CI_REPO_NAME": "", "CI_REPO_OWNER": "", "CI_REPO_PRIVATE": "false", "CI_REPO_REMOTE": "", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "", "CI_STEP_FINISHED": "",
-				"CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "", "CI_SYSTEM_LINK": "", "CI_SYSTEM_NAME": "woodpecker",
+				"CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0",
+				"CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_REMOTE_ID": "",
+				"CI_REPO_NAME": "", "CI_REPO_OWNER": "", "CI_REPO_PRIVATE": "false", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "", "CI_STEP_FINISHED": "",
+				"CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_HOST": "", "CI_SYSTEM_NAME": "woodpecker",
 				"CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "", "CI_WORKFLOW_NUMBER": "0",
 			},
 		},
@@ -103,20 +102,19 @@ func TestMetadataFromStruct(t *testing.T) {
 				Workflow: metadata.Workflow{Name: "hello"},
 			},
 			expectedEnviron: map[string]string{
-				"CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_NUMBER": "3", "CI_BUILD_PARENT": "0",
-				"CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "",
+				"CI":               "woodpecker",
+				"CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "",
 				"CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "",
-				"CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0",
-				"CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "",
-				"CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "",
-				"CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_NUMBER": "2", "CI_PREV_BUILD_PARENT": "0", "CI_PREV_BUILD_STARTED": "0",
-				"CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "",
+				"CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com",
+				"CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0",
+				"CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "",
+				"CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "",
 				"CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0",
-				"CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0",
+				"CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0",
 				"CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "testUser/testRepo", "CI_REPO_CLONE_URL": "https://gitea.com/testUser/testRepo.git",
-				"CI_REPO_DEFAULT_BRANCH": "main", "CI_REPO_LINK": "https://gitea.com/testUser/testRepo", "CI_REPO_NAME": "testRepo", "CI_REPO_OWNER": "testUser", "CI_REPO_PRIVATE": "true", "CI_REPO_REMOTE_ID": "",
-				"CI_REPO_REMOTE": "https://gitea.com/testUser/testRepo.git", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "https://gitea.com/testUser/testRepo", "CI_STEP_FINISHED": "",
-				"CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "example.com", "CI_SYSTEM_LINK": "https://example.com",
+				"CI_REPO_DEFAULT_BRANCH": "main", "CI_REPO_NAME": "testRepo", "CI_REPO_OWNER": "testUser", "CI_REPO_PRIVATE": "true", "CI_REPO_REMOTE_ID": "",
+				"CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "https://gitea.com/testUser/testRepo", "CI_STEP_FINISHED": "",
+				"CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_HOST": "example.com",
 				"CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "https://example.com", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "hello", "CI_WORKFLOW_NUMBER": "0",
 			},
 		},
diff --git a/pipeline/samples/sample_1/.env b/pipeline/samples/sample_1/.env
index c6c64ae69..2a6815f92 100644
--- a/pipeline/samples/sample_1/.env
+++ b/pipeline/samples/sample_1/.env
@@ -1,16 +1,16 @@
-CI_REPO=drone/envsubst
-CI_REPO_NAME=drone/envsubst
-CI_REPO_LINK=https://github.com/drone/envsubst
-CI_REPO_REMOTE=https://github.com/drone/envsubst.git
-CI_REPO_PRIVATE=false
-CI_BUILD_NUMBER=6
-CI_BUILD_CREATED=1486119586
-CI_BUILD_STARTED=1486119585
-CI_BUILD_EVENT=push
-CI_BUILD_LINK=
-CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
-CI_COMMIT_REF=refs/heads/master
-CI_COMMIT_REFSPEC=
+CI_COMMIT_AUTHOR=bradrydzewski
 CI_COMMIT_BRANCH=master
 CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
-CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_PIPELINE_CREATED=1486119586
+CI_PIPELINE_EVENT=push
+CI_PIPELINE_NUMBER=6
+CI_PIPELINE_STARTED=1486119585
+CI_PIPELINE_URL=
+CI_REPO=drone/envsubst
+CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git
+CI_REPO_NAME=drone/envsubst
+CI_REPO_PRIVATE=false
+CI_REPO_URL=https://github.com/drone/envsubst
diff --git a/pipeline/samples/sample_1/pipeline.json b/pipeline/samples/sample_1/pipeline.json
index 329fa5cae..568c0a7d6 100644
--- a/pipeline/samples/sample_1/pipeline.json
+++ b/pipeline/samples/sample_1/pipeline.json
@@ -24,7 +24,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -68,7 +68,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJnbyBnZXQgLXQgLi8uLi4iCmdvIGdldCAtdCAuLy4uLgoKZWNobyArICJnbyBidWlsZCIKZ28gYnVpbGQKCmVjaG8gKyAiZ28gdGVzdCAtdiIKZ28gdGVzdCAtdgoK",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
diff --git a/pipeline/samples/sample_10_windows/.env b/pipeline/samples/sample_10_windows/.env
index c6c64ae69..2a6815f92 100644
--- a/pipeline/samples/sample_10_windows/.env
+++ b/pipeline/samples/sample_10_windows/.env
@@ -1,16 +1,16 @@
-CI_REPO=drone/envsubst
-CI_REPO_NAME=drone/envsubst
-CI_REPO_LINK=https://github.com/drone/envsubst
-CI_REPO_REMOTE=https://github.com/drone/envsubst.git
-CI_REPO_PRIVATE=false
-CI_BUILD_NUMBER=6
-CI_BUILD_CREATED=1486119586
-CI_BUILD_STARTED=1486119585
-CI_BUILD_EVENT=push
-CI_BUILD_LINK=
-CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
-CI_COMMIT_REF=refs/heads/master
-CI_COMMIT_REFSPEC=
+CI_COMMIT_AUTHOR=bradrydzewski
 CI_COMMIT_BRANCH=master
 CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
-CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_PIPELINE_CREATED=1486119586
+CI_PIPELINE_EVENT=push
+CI_PIPELINE_NUMBER=6
+CI_PIPELINE_STARTED=1486119585
+CI_PIPELINE_URL=
+CI_REPO=drone/envsubst
+CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git
+CI_REPO_NAME=drone/envsubst
+CI_REPO_PRIVATE=false
+CI_REPO_URL=https://github.com/drone/envsubst
diff --git a/pipeline/samples/sample_10_windows/pipeline.json b/pipeline/samples/sample_10_windows/pipeline.json
index 9bf923530..9188aff36 100644
--- a/pipeline/samples/sample_10_windows/pipeline.json
+++ b/pipeline/samples/sample_10_windows/pipeline.json
@@ -24,7 +24,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "windows/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -75,7 +75,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CiRFcnJvckFjdGlvblByZWZlcmVuY2UgPSAnU3RvcCc7CiZjbWQgL2MgIm1rZGlyIGM6XHJvb3QiOwppZiAoJEVudjpDSV9ORVRSQ19NQUNISU5FKSB7CiRuZXRyYz1bc3RyaW5nXTo6Rm9ybWF0KCJ7MH1cX25ldHJjIiwkRW52OkhPTUUpOwoibWFjaGluZSAkRW52OkNJX05FVFJDX01BQ0hJTkUiID4+ICRuZXRyYzsKImxvZ2luICRFbnY6Q0lfTkVUUkNfVVNFUk5BTUUiID4+ICRuZXRyYzsKInBhc3N3b3JkICRFbnY6Q0lfTkVUUkNfUEFTU1dPUkQiID4+ICRuZXRyYzsKfTsKW0Vudmlyb25tZW50XTo6U2V0RW52aXJvbm1lbnRWYXJpYWJsZSgiQ0lfTkVUUkNfUEFTU1dPUkQiLCRudWxsKTsKW0Vudmlyb25tZW50XTo6U2V0RW52aXJvbm1lbnRWYXJpYWJsZSgiQ0lfU0NSSVBUIiwkbnVsbCk7CltFbnZpcm9ubWVudF06OlNldEVudmlyb25tZW50VmFyaWFibGUoIkRST05FX05FVFJDX1VTRVJOQU1FIiwkbnVsbCk7CltFbnZpcm9ubWVudF06OlNldEVudmlyb25tZW50VmFyaWFibGUoIkRST05FX05FVFJDX1BBU1NXT1JEIiwkbnVsbCk7CgpXcml0ZS1PdXRwdXQgKCcrICJnbyBnZXQgLXQgLlxcLi4uIicpOyAgW0NvbnNvbGVdOjpPdXQuRmx1c2goKQomIGdvIGdldCAtdCAuXC4uLjsgaWYgKCRMQVNURVhJVENPREUgLW5lIDApIHtleGl0ICRMQVNURVhJVENPREV9CgpXcml0ZS1PdXRwdXQgKCcrICJnbyBidWlsZCInKTsgIFtDb25zb2xlXTo6T3V0LkZsdXNoKCkKJiBnbyBidWlsZDsgaWYgKCRMQVNURVhJVENPREUgLW5lIDApIHtleGl0ICRMQVNURVhJVENPREV9CgpXcml0ZS1PdXRwdXQgKCcrICJnbyB0ZXN0IC12IicpOyAgW0NvbnNvbGVdOjpPdXQuRmx1c2goKQomIGdvIHRlc3QgLXY7IGlmICgkTEFTVEVYSVRDT0RFIC1uZSAwKSB7ZXhpdCAkTEFTVEVYSVRDT0RFfQoK",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "windows/amd64",
diff --git a/pipeline/samples/sample_2/.env b/pipeline/samples/sample_2/.env
index 41db77b71..60e404e57 100644
--- a/pipeline/samples/sample_2/.env
+++ b/pipeline/samples/sample_2/.env
@@ -1,16 +1,16 @@
-CI_REPO=go-sql-driver/mysql
-CI_REPO_NAME=go-sql-driver/mysql
-CI_REPO_LINK=https://github.com/go-sql-driver/mysql
-CI_REPO_REMOTE=https://github.com/go-sql-driver/mysql.git
-CI_REPO_PRIVATE=false
-CI_BUILD_NUMBER=530
-CI_BUILD_CREATED=1486119586
-CI_BUILD_STARTED=1486119585
-CI_BUILD_EVENT=push
-CI_BUILD_LINK=
-CI_COMMIT_SHA=2e00b5cd70399450106cec6431c2e2ce3cae5034
-CI_COMMIT_REF=refs/heads/master
-CI_COMMIT_REFSPEC=
+CI_COMMIT_AUTHOR=egorsmkv
 CI_COMMIT_BRANCH=master
 CI_COMMIT_MESSAGE="Fix many urls"
-CI_COMMIT_AUTHOR=egorsmkv
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_SHA=2e00b5cd70399450106cec6431c2e2ce3cae5034
+CI_PIPELINE_CREATED=1486119586
+CI_PIPELINE_EVENT=push
+CI_PIPELINE_NUMBER=530
+CI_PIPELINE_STARTED=1486119585
+CI_PIPELINE_URL=
+CI_REPO=go-sql-driver/mysql
+CI_REPO_CLONE_URL=https://github.com/go-sql-driver/mysql.git
+CI_REPO_NAME=go-sql-driver/mysql
+CI_REPO_PRIVATE=false
+CI_REPO_URL=https://github.com/go-sql-driver/mysql
diff --git a/pipeline/samples/sample_2/pipeline.json b/pipeline/samples/sample_2/pipeline.json
index 65313ef26..1c71be61d 100644
--- a/pipeline/samples/sample_2/pipeline.json
+++ b/pipeline/samples/sample_2/pipeline.json
@@ -23,7 +23,7 @@
             "CI_REPO": "go-sql-driver/mysql",
             "CI_REPO_URL": "https://github.com/go-sql-driver/mysql",
             "CI_REPO_NAME": "go-sql-driver/mysql",
-            "CI_REPO_REMOTE": "https://github.com/go-sql-driver/mysql.git",
+            "CI_REPO_CLONE_URL": "https://github.com/go-sql-driver/mysql.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -67,7 +67,7 @@
             "CI_REPO": "go-sql-driver/mysql",
             "CI_REPO_URL": "https://github.com/go-sql-driver/mysql",
             "CI_REPO_NAME": "go-sql-driver/mysql",
-            "CI_REPO_REMOTE": "https://github.com/go-sql-driver/mysql.git",
+            "CI_REPO_CLONE_URL": "https://github.com/go-sql-driver/mysql.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -112,7 +112,7 @@
             "CI_REPO": "go-sql-driver/mysql",
             "CI_REPO_URL": "https://github.com/go-sql-driver/mysql",
             "CI_REPO_NAME": "go-sql-driver/mysql",
-            "CI_REPO_REMOTE": "https://github.com/go-sql-driver/mysql.git",
+            "CI_REPO_CLONE_URL": "https://github.com/go-sql-driver/mysql.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJzbGVlcCAyMCIKc2xlZXAgMjAKCmVjaG8gKyAiZ28gZ2V0IC12IC10IgpnbyBnZXQgLXYgLXQKCmVjaG8gKyAiZ28gdGVzdCAtdiIKZ28gdGVzdCAtdgoK",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
diff --git a/pipeline/samples/sample_3/.env b/pipeline/samples/sample_3/.env
index c6c64ae69..2a6815f92 100644
--- a/pipeline/samples/sample_3/.env
+++ b/pipeline/samples/sample_3/.env
@@ -1,16 +1,16 @@
-CI_REPO=drone/envsubst
-CI_REPO_NAME=drone/envsubst
-CI_REPO_LINK=https://github.com/drone/envsubst
-CI_REPO_REMOTE=https://github.com/drone/envsubst.git
-CI_REPO_PRIVATE=false
-CI_BUILD_NUMBER=6
-CI_BUILD_CREATED=1486119586
-CI_BUILD_STARTED=1486119585
-CI_BUILD_EVENT=push
-CI_BUILD_LINK=
-CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
-CI_COMMIT_REF=refs/heads/master
-CI_COMMIT_REFSPEC=
+CI_COMMIT_AUTHOR=bradrydzewski
 CI_COMMIT_BRANCH=master
 CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
-CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_PIPELINE_CREATED=1486119586
+CI_PIPELINE_EVENT=push
+CI_PIPELINE_NUMBER=6
+CI_PIPELINE_STARTED=1486119585
+CI_PIPELINE_URL=
+CI_REPO=drone/envsubst
+CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git
+CI_REPO_NAME=drone/envsubst
+CI_REPO_PRIVATE=false
+CI_REPO_URL=https://github.com/drone/envsubst
diff --git a/pipeline/samples/sample_3/pipeline.json b/pipeline/samples/sample_3/pipeline.json
index 405d6780c..58e648ca7 100644
--- a/pipeline/samples/sample_3/pipeline.json
+++ b/pipeline/samples/sample_3/pipeline.json
@@ -24,7 +24,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -68,7 +68,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHRoaXMgc3RlcCBzaG91bGQgZmFpbCIKZWNobyB0aGlzIHN0ZXAgc2hvdWxkIGZhaWwKCmVjaG8gKyAiZXhpdCAxIgpleGl0IDEKCg==",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
@@ -116,7 +116,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHRoaXMgc3RlcCBzaG91bGQgbmV2ZXIgZXhlY3V0ZSIKZWNobyB0aGlzIHN0ZXAgc2hvdWxkIG5ldmVyIGV4ZWN1dGUKCg==",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
diff --git a/pipeline/samples/sample_4/.env b/pipeline/samples/sample_4/.env
index c6c64ae69..2a6815f92 100644
--- a/pipeline/samples/sample_4/.env
+++ b/pipeline/samples/sample_4/.env
@@ -1,16 +1,16 @@
-CI_REPO=drone/envsubst
-CI_REPO_NAME=drone/envsubst
-CI_REPO_LINK=https://github.com/drone/envsubst
-CI_REPO_REMOTE=https://github.com/drone/envsubst.git
-CI_REPO_PRIVATE=false
-CI_BUILD_NUMBER=6
-CI_BUILD_CREATED=1486119586
-CI_BUILD_STARTED=1486119585
-CI_BUILD_EVENT=push
-CI_BUILD_LINK=
-CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
-CI_COMMIT_REF=refs/heads/master
-CI_COMMIT_REFSPEC=
+CI_COMMIT_AUTHOR=bradrydzewski
 CI_COMMIT_BRANCH=master
 CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
-CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_PIPELINE_CREATED=1486119586
+CI_PIPELINE_EVENT=push
+CI_PIPELINE_NUMBER=6
+CI_PIPELINE_STARTED=1486119585
+CI_PIPELINE_URL=
+CI_REPO=drone/envsubst
+CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git
+CI_REPO_NAME=drone/envsubst
+CI_REPO_PRIVATE=false
+CI_REPO_URL=https://github.com/drone/envsubst
diff --git a/pipeline/samples/sample_4/pipeline.json b/pipeline/samples/sample_4/pipeline.json
index 17badb220..05640e958 100644
--- a/pipeline/samples/sample_4/pipeline.json
+++ b/pipeline/samples/sample_4/pipeline.json
@@ -24,7 +24,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -68,7 +68,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHRoaXMgc3RlcCBzaG91bGQgZmFpbCIKZWNobyB0aGlzIHN0ZXAgc2hvdWxkIGZhaWwKCmVjaG8gKyAiZXhpdCAxIgpleGl0IDEKCg==",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
@@ -116,7 +116,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHRoaXMgc3RlcCBzaG91bGQgZXhlY3V0ZSwgZGVzcGl0ZSBmYWlsdXJlIgplY2hvIHRoaXMgc3RlcCBzaG91bGQgZXhlY3V0ZSwgZGVzcGl0ZSBmYWlsdXJlCgo=",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
diff --git a/pipeline/samples/sample_5/.env b/pipeline/samples/sample_5/.env
index c6c64ae69..2a6815f92 100644
--- a/pipeline/samples/sample_5/.env
+++ b/pipeline/samples/sample_5/.env
@@ -1,16 +1,16 @@
-CI_REPO=drone/envsubst
-CI_REPO_NAME=drone/envsubst
-CI_REPO_LINK=https://github.com/drone/envsubst
-CI_REPO_REMOTE=https://github.com/drone/envsubst.git
-CI_REPO_PRIVATE=false
-CI_BUILD_NUMBER=6
-CI_BUILD_CREATED=1486119586
-CI_BUILD_STARTED=1486119585
-CI_BUILD_EVENT=push
-CI_BUILD_LINK=
-CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
-CI_COMMIT_REF=refs/heads/master
-CI_COMMIT_REFSPEC=
+CI_COMMIT_AUTHOR=bradrydzewski
 CI_COMMIT_BRANCH=master
 CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
-CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_PIPELINE_CREATED=1486119586
+CI_PIPELINE_EVENT=push
+CI_PIPELINE_NUMBER=6
+CI_PIPELINE_STARTED=1486119585
+CI_PIPELINE_URL=
+CI_REPO=drone/envsubst
+CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git
+CI_REPO_NAME=drone/envsubst
+CI_REPO_PRIVATE=false
+CI_REPO_URL=https://github.com/drone/envsubst
diff --git a/pipeline/samples/sample_5/pipeline.json b/pipeline/samples/sample_5/pipeline.json
index e898cf083..c720ef268 100644
--- a/pipeline/samples/sample_5/pipeline.json
+++ b/pipeline/samples/sample_5/pipeline.json
@@ -24,7 +24,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -68,7 +68,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHN0ZXAgMSIKZWNobyBzdGVwIDEKCmVjaG8gKyAic2xlZXAgMTAiCnNsZWVwIDEwCgplY2hvICsgImVjaG8gZG9uZSAxIgplY2hvIGRvbmUgMQoK",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
@@ -110,7 +110,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHN0ZXAgMiIKZWNobyBzdGVwIDIKCmVjaG8gKyAic2xlZXAgMTAiCnNsZWVwIDEwCgplY2hvICsgImVjaG8gZG9uZSAyIgplY2hvIGRvbmUgMgoK",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
@@ -158,7 +158,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIEkgc2hvdWxkIGV4ZWN1dGUgbGFzdC4iCmVjaG8gSSBzaG91bGQgZXhlY3V0ZSBsYXN0LgoKZWNobyArICJlY2hvIGFmdGVyIHRoZSBwcmlvciB0d28gc3RlcHMgZmluaXNoIGV4ZWN1dGlvbi4iCmVjaG8gYWZ0ZXIgdGhlIHByaW9yIHR3byBzdGVwcyBmaW5pc2ggZXhlY3V0aW9uLgoK",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
@@ -206,7 +206,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHN0ZXAgMyIKZWNobyBzdGVwIDMKCmVjaG8gKyAic2xlZXAgMTAiCnNsZWVwIDEwCgplY2hvICsgImVjaG8gZG9uZSAzIgplY2hvIGRvbmUgMwoK",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
@@ -248,7 +248,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHN0ZXAgNCIKZWNobyBzdGVwIDQKCmVjaG8gKyAic2xlZXAgMTAiCnNsZWVwIDEwCgplY2hvICsgImVjaG8gZG9uZSA0IgplY2hvIGRvbmUgNAoK",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
diff --git a/pipeline/samples/sample_6/.env b/pipeline/samples/sample_6/.env
index 24093cb5b..a10af139f 100644
--- a/pipeline/samples/sample_6/.env
+++ b/pipeline/samples/sample_6/.env
@@ -1,24 +1,24 @@
-CI_REPO=drone/envsubst
-CI_REPO_NAME=drone/envsubst
-CI_REPO_LINK=https://github.com/drone/envsubst
-CI_REPO_REMOTE=https://github.com/drone/envsubst.git
-CI_REPO_PRIVATE=false
-CI_BUILD_NUMBER=6
-CI_BUILD_CREATED=1486119586
-CI_BUILD_STARTED=1486119585
-CI_BUILD_EVENT=push
-CI_BUILD_LINK=
-CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
-CI_COMMIT_REF=refs/heads/master
-CI_COMMIT_REFSPEC=
+CI_COMMIT_AUTHOR=bradrydzewski
 CI_COMMIT_BRANCH=master
 CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
-CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_PIPELINE_CREATED=1486119586
+CI_PIPELINE_EVENT=push
+CI_PIPELINE_NUMBER=6
+CI_PIPELINE_STARTED=1486119585
+CI_PIPELINE_URL=
+CI_REPO=drone/envsubst
+CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git
+CI_REPO_NAME=drone/envsubst
+CI_REPO_PRIVATE=false
+CI_REPO_URL=https://github.com/drone/envsubst
 
 # custom secrets
 SLACK_WEBHOOK=https://slack.com/hooks/xxxxxxxx/yyyyyyyyy
 
 # registry secrets
 CI_REGISTRY_HOSTNAME=docker.io
-CI_REGISTRY_USERNAME=gordon
 CI_REGISTRY_PASSWORD=password
+CI_REGISTRY_USERNAME=gordon
diff --git a/pipeline/samples/sample_6/pipeline.json b/pipeline/samples/sample_6/pipeline.json
index 6cbcf3675..4fa948602 100644
--- a/pipeline/samples/sample_6/pipeline.json
+++ b/pipeline/samples/sample_6/pipeline.json
@@ -24,7 +24,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -79,7 +79,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJnbyBnZXQgLXQgLi8uLi4iCmdvIGdldCAtdCAuLy4uLgoKZWNobyArICJnbyBidWlsZCIKZ28gYnVpbGQKCmVjaG8gKyAiZ28gdGVzdCAtdiIKZ28gdGVzdCAtdgoK",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
@@ -137,7 +137,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
diff --git a/pipeline/samples/sample_9_cache/.env b/pipeline/samples/sample_9_cache/.env
index 75b20778e..5d630c59b 100644
--- a/pipeline/samples/sample_9_cache/.env
+++ b/pipeline/samples/sample_9_cache/.env
@@ -1,19 +1,18 @@
-CI_REPO=drone/envsubst
-CI_REPO_NAME=drone/envsubst
-CI_REPO_LINK=https://github.com/drone/envsubst
-CI_REPO_REMOTE=https://github.com/drone/envsubst.git
-CI_REPO_PRIVATE=false
-CI_BUILD_NUMBER=6
-CI_BUILD_CREATED=1486119586
-CI_BUILD_STARTED=1486119585
-CI_BUILD_EVENT=push
-CI_BUILD_LINK=
-CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
-CI_COMMIT_REF=refs/heads/master
-CI_COMMIT_REFSPEC=
+CI_COMMIT_AUTHOR=bradrydzewski
 CI_COMMIT_BRANCH=master
 CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
-CI_COMMIT_AUTHOR=bradrydzewski
-
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_PIPELINE_CREATED=1486119586
+CI_PIPELINE_EVENT=push
+CI_PIPELINE_NUMBER=6
+CI_PIPELINE_STARTED=1486119585
+CI_PIPELINE_URL=
+CI_REPO=drone/envsubst
+CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git
+CI_REPO_NAME=drone/envsubst
+CI_REPO_PRIVATE=false
+CI_REPO_URL=https://github.com/drone/envsubst
 CI_VOLUME_CACHE=true
 CI_VOLUME_CACHE_BASE=/cache/drone
diff --git a/pipeline/samples/sample_9_cache/pipeline.json b/pipeline/samples/sample_9_cache/pipeline.json
index dd3319c2c..c14a84571 100644
--- a/pipeline/samples/sample_9_cache/pipeline.json
+++ b/pipeline/samples/sample_9_cache/pipeline.json
@@ -24,7 +24,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -76,7 +76,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
@@ -135,7 +135,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAp1bnNldCBEUk9ORV9ORVRSQ19VU0VSTkFNRQp1bnNldCBEUk9ORV9ORVRSQ19QQVNTV09SRAoKZWNobyArICJucG0gaW5zdGFsbCIKbnBtIGluc3RhbGwKCmVjaG8gKyAibnBtIHRlc3QiCm5wbSB0ZXN0Cgo=",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
@@ -191,7 +191,7 @@
             "CI_REPO": "drone/envsubst",
             "CI_REPO_URL": "https://github.com/drone/envsubst",
             "CI_REPO_NAME": "drone/envsubst",
-            "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git",
+            "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git",
             "CI_SYSTEM": "pipec",
             "CI_SYSTEM_PLATFORM": "linux/amd64",
             "CI_SYSTEM_URL": "https://github.com/cncd/pipec",
diff --git a/pipeline/schema/.woodpecker/test-when.yml b/pipeline/schema/.woodpecker/test-when.yml
index 78f53e790..fc820bcd8 100644
--- a/pipeline/schema/.woodpecker/test-when.yml
+++ b/pipeline/schema/.woodpecker/test-when.yml
@@ -146,4 +146,4 @@ steps:
     commands: echo "test"
     when:
       - event: push
-        evaluate: 'CI_BUILD_EVENT == "push" && CI_REPO == "owner/repo"'
+        evaluate: 'CI_PIPELINE_EVENT == "push" && CI_REPO == "owner/repo"'
diff --git a/pipeline/tracer.go b/pipeline/tracer.go
index 8c4b5a6fe..7c5fd8a2c 100644
--- a/pipeline/tracer.go
+++ b/pipeline/tracer.go
@@ -37,20 +37,9 @@ var DefaultTracer = TraceFunc(func(state *State) error {
 	state.Pipeline.Step.Environment["CI_STEP_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10)
 	state.Pipeline.Step.Environment["CI_STEP_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10)
 
-	// DEPRECATED
-	state.Pipeline.Step.Environment["CI_BUILD_STATUS"] = "success"
-	state.Pipeline.Step.Environment["CI_BUILD_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10)
-	state.Pipeline.Step.Environment["CI_BUILD_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10)
-	state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success"
-	state.Pipeline.Step.Environment["CI_JOB_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10)
-	state.Pipeline.Step.Environment["CI_JOB_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10)
-
 	if state.Pipeline.Error != nil {
 		state.Pipeline.Step.Environment["CI_PIPELINE_STATUS"] = "failure"
 		state.Pipeline.Step.Environment["CI_STEP_STATUS"] = "failure"
-		// DEPRECATED
-		state.Pipeline.Step.Environment["CI_BUILD_STATUS"] = "failure"
-		state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "failure"
 	}
 	return nil
 })