Updated the template to prevent mount race condition