diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index 2d26cb68..9763c694 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -19,6 +19,7 @@ x-shared-secret-environment:
     - ../secrets/sendgrid.env
   volumes:
     - /tmp:/tmp
+  restart: always
 
 services:
 
diff --git a/docker/setup/vm.sh b/docker/setup/vm.sh
index 1eca127f..5cf4cba2 100755
--- a/docker/setup/vm.sh
+++ b/docker/setup/vm.sh
@@ -2,7 +2,8 @@
 
 if [[ "$1" != "install" ]]; then
   cd /home/opwen/opwen-cloudserver || exit 99
-  git pull || exit 1
+  git fetch origin --prune || exit 1
+  git reset --hard origin/master || exit 1
   cd - || exit 99
   docker-compose -f /home/opwen/opwen-cloudserver/docker/docker-compose.prod.yml pull || exit 2
   docker-compose -f /home/opwen/opwen-cloudserver/docker/docker-compose.prod.yml up -d || exit 3