diff --git a/build/deb_server_manager_setup.sh b/build/deb_server_manager_setup.sh
old mode 100644
new mode 100755
index e22ad9870..7fce665b0
--- a/build/deb_server_manager_setup.sh
+++ b/build/deb_server_manager_setup.sh
@@ -51,11 +51,19 @@ function ansible_and_docker_configs()
   sed -i "/ssh_args/c\ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o UserKnownHostsFile=/dev/null" /etc/ansible/ansible.cfg
 
   ansible-galaxy install -r /opt/contrail/server_manager/ansible/playbooks/requirements.yml
-  echo "Starting docker registry"
+  echo "Starting docker"
 
   echo "DOCKER_OPTS=\"--insecure-registry $HOSTIP:5100\"" >> /etc/default/docker
   service docker restart >> $log_file 2>&1
-  docker run -d -p 5100:5000 --restart=always --name registry registry:2
+
+  cur_name=`docker ps | grep registry | awk '{print $12}'`
+
+  if [ $cur_name='registry' ]; then
+      echo "Docker registry already running"
+  else
+      echo "Starting docker registry"
+      docker run -d -p 5100:5000 --restart=always --name registry registry:2
+  fi
 
   #echo "Cleaning up docker images"
   #docker rmi -f `docker images -a | grep -v registry | grep -v REPOSITORY | awk '{print $3}'`