Fixing version and upgrade script to match CR versions