diff --git a/Dockerfile.agent b/Dockerfile.agent
index 96198cca..5c4c752b 100644
--- a/Dockerfile.agent
+++ b/Dockerfile.agent
@@ -1,11 +1,10 @@
 # docker build --rm -f Dockerfile.agent -t drone/agent .
 
-EXPOSE 3000
-
 FROM centurylink/ca-certs
 ENV GODEBUG=netdns=go
 ADD release/drone-agent /bin/
 
+EXPOSE 3000
 HEALTHCHECK CMD ["/bin/drone-agent", "ping"]
 
 ENTRYPOINT ["/bin/drone-agent"]
diff --git a/Dockerfile.agent.linux.arm b/Dockerfile.agent.linux.arm
index 6a38a54a..f045a201 100644
--- a/Dockerfile.agent.linux.arm
+++ b/Dockerfile.agent.linux.arm
@@ -3,4 +3,7 @@ ENV GODEBUG=netdns=go
 ENV DRONE_PLATFORM=linux/arm
 ADD release/linux/arm/drone-agent /bin/
 
+EXPOSE 3000
+HEALTHCHECK CMD ["/bin/drone-agent", "ping"]
+
 ENTRYPOINT ["/bin/drone-agent"]
diff --git a/Dockerfile.agent.linux.arm64 b/Dockerfile.agent.linux.arm64
index bf53a00c..332014da 100644
--- a/Dockerfile.agent.linux.arm64
+++ b/Dockerfile.agent.linux.arm64
@@ -3,4 +3,7 @@ ENV GODEBUG=netdns=go
 ENV DRONE_PLATFORM=linux/arm64
 ADD release/linux/arm64/drone-agent /bin/
 
+EXPOSE 3000
+HEALTHCHECK CMD ["/bin/drone-agent", "ping"]
+
 ENTRYPOINT ["/bin/drone-agent"]