chore(wait): Adjust creation of incidents