Dockerfile broken due to upstream changes