Shutdown and deploy actions improvement