diff --git a/README.md b/README.md
index 6581e503..83558256 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,12 @@ You will need to set a new password after first login.
 
 All honeypot services are started automatically. 
 
-![T-Pot 16.03 architecture](T-Pot16.03.png)
+# T-Pot Architecture
+
+![T-Pot 16.03 architecture](doc/architecture.png)
+
+# T-Pot Dashboard
+
+![T-Pot Dashboard](doc/dashboard.png)
 
 For further information and a more in depth installation instruction, visit [T-Pot's website](http://dtag-dev-sec.github.io/).
diff --git a/doc/architecture.png b/doc/architecture.png
new file mode 100644
index 00000000..42a1f153
Binary files /dev/null and b/doc/architecture.png differ
diff --git a/doc/dashboard.png b/doc/dashboard.png
new file mode 100644
index 00000000..6d1a486b
Binary files /dev/null and b/doc/dashboard.png differ
diff --git a/installer/data/upstart/cowrie.conf b/installer/data/upstart/cowrie.conf
index 1629e852..80efdd25 100644
--- a/installer/data/upstart/cowrie.conf
+++ b/installer/data/upstart/cowrie.conf
@@ -2,7 +2,7 @@
 # T-Pot                                                #
 # Cowrie upstart script                                #
 #                                                      #
-# v16.03.3 by av / mo, DTAG, 2016-02-08                #
+# v16.03.4 by av / mo, DTAG, 2016-03-03                #
 ########################################################
 
 description "Cowrie"
@@ -16,11 +16,14 @@ pre-start script
   if [ "$myCID" != "" ];
     then docker rm -v $myCID;
   fi
-  # Remove any data from previous container
-  rm -rf /data/cowrie/* || true
-  mkdir -p /data/cowrie/log/tty/ /data/cowrie/downloads/ /data/cowrie/keys/ /data/cowrie/misc/
-  chmod 760 /data/cowrie -R
-  chown tpot:tpot /data/cowrie -R
+  # Remove any data from previous container if persistence is not enabled 
+  if ! [ -f /data/persistence.on ];
+    then
+      rm -rf /data/cowrie/* || true
+      mkdir -p /data/cowrie/log/tty/ /data/cowrie/downloads/ /data/cowrie/keys/ /data/cowrie/misc/
+      chmod 760 /data/cowrie -R
+      chown tpot:tpot /data/cowrie -R
+  fi
 end script
 script
   /usr/bin/docker run --name cowrie --rm=true -p 22:2222 -v /data/cowrie:/data/cowrie -v /data/ews:/data/ews dtagdevsec/cowrie:latest1603
diff --git a/installer/data/upstart/dionaea.conf b/installer/data/upstart/dionaea.conf
index bd5bcfe3..42b43f44 100644
--- a/installer/data/upstart/dionaea.conf
+++ b/installer/data/upstart/dionaea.conf
@@ -2,7 +2,7 @@
 # T-Pot                                                #
 # Dionaea upstart script                               #
 #                                                      #
-# v16.03.5 by mo, DTAG, 2016-02-08                     #
+# v16.03.6 by mo, DTAG, 2016-03-03                     #
 ########################################################
 
 description "Dionaea"
@@ -16,15 +16,18 @@ pre-start script
   if [ "$myCID" != "" ];
     then docker rm -v $myCID;
   fi
-  # Remove any data from previous container
-  rm -rf /data/dionaea/* || true
-  rm /data/ews/dionaea/ews.json || true
-  mkdir -p /data/dionaea/log /data/dionaea/bistreams /data/dionaea/binaries /data/dionaea/rtp /data/dionaea/wwwroot
-  chmod 760 /data/dionaea -R
-  chown tpot:tpot /data/dionaea -R
+  # Remove any data from previous container if persistence is not enabled 
+  if ! [ -f /data/persistence.on ];
+    then
+      rm -rf /data/dionaea/* || true
+      rm /data/ews/dionaea/ews.json || true
+      mkdir -p /data/dionaea/log /data/dionaea/bistreams /data/dionaea/binaries /data/dionaea/rtp /data/dionaea/wwwroot
+      chmod 760 /data/dionaea -R
+      chown tpot:tpot /data/dionaea -R
+  fi
 end script
 script
-  /usr/bin/docker run --name dionaea --cap-add=NET_BIND_SERVICE --rm=true -p 21:21 -p 42:42 -p 8081:80 -p 135:135 -p 443:443 -p 445:445 -p 1433:1433 -p 3306:3306 -p 5061:5061 -p 5060:5060 -p 69:69/udp -p 5060:5060/udp -v /data/dionaea:/data/dionaea -v /data/ews:/data/ews dtagdevsec/dionaea:latest1603
+  /usr/bin/docker run --name dionaea --cap-add=NET_BIND_SERVICE --rm=true -p 21:21 -p 42:42 -p 8081:80 -p 135:135 -p 443:443 -p 445:445 -p 1433:1433 -p 3306:3306 -p 5060:5060 -p 5061:5061 -p 69:69/udp -p 5060:5060/udp -v /data/dionaea:/data/dionaea -v /data/ews:/data/ews dtagdevsec/dionaea:latest1603
 end script
 post-start script
   # Delay next start to avoid rapid respawning