I separated the failing and working builds, so we can add the changes to the Dockerfiles here.
Dockerfile