Partial fix from !5689 (closed)
Only change docker image for package building, wait to see for the rest.