Reconfigure namespace setup in deployment script (#2071)

Reconfigure namespace setup in deployment script (#2071) #149