Hopefully fixing the dockerfile a bit more...