diff --git a/installer/bin/update-images.sh b/installer/bin/update-images.sh
index 2653ec5a..2b4a0f05 100755
--- a/installer/bin/update-images.sh
+++ b/installer/bin/update-images.sh
@@ -4,12 +4,19 @@
 # T-Pot                                                #
 # Only start the container found in /etc/init/t-pot    #
 #                                                      #
-# v0.01 by mo, DTAG, 2016-02-08                        #
+# v0.02 by mo, DTAG, 2016-02-08                        #
 ########################################################
 
-rm -rf /etc/init/t-pot/*.conf || true
+# Delete all T-Pot upstart scripts
+for i in $(ls /data/upstart/);
+  do
+    rm -rf /etc/init/$i || true;
+done
+
+# Setup only T-Pot upstart scripts from images.conf
 for i in $(cat /data/images.conf);
   do 
-    cp /data/upstart/"$i".conf /etc/init/t-pot/;
+    cp /data/upstart/"$i".conf /etc/init/;
 done
+
 echo Please reboot for the changes to take effect.
diff --git a/installer/data/ews/conf/ews.cfg b/installer/data/ews/conf/ews.cfg
index dbaf9777..e118804d 100644
--- a/installer/data/ews/conf/ews.cfg
+++ b/installer/data/ews/conf/ews.cfg
@@ -74,4 +74,4 @@ targetip =
 [EMOBILITY]
 eMobility = false
 nodeid = emobility-community-01 
-logfile = /data/emobility/emobility.log
+logfile = /data/eMobility/emobility.log
diff --git a/installer/install.sh b/installer/install.sh
index 36b5142e..0d17f088 100755
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -281,8 +281,7 @@ mkdir -p /data/ews/log /data/ews/conf /data/ews/dionaea /data/ews/emobility \
          /data/dionaea/log /data/dionaea/bistreams /data/dionaea/binaries /data/dionaea/rtp /data/dionaea/wwwroot \
          /data/elk/data /data/elk/log /data/glastopf /data/honeytrap/log/ /data/honeytrap/attacks/ /data/honeytrap/downloads/ \
          /data/suricata/log /home/tsec/.ssh/ \
-         /data/emobility/log \
-         /etc/init/t-pot
+         /data/emobility/log
 
 # Let's take care of some files and permissions before copying
 chmod 500 /root/tpot/bin/*
@@ -292,7 +291,6 @@ chmod 755 /root/tpot/etc/rc.local
 chmod 700 /root/tpot/home/*
 chown tsec:tsec /root/tpot/home/*
 chmod 644 /root/tpot/data/upstart/*
-chmod 644 /etc/init/t-pot
 
 # Let's copy some files
 cp -R /root/tpot/bin/* /usr/bin/
@@ -302,7 +300,7 @@ cp -R /root/tpot/home/* /home/tsec/
 cp    /root/tpot/keys/authorized_keys /home/tsec/.ssh/authorized_keys
 for i in $(cat /data/images.conf);
   do 
-    cp /data/upstart/$i.conf /etc/init/t-pot/;
+    cp /data/upstart/$i.conf /etc/init/;
 done
 
 # Let's take care of some files and permissions