ECMS-4304 [SANITIZATION] cleanup template and added 2 new namespace