Update with streamlined Dockerfile