diff --git a/cmd/drone-docker-ecr/main.go b/cmd/drone-ecr/main.go
similarity index 100%
rename from cmd/drone-docker-ecr/main.go
rename to cmd/drone-ecr/main.go
diff --git a/cmd/drone-docker-ecr/main_test.go b/cmd/drone-ecr/main_test.go
similarity index 100%
rename from cmd/drone-docker-ecr/main_test.go
rename to cmd/drone-ecr/main_test.go
diff --git a/cmd/drone-docker-gcr/main.go b/cmd/drone-gcr/main.go
similarity index 100%
rename from cmd/drone-docker-gcr/main.go
rename to cmd/drone-gcr/main.go
diff --git a/cmd/drone-docker-heroku/main.go b/cmd/drone-heroku/main.go
similarity index 100%
rename from cmd/drone-docker-heroku/main.go
rename to cmd/drone-heroku/main.go
diff --git a/docker/ecr/Dockerfile b/docker/ecr/Dockerfile
index e50563e..d941387 100644
--- a/docker/ecr/Dockerfile
+++ b/docker/ecr/Dockerfile
@@ -1,6 +1,4 @@
-# docker build --rm -f docker/ecr/Dockerfile -t plugins/ecr .
-
 FROM plugins/docker:latest
 
-ADD release/linux/amd64/drone-docker-ecr /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker-ecr"]
+ADD release/linux/amd64/drone-ecr /bin/
+ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-ecr"]
diff --git a/docker/ecr/Dockerfile.arm64 b/docker/ecr/Dockerfile.arm64
index 600273c..83ed26a 100644
--- a/docker/ecr/Dockerfile.arm64
+++ b/docker/ecr/Dockerfile.arm64
@@ -1,4 +1,4 @@
 FROM plugins/docker:linux-arm64
 
-ADD release/linux/arm64/drone-docker-ecr /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker-ecr"]
\ No newline at end of file
+ADD release/linux/arm64/drone-ecr /bin/
+ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-ecr"]
diff --git a/docker/gcr/Dockerfile b/docker/gcr/Dockerfile
index 92d562d..e982ef9 100644
--- a/docker/gcr/Dockerfile
+++ b/docker/gcr/Dockerfile
@@ -1,6 +1,4 @@
-# docker build --rm -f docker/gcr/Dockerfile -t plugins/gcr .
-
 FROM plugins/docker:latest
 
-ADD release/linux/amd64/drone-docker-gcr /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker-gcr"]
+ADD release/linux/amd64/drone-gcr /bin/
+ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-gcr"]
diff --git a/docker/gcr/Dockerfile.arm64 b/docker/gcr/Dockerfile.arm64
index 49c049b..396e373 100644
--- a/docker/gcr/Dockerfile.arm64
+++ b/docker/gcr/Dockerfile.arm64
@@ -1,4 +1,4 @@
 FROM plugins/docker:linux-arm64
 
-ADD release/linux/arm64/drone-docker-gcr /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker-gcr"]
+ADD release/linux/arm64/drone-gcr /bin/
+ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-gcr"]
diff --git a/docker/heroku/Dockerfile b/docker/heroku/Dockerfile
index 6f53c65..c06cdb6 100644
--- a/docker/heroku/Dockerfile
+++ b/docker/heroku/Dockerfile
@@ -1,6 +1,4 @@
-# docker build --rm -f docker/heroku/Dockerfile -t plugins/heroku .
-
 FROM plugins/docker:latest
 
-ADD release/linux/amd64/drone-docker-heroku /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker-heroku"]
+ADD release/linux/amd64/drone-heroku /bin/
+ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-heroku"]
diff --git a/docker/heroku/Dockerfile.arm64 b/docker/heroku/Dockerfile.arm64
index c9e9fe8..e49f7c6 100644
--- a/docker/heroku/Dockerfile.arm64
+++ b/docker/heroku/Dockerfile.arm64
@@ -1,4 +1,4 @@
 FROM plugins/docker:linux-arm64
 
-ADD release/linux/arm64/drone-docker-heroku /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker-heroku"]
+ADD release/linux/arm64/drone-heroku /bin/
+ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-heroku"]