diff --git a/installer/upstart/honeytrap.conf b/installer/upstart/honeytrap.conf
index 888e0305..745bdd36 100644
--- a/installer/upstart/honeytrap.conf
+++ b/installer/upstart/honeytrap.conf
@@ -2,7 +2,7 @@
 # T-Pot                                                #
 # Honeytrap upstart script                             #
 #                                                      #
-# v16.03.1 by mo, DTAG, 2015-12-11                     #
+# v16.03.2 by mo, DTAG, 2015-12-15                     #
 ########################################################
 
 description "Honeytrap"
@@ -16,14 +16,18 @@ pre-start script
   if [ "$myCID" != "" ];
     then docker rm -v $myCID;
   fi
+  # Remove any data from previous container
+  rm -rf /data/honeytrap/*
+  mkdir -p /data/honeytrap/log/ /data/honeytrap/attacks/ /data/honeytrap/downloads/
+  chmod 760 /data/honeytrap/ -R
+  chown tpot:tpot /data/honeytrap/ -R
   /sbin/iptables -w -A INPUT -p tcp --syn -m state --state NEW -m multiport ! --dports 21,22,42,80,135,443,445,1433,3306,5060,5061,64295,64296 -j NFQUEUE
 end script
 script
-  # Delayed start to avoid rapid respawning
-  sleep $(((RANDOM % 5)+5))
-  /usr/bin/docker run --name honeytrap --cap-add=NET_ADMIN --net=host --rm=true -v /data/ews:/data/ews dtagdevsec/honeytrap:latest1603
+  /usr/bin/docker run --name honeytrap --cap-add=NET_ADMIN --net=host --rm=true -v /data/honeytrap:/data/honeytrap -v /data/ews:/data/ews dtagdevsec/honeytrap:latest1603
 end script
 post-start script
+  # Delay next start to avoid rapid respawning
   sleep $(((RANDOM % 5)+5))
 end script
 post-stop script