diff --git a/agent/agent.go b/agent/agent.go
index 9a63fcf4c..e441608be 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -261,6 +261,12 @@ func toEnv(w *queue.Work) map[string]string {
 		"DRONE_BUILD_CREATED":        fmt.Sprintf("%d", w.Build.Created),
 		"DRONE_BUILD_STARTED":        fmt.Sprintf("%d", w.Build.Started),
 		"DRONE_BUILD_FINISHED":       fmt.Sprintf("%d", w.Build.Finished),
+		"DRONE_JOB_NUMBER":           fmt.Sprintf("%d", w.Job.Number),
+		"DRONE_JOB_STATUS":           w.Job.Status,
+		"DRONE_JOB_ERROR":            w.Job.Error,
+		"DRONE_JOB_EXIT_CODE":        fmt.Sprintf("%d", w.Job.ExitCode),
+		"DRONE_JOB_STARTED":          fmt.Sprintf("%d", w.Job.Started),
+		"DRONE_JOB_FINISHED":         fmt.Sprintf("%d", w.Job.Finished),
 		"DRONE_YAML_VERIFIED":        fmt.Sprintf("%v", w.Verified),
 		"DRONE_YAML_SIGNED":          fmt.Sprintf("%v", w.Signed),
 		"DRONE_BRANCH":               w.Build.Branch,
diff --git a/drone/server.go b/drone/server.go
index f94c6afaf..f930ae373 100644
--- a/drone/server.go
+++ b/drone/server.go
@@ -124,6 +124,16 @@ var serverCmd = cli.Command{
 				"read:org",
 			},
 		},
+		cli.StringFlag{
+			EnvVar: "DRONE_GITHUB_GIT_USERNAME",
+			Name:   "github-git-username",
+			Usage:  "github machine user username",
+		},
+		cli.StringFlag{
+			EnvVar: "DRONE_GITHUB_GIT_PASSWORD",
+			Name:   "github-git-password",
+			Usage:  "github machine user password",
+		},
 		cli.BoolTFlag{
 			EnvVar: "DRONE_GITHUB_MERGE_REF",
 			Name:   "github-merge-ref",