Adapt arch string to versioning scheme changes (>= 17.x)