Merge "Remove hardcode for tempest version"