Fixed on deploy and create container scripts