diff --git a/iso/installer/install.sh b/iso/installer/install.sh
index 657a33e5..34841d1a 100755
--- a/iso/installer/install.sh
+++ b/iso/installer/install.sh
@@ -329,15 +329,16 @@ apt-get autoremove -y 2>&1 | dialog --title "[ Pulling updates ]" $myPROGRESSBOX
 
 # Installing docker-compose, wetty, ctop, elasticdump, tpot
 pip install --upgrade pip 2>&1 | dialog --title "[ Installing pip ]" $myPROGRESSBOXCONF
-pip install docker-compose==1.12.0 2>&1 | dialog --title "[ Installing docker-compose ]" $myPROGRESSBOXCONF
-pip install elasticsearch-curator==5.1.1 2>&1 | dialog --title "[ Installing elasticsearch-curator ]" $myPROGRESSBOXCONF
+pip install docker-compose==1.16.1 2>&1 | dialog --title "[ Installing docker-compose ]" $myPROGRESSBOXCONF
+pip install elasticsearch-curator==5.2.0 2>&1 | dialog --title "[ Installing elasticsearch-curator ]" $myPROGRESSBOXCONF
 ln -s /usr/bin/nodejs /usr/bin/node 2>&1 | dialog --title "[ Installing wetty ]" $myPROGRESSBOXCONF
 npm install https://github.com/t3chn0m4g3/wetty -g 2>&1 | dialog --title "[ Installing wetty ]" $myPROGRESSBOXCONF
 npm install https://github.com/t3chn0m4g3/elasticsearch-dump -g 2>&1 | dialog --title "[ Installing elasticsearch-dump ]" $myPROGRESSBOXCONF
 wget https://github.com/bcicen/ctop/releases/download/v0.6.1/ctop-0.6.1-linux-amd64 -O ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF
-git clone https://github.com/dtag-dev-sec/tpotce -b autoupdate /opt/tpot 2>&1 | dialog --title "[ Cloning T-Pot ]" $myPROGRESSBOXCONF
 mv ctop /usr/bin/ 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF
 chmod +x /usr/bin/ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF
+git clone https://github.com/dtag-dev-sec/tpotce -b autoupdate /opt/tpot 2>&1 | dialog --title "[ Cloning T-Pot ]" $myPROGRESSBOXCONF
+
 # Let's add a new user
 addgroup --gid 2000 tpot 2>&1 | dialog --title "[ Adding new user ]" $myPROGRESSBOXCONF
 adduser --system --no-create-home --uid 2000 --disabled-password --disabled-login --gid 2000 tpot 2>&1 | dialog --title "[ Adding new user ]" $myPROGRESSBOXCONF
diff --git a/update.sh b/update.sh
new file mode 100755
index 00000000..2aac0552
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Got root?
+myWHOAMI=$(whoami)
+if [ "$myWHOAMI" != "root" ]
+  then
+    echo "Need to run as root ..."
+    sudo ./$0
+    exit
+fi
+
+# Only run with command switch
+if [ "$1" != "-y" ]; then
+  echo "This script will update / upgrade all T-Pot related scripts, tools and packages" 
+  echo "Some of your changes might be overwritten, so make sure to save your work"
+  echo "This feature is still experimental, run with \"-y\" switch" 
+  echo
+  exit
+fi
+
+echo "Now running T-Pot update script..."
+
+echo
+echo "### Now stopping T-Pot"
+systemctl stop tpot
+
+echo
+echo "### Now upgrading packages"
+apt-get autoclean -y
+apt-get autoremove -y
+apt-get update
+apt-get dist-upgrade -y
+pip install --upgrade pip
+pip install docker-compose==1.16.1
+pip install elasticsearch-curator==5.2.0
+ln -s /usr/bin/nodejs /usr/bin/node 2>&1
+npm install https://github.com/t3chn0m4g3/wetty -g
+npm install https://github.com/t3chn0m4g3/elasticsearch-dump -g
+wget https://github.com/bcicen/ctop/releases/download/v0.6.1/ctop-0.6.1-linux-amd64 -O /usr/bin/ctop && chmod +x /usr/bin/ctop
+
+echo
+echo "### Now pulling T-Pot Repo"
+git pull
+
+echo
+echo "### Now replacing T-Pot related config files on host"
+cp    host/etc/systemd/* /etc/systemd/system/
+cp    host/etc/issue /etc/
+cp -R host/etc/nginx/ssl /etc/nginx/
+cp    host/etc/nginx/tpotweb.conf /etc/nginx/sites-available/
+cp    host/etc/nginx/nginx.conf /etc/nginx/nginx.conf
+cp    host/usr/share/nginx/html/* /usr/share/nginx/html/
+
+echo
+echo "### Now reloading systemd, nginx"
+systemctl daemon-reload
+nginx -s reload
+
+echo
+echo "### Now restarting wetty, nginx, docker"
+systemctl restart wetty.service
+systemctl restart nginx.service
+systemctl restart docker.service
+
+echo
+echo "### Now pulling latest docker images"
+docker-compose -f /opt/tpot/etc/tpot.yml pull
+
+echo
+echo "### Now starting T-Pot service"
+systemctl start tpot
+
+echo
+echo "### Done. If all services run correctly (dps.sh) you should perform a reboot."