MOdify spec and update HCatalog creation
Update few paths