Make AWS machines convergent

I don't think so, terminate should complete as long as it doesn't throw an error