Merge "Fixes building docker images"