Added additional check to ami stack name
Removed hard coded havoc