Refactor hard-coded postfix versions