diff --git a/.drone.yml b/.drone.yml
index d8de49456ada4..a61cfcd495725 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -911,8 +911,6 @@ clone:
   disable: true
 depends_on:
 - clean-up-previous-build
-concurrency:
-  limit: 1
 steps:
 - name: Check out Teleport
   commands:
@@ -18260,6 +18258,6 @@ volumes:
   temp: {}
 ---
 kind: signature
-hmac: 557686dce15dbf97c5dfdeae90f596e9cb38f17dd343600b81dcdd46f3d873ab
+hmac: 403e9040b75b1594e85c110e5fd3dfceed2f6e8f99e8ee1bec08af51d5ffc5ba
 
 ...
diff --git a/Makefile b/Makefile
index 2fbd0bea62b35..bf4125a8117ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1159,10 +1159,12 @@ init-submodules-e:
 # dronegen generates .drone.yml config
 #
 #    Usage:
-#    - install github.com/gravitational/tdr
-#    - set $DRONE_TOKEN and $DRONE_SERVER (https://drone.platform.teleport.sh)
+#    - install drone cli
+#    - set $DRONE_TOKEN
 #    - tsh login --proxy=platform.teleport.sh
 #    - tsh app login drone
+#    - tsh proxy app drone
+#    - export DRONE_SERVER=https://localhost:$TSH_PROXY_PORT
 #    - make dronegen
 .PHONY: dronegen
 dronegen:
diff --git a/dronegen/drone_cli.go b/dronegen/drone_cli.go
index 4483f57e0082a..6cc349fb1a3d5 100644
--- a/dronegen/drone_cli.go
+++ b/dronegen/drone_cli.go
@@ -20,9 +20,9 @@ import (
 	"os/exec"
 )
 
-func checkTDR() error {
-	if _, err := exec.LookPath("tdr"); err != nil {
-		return fmt.Errorf("can't find tdr in $PATH: %w; get it from https://github.com/gravitational/tdr/", err)
+func checkDrone() error {
+	if _, err := exec.LookPath("drone"); err != nil {
+		return fmt.Errorf("can't find drone in $PATH: %w; get it from https://docs.drone.io/cli/install/ or `brew install drone`", err)
 	}
 	if os.Getenv("DRONE_SERVER") == "" || os.Getenv("DRONE_TOKEN") == "" {
 		return fmt.Errorf("$DRONE_SERVER and/or $DRONE_TOKEN env vars not set; get them at https://drone.platform.teleport.sh/account")
@@ -31,7 +31,7 @@ func checkTDR() error {
 }
 
 func signDroneConfig() error {
-	out, err := exec.Command("tdr", "sign", "gravitational/teleport", "--save").CombinedOutput()
+	out, err := exec.Command("drone", "sign", "gravitational/teleport", "--save").CombinedOutput()
 	if err != nil {
 		if len(out) > 0 {
 			err = fmt.Errorf("drone signing failed: %v\noutput:\n%s", err, out)
diff --git a/dronegen/main.go b/dronegen/main.go
index 6d2b2acd63cd3..517b80fd518e4 100644
--- a/dronegen/main.go
+++ b/dronegen/main.go
@@ -23,7 +23,7 @@ import (
 )
 
 func main() {
-	if err := checkTDR(); err != nil {
+	if err := checkDrone(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
diff --git a/dronegen/windows.go b/dronegen/windows.go
index 4ffef1733c88b..82595c6b3c241 100644
--- a/dronegen/windows.go
+++ b/dronegen/windows.go
@@ -41,7 +41,6 @@ func windowsTagPipeline() pipeline {
 
 	p.DependsOn = []string{tagCleanupPipelineName}
 	p.Trigger = triggerTag
-	p.Concurrency.Limit = 1
 	p.Steps = []step{
 		cloneWindowsRepositoriesStep(p.Workspace.Path),
 		updateWindowsSubreposStep(p.Workspace.Path),