More Dockerfile updates