diff --git a/command/daemon/config.go b/command/daemon/config.go
index af7131c..c56f3a1 100644
--- a/command/daemon/config.go
+++ b/command/daemon/config.go
@@ -104,6 +104,7 @@ type Config struct {
 // legacy environment variables. the key is the legacy
 // variable name, and the value is the new variable name.
 var legacy = map[string]string{
+	"DRONE_MACHINE": "DRONE_RUNNER_NAME",
 	// registry settings
 	"DRONE_REGISTRY_ENDPOINT":    "DRONE_REGISTRY_PLUGIN_ENDPOINT",
 	"DRONE_REGISTRY_SECRET":      "DRONE_REGISTRY_PLUGIN_SECRET",
diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64
index a92889b..c662eba 100644
--- a/docker/Dockerfile.linux.amd64
+++ b/docker/Dockerfile.linux.amd64
@@ -6,9 +6,11 @@ EXPOSE 3000
 
 ENV GODEBUG netdns=go
 ENV DRONE_PLATFORM_OS linux
-ENV DRONE_PLATFORM_ARCH arm64
+ENV DRONE_PLATFORM_ARCH amd64
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 
-ADD release/linux/arm64/drone-runner-docker /bin/
+LABEL com.centurylinklabs.watchtower.stop-signal="SIGINT"
+
+ADD release/linux/amd64/drone-runner-docker /bin/
 ENTRYPOINT ["/bin/drone-runner-docker"]
diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm
index 64b5378..e46adf5 100644
--- a/docker/Dockerfile.linux.arm
+++ b/docker/Dockerfile.linux.arm
@@ -10,5 +10,7 @@ ENV DRONE_PLATFORM_ARCH arm
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 
+LABEL com.centurylinklabs.watchtower.stop-signal="SIGINT"
+
 ADD release/linux/arm/drone-runner-docker /bin/
 ENTRYPOINT ["/bin/drone-runner-docker"]
diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64
index a92889b..450e383 100644
--- a/docker/Dockerfile.linux.arm64
+++ b/docker/Dockerfile.linux.arm64
@@ -10,5 +10,7 @@ ENV DRONE_PLATFORM_ARCH arm64
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 
+LABEL com.centurylinklabs.watchtower.stop-signal="SIGINT"
+
 ADD release/linux/arm64/drone-runner-docker /bin/
 ENTRYPOINT ["/bin/drone-runner-docker"]