diff --git a/Dockerfile b/Dockerfile
index 58c3a38b..0d344268 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,8 @@ RUN test -e /go/bin/headscale
 # Production image
 FROM gcr.io/distroless/base-debian11
 
-COPY --from=build /go/bin/headscale /headscale
+COPY --from=build /go/bin/headscale /bin/headscale
 ENV TZ UTC
-ENV PATH /
 
 EXPOSE 8080/tcp
 CMD ["headscale"]
diff --git a/Dockerfile.debug b/Dockerfile.debug
index 2d99faec..320b5c93 100644
--- a/Dockerfile.debug
+++ b/Dockerfile.debug
@@ -14,9 +14,8 @@ RUN test -e /go/bin/headscale
 # Debug image
 FROM gcr.io/distroless/base-debian11:debug
 
-COPY --from=build /go/bin/headscale /headscale
+COPY --from=build /go/bin/headscale /bin/headscale
 ENV TZ UTC
-ENV PATH="/:$PATH" 
 
 # Need to reset the entrypoint or everything will run as a busybox script
 ENTRYPOINT []