Add steps after the client install
Fix variable scope, remove dependence on aws