Fixed deployment scripts

Change-Id: I4da65dc7972f108c44f8041f20df78c89bd6608d