Add tags and increase the timeout for the wait condition.