Make docker files more uniform