Adjust Dockerfiles for best practices