Merge "Fixes Docker image upload for master/rocky"