Update to Dockerfile 3