diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc7921b..4d5e59a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## 1.6.0
+### Added
+- experimental support for remote debugging with tmate, disabled by default
+
 ### Fixed
 - exit code 78 not properly exiting early when pipeline has services (from runner-go)
 
diff --git a/command/compile.go b/command/compile.go
index f406ee6..6ce7956 100644
--- a/command/compile.go
+++ b/command/compile.go
@@ -195,7 +195,7 @@ func registerCompile(app *kingpin.Application) {
 		StringVar(&c.Config)
 
 	cmd.Flag("tmate-image", "tmate docker image").
-		Default("drone/drone-runner-docker:latest").
+		Default("drone/drone-runner-docker:1").
 		StringVar(&c.Tmate.Image)
 
 	cmd.Flag("tmate-enabled", "tmate enabled").
diff --git a/command/daemon/config.go b/command/daemon/config.go
index ebfcd8e..a6d7400 100644
--- a/command/daemon/config.go
+++ b/command/daemon/config.go
@@ -108,8 +108,8 @@ type Config struct {
 	}
 
 	Tmate struct {
-		Enabled bool   `envconfig:"DRONE_TMATE_ENABLED" default:"true"`
-		Image   string `envconfig:"DRONE_TMATE_IMAGE"   default:"drone/drone-runner-docker:latest"`
+		Enabled bool   `envconfig:"DRONE_TMATE_ENABLED" default:"false"`
+		Image   string `envconfig:"DRONE_TMATE_IMAGE"   default:"drone/drone-runner-docker:1"`
 	}
 }
 
diff --git a/command/exec.go b/command/exec.go
index e96af45..f7655b5 100644
--- a/command/exec.go
+++ b/command/exec.go
@@ -330,7 +330,7 @@ func registerExec(app *kingpin.Application) {
 		StringVar(&c.Config)
 
 	cmd.Flag("tmate-image", "tmate docker image").
-		Default("drone/drone-runner-docker:latest").
+		Default("drone/drone-runner-docker:1").
 		StringVar(&c.Tmate.Image)
 
 	cmd.Flag("tmate-enabled", "tmate enabled").