diff --git a/dockerfiles/services/piwik/Dockerfile b/dockerfiles/services/piwik/Dockerfile
index 02b88307409a30a0bf3b8fd669f377d3c4ab6d9b..1bb15c1ebc005979eacf7d720e6794832a69601a 100644
--- a/dockerfiles/services/piwik/Dockerfile
+++ b/dockerfiles/services/piwik/Dockerfile
@@ -3,6 +3,7 @@ FROM indiepaas/nginx-php
 RUN apt-get update && apt-get install -y \
       php5-gd \
       php5-geoip \
+      php5-cli \
       php-apc && \
     rm -rf /var/lib/apt/lists/* && \
     curl "http://builds.piwik.org/piwik-latest.tar.gz" | tar xz && \
diff --git a/dockerfiles/services/piwik/startup-piwik.sh b/dockerfiles/services/piwik/startup-piwik.sh
index 4b5ba91c1621648ba150ea9c17f0bc973a277cac..b7de64e5a413b373a1c39346fab52721bacfe5e0 100644
--- a/dockerfiles/services/piwik/startup-piwik.sh
+++ b/dockerfiles/services/piwik/startup-piwik.sh
@@ -5,10 +5,6 @@ source /etc/environment
 echo ">> adding softlink from /piwik to /"
 rm -rf /usr/share/nginx/html
 ln -s /piwik /usr/share/nginx/html
-mkdir /usr/share/nginx/html/tmp
-
-chown -R www-data:www-data /usr/share/nginx/html/
-chmod -R 755 /usr/share/nginx/html/tmp
 
 if [ -z ${DB_PASS+x} ] || [ -z ${DB_USER+x} ]
 then
@@ -208,6 +204,11 @@ then
   
 fi
 
+/piwik/console core:update --yes
+
+chown -R www-data:www-data /piwik
+chmod -R 755 /piwik/tmp
+
 echo ">> update CorePlugins"
 curl "http://${URL}/index.php?updateCorePlugins=1" \
   2> /dev/null