diff --git a/docker/Dockerfile b/docker/docker/Dockerfile.linux.amd64
similarity index 100%
rename from docker/Dockerfile
rename to docker/docker/Dockerfile.linux.amd64
diff --git a/docker/Dockerfile.arm b/docker/docker/Dockerfile.linux.arm
similarity index 100%
rename from docker/Dockerfile.arm
rename to docker/docker/Dockerfile.linux.arm
diff --git a/docker/Dockerfile.arm64 b/docker/docker/Dockerfile.linux.arm64
similarity index 100%
rename from docker/Dockerfile.arm64
rename to docker/docker/Dockerfile.linux.arm64
diff --git a/docker/ecr/Dockerfile.arm b/docker/ecr/Dockerfile.arm
deleted file mode 100644
index b36ba35..0000000
--- a/docker/ecr/Dockerfile.arm
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM plugins/docker:linux-arm
-
-ADD release/linux/arm64/drone-docker-ecr /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker-ecr"]
diff --git a/docker/ecr/Dockerfile b/docker/ecr/Dockerfile.linux.amd64
similarity index 100%
rename from docker/ecr/Dockerfile
rename to docker/ecr/Dockerfile.linux.amd64
diff --git a/docker/ecr/Dockerfile.arm64 b/docker/ecr/Dockerfile.linux.arm64
similarity index 100%
rename from docker/ecr/Dockerfile.arm64
rename to docker/ecr/Dockerfile.linux.arm64
diff --git a/docker/gcr/Dockerfile.arm b/docker/gcr/Dockerfile.arm
deleted file mode 100644
index 5d45caf..0000000
--- a/docker/gcr/Dockerfile.arm
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM plugins/docker:linux-arm
-
-ADD release/linux/arm64/drone-docker-gcr /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker-gcr"]
diff --git a/docker/gcr/Dockerfile b/docker/gcr/Dockerfile.linux.amd64
similarity index 100%
rename from docker/gcr/Dockerfile
rename to docker/gcr/Dockerfile.linux.amd64
diff --git a/docker/gcr/Dockerfile.arm64 b/docker/gcr/Dockerfile.linux.arm64
similarity index 100%
rename from docker/gcr/Dockerfile.arm64
rename to docker/gcr/Dockerfile.linux.arm64
diff --git a/docker/heroku/Dockerfile.arm b/docker/heroku/Dockerfile.arm
deleted file mode 100644
index e521b02..0000000
--- a/docker/heroku/Dockerfile.arm
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM plugins/docker:linux-arm
-
-ADD release/linux/arm/drone-docker-heroku /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker-heroku"]
diff --git a/docker/heroku/Dockerfile b/docker/heroku/Dockerfile.linux.amd64
similarity index 100%
rename from docker/heroku/Dockerfile
rename to docker/heroku/Dockerfile.linux.amd64
diff --git a/docker/heroku/Dockerfile.arm64 b/docker/heroku/Dockerfile.linux.arm64
similarity index 100%
rename from docker/heroku/Dockerfile.arm64
rename to docker/heroku/Dockerfile.linux.arm64