Merge "tempest: use tempest img"