instances not stopping in time, causing failed jobs

Change-Id: I7efa61312811a328d51db16ba65d27fe98827d93