Make Dockerfile more future-proof