Merge "Fix the new base image to support helm cli ssh login"