more fixes to support quay.io build