diff --git a/Docker/bootstrap b/Docker/bootstrap
index d1deb88b..8697b868 100644
--- a/Docker/bootstrap
+++ b/Docker/bootstrap
@@ -9,6 +9,20 @@ if [ ! -f /firstrun.pass ]; then
     echo "[...] Restarting server in detached mode..."
 else
     cd /CoffeeHousePy
+
+    echo "### Checking for updates ###"
+    git remote update
+
+    UPSTREAM=${1:-'@{u}'}
+    LOCAL=$(git rev-parse @)
+    BASE=$(git merge-base @ "$UPSTREAM")
+
+    if [ $LOCAL = $BASE ]; then
+        echo "### Applying update ###"
+        git pull
+        make clean install
+    fi
+
     echo "### Starting CoffeeHouse-LangDetect ###"
     make start_langdetect &
     echo "### Starting CoffeeHouse-SpamDetect ###"