diff --git a/upgrade-container.sh b/upgrade-container.sh
index f798685..09c639d 100755
--- a/upgrade-container.sh
+++ b/upgrade-container.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 TMPDIR="/tmp/initdata"
 XOSDIR="/home/ubuntu/xos"
@@ -9,9 +9,17 @@
 XOS=$( docker ps|grep "xos:latest"|awk '{print $NF}' )
 docker exec $XOS /opt/xos/scripts/opencloud dumpdata
 docker cp $XOS:/opt/xos_backups/dumpdata-latest.json $TMPDIR
+docker cp $XOS:/opt/xos/xos_config $TMPDIR
 cp $TMPDIR/*.json $XOSDIR/xos/core/fixtures/initial_data.json
+cp $TMPDIR/xos_config $XOSDIR/xos/
 
 git pull
+
+if [[ $? != 0 ]]; then
+    echo "git pull" failed
+    exit
+fi
+
 docker build -t xos .
 
 docker stop $XOS