diff --git a/CHANGELOG b/CHANGELOG
index 62622cd..94d0dcf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+[0.1.5]
+* Update to synapse v0.31.2
+
 [0.1.4]
 * Changed log location of synapse due to backup crashes
 * Updated some configs
diff --git a/CloudronManifest.json b/CloudronManifest.json
index f07362b..397b6a1 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "standalone matrix server",
-  "version": "0.1.1",
+  "version": "0.1.5",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "memoryLimit": 536870912,
diff --git a/Dockerfile b/Dockerfile
index 3762698..4dbf108 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM cloudron/base:0.10.0
 MAINTAINER Authors name <support@cloudron.io>
 
-RUN mkdir -p /app/code
+RUN mkdir -p /app/code/nginx
 RUN mkdir -p /app/data/templates
 
 WORKDIR /app/code
@@ -23,6 +23,7 @@ RUN sed -e 's,#TURNSERVER_ENABLED=1,TURNSERVER_ENABLED=1,' -i /etc/default/cotur
 # Synapse
 # a local copy is needed because of the mail templates, else the pip installation would suffice
 RUN git clone https://github.com/matrix-org/synapse.git
+RUN cd /app/code/synapse && git pull origin master
 
 RUN apt-get install -y build-essential python2.7-dev libffi-dev \
 	    python-pip python-setuptools sqlite3 \
@@ -37,7 +38,7 @@ RUN pip install https://github.com/matrix-org/synapse/tarball/master
 
 
 # copy index.html
-COPY index.html /app/code
+COPY index.html /app/code/nginx
 
 RUN chown -R www-data.www-data /app/code /app/data
 
diff --git a/nginx_matrix.conf b/nginx_matrix.conf
index b3b9042..c7bcc1c 100644
--- a/nginx_matrix.conf
+++ b/nginx_matrix.conf
@@ -13,7 +13,7 @@ server {
     }
 
     location / {
-        root /app/code;
+        root /app/code/nginx;
         index index.html;
     }
 }
diff --git a/start_matrix.sh b/start_matrix.sh
index 80fd0f6..32d0797 100755
--- a/start_matrix.sh
+++ b/start_matrix.sh
@@ -108,6 +108,19 @@ if [[ ! -d /app/data/synapse ]]; then
 
 fi
 
+    mkdir -p /app/data/synapse \
+             /app/data/nginx/fastcgi \
+             /run/nginx_log \
+             /run/synapse \
+             /run/turn_log
+
+    # fix permissions
+    chown -R www-data.www-data /run/synapse \
+                               /run/turn_log \
+                               /app/data
+
+
+
 chown -R www-data.www-data /app/data
 
 cd /app/data/synapse