Update scripts to new tap syntax