Fixed users for deployment scripts

Change-Id: I549a3d93ab85b87da34996d2d66a8469913d8d01