diff --git a/cmd/drone-agent/main.go b/cmd/drone-agent/main.go
index 2db7a86b1..c506a4da5 100644
--- a/cmd/drone-agent/main.go
+++ b/cmd/drone-agent/main.go
@@ -40,71 +40,71 @@ func main() {
 	}
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
-			EnvVar: "DRONE_SERVER",
+			EnvVar: "DRONE_SERVER,WOODPECKER_SERVER",
 			Name:   "server",
 			Usage:  "drone server address",
 			Value:  "localhost:9000",
 		},
 		cli.StringFlag{
-			EnvVar: "DRONE_USERNAME",
+			EnvVar: "DRONE_USERNAME,WOODPECKER_USERNAME",
 			Name:   "username",
 			Usage:  "drone auth username",
 			Value:  "x-oauth-basic",
 		},
 		cli.StringFlag{
-			EnvVar: "DRONE_PASSWORD,DRONE_SECRET",
+			EnvVar: "DRONE_PASSWORD,DRONE_SECRET,WOODPECKER_PASSWORD,WOODPECKER_SECRET",
 			Name:   "password",
 			Usage:  "server-agent shared password",
 		},
 		cli.BoolTFlag{
-			EnvVar: "DRONE_DEBUG",
+			EnvVar: "DRONE_DEBUG,WOODPECKER_DEBUG",
 			Name:   "debug",
 			Usage:  "enable agent debug mode",
 		},
 		cli.BoolFlag{
-			EnvVar: "DRONE_DEBUG_PRETTY",
+			EnvVar: "DRONE_DEBUG_PRETTY,WOODPECKER_DEBUG_PRETTY",
 			Name:   "pretty",
 			Usage:  "enable pretty-printed debug output",
 		},
 		cli.BoolTFlag{
-			EnvVar: "DRONE_DEBUG_NOCOLOR",
+			EnvVar: "DRONE_DEBUG_NOCOLOR,WOODPECKER_DEBUG_NOCOLOR",
 			Name:   "nocolor",
 			Usage:  "disable colored debug output",
 		},
 		cli.StringFlag{
-			EnvVar: "DRONE_HOSTNAME,HOSTNAME",
+			EnvVar: "DRONE_HOSTNAME,HOSTNAME,WOODPECKER_HOSTNAME,HOSTNAME",
 			Name:   "hostname",
 			Usage:  "agent hostname",
 		},
 		cli.StringFlag{
-			EnvVar: "DRONE_PLATFORM",
+			EnvVar: "DRONE_PLATFORM,WOODPECKER_PLATFORM",
 			Name:   "platform",
 			Usage:  "restrict builds by platform conditions",
 			Value:  "linux/amd64",
 		},
 		cli.StringFlag{
-			EnvVar: "DRONE_FILTER",
+			EnvVar: "DRONE_FILTER,WOODPECKER_FILTER",
 			Name:   "filter",
 			Usage:  "filter expression to restrict builds by label",
 		},
 		cli.IntFlag{
-			EnvVar: "DRONE_MAX_PROCS",
+			EnvVar: "DRONE_MAX_PROCS,WOODPECKER_MAX_PROCS",
 			Name:   "max-procs",
 			Usage:  "agent parallel builds",
 			Value:  1,
 		},
 		cli.BoolTFlag{
-			EnvVar: "DRONE_HEALTHCHECK",
+			EnvVar: "DRONE_HEALTHCHECK,WOODPECKER_HEALTHCHECK",
 			Name:   "healthcheck",
 			Usage:  "enable healthcheck endpoint",
 		},
 		cli.DurationFlag{
-			EnvVar: "DRONE_KEEPALIVE_TIME",
+			EnvVar: "DRONE_KEEPALIVE_TIME,WOODPECKER_KEEPALIVE_TIME",
 			Name:   "keepalive-time",
 			Usage:  "after a duration of this time of no activity, the agent pings the server to check if the transport is still alive",
 		},
 		cli.DurationFlag{
-			EnvVar: "DRONE_KEEPALIVE_TIMEOUT",
+			EnvVar: "DRONE_KEEPALIVE_TIMEOUT,WOODPECKER_KEEPALIVE_TIMEOUT",
 			Name:   "keepalive-timeout",
 			Usage:  "after pinging for a keepalive check, the agent waits for a duration of this time before closing the connection if no activity",
 			Value:  time.Second * 20,
@@ -112,12 +112,12 @@ func main() {
 		cli.BoolFlag{
 			Name:   "secure-grpc",
 			Usage:  "should the connection to DRONE_SERVER be made using a secure transport",
-			EnvVar: "DRONE_GRPC_SECURE",
+			EnvVar: "DRONE_GRPC_SECURE,WOODPECKER_GRPC_SECURE",
 		},
 		cli.BoolTFlag{
 			Name:   "skip-insecure-grpc",
 			Usage:  "should the grpc server certificate be verified, only valid when DRONE_GRPC_SECURE is true",
-			EnvVar: "DRONE_GRPC_VERIFY",
+			EnvVar: "DRONE_GRPC_VERIFY,WOODPECKER_GRPC_VERIFY",
 		},
 	}