diff --git a/docker-compose.yml b/docker-compose.yml
index e6e40fa918f8e6a93604f6b2a1d1f2e319220f5e..d143154b13a9a9ada952b0d8cef959387748aa00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
 
   riot:
-    image: vectorim/riot-web:v1.5.6
+    image: vectorim/riot-web:develop
     labels:
       - traefik.enable=true
       - traefik.backend=matrix-riot
@@ -14,13 +14,14 @@ services:
       - traefik.port=80
     volumes:
       - /data/domains/matrix.allmende.io/riot/config.json:/app/config.json
+      - /data/domains/matrix.allmende.io/riot/riot-home/:/app/home/
     logging:
       driver: none
     networks:
       - web
 
   synapse:
-    image: docker.io/matrixdotorg/synapse:v1.7.0
+    image: docker.io/matrixdotorg/synapse:v1.12.0
     env_file: ["./synapse.env"]
     labels:
       - traefik.enable=true
diff --git a/riot/config.json b/riot/config.json
index aa29de775d1e230429fb41dd63d77801897f13cb..428506dea43a017c0efbc235525068382db7b7bd 100644
--- a/riot/config.json
+++ b/riot/config.json
@@ -16,6 +16,12 @@
     "showLabsSettings": true,
     "default_federate": true,
 
+    "disable_custom_urls": true,
+    "permalinkPrefix": "https://riot.allmende.io",
+    "embeddedPages": {
+        "homeUrl": "/home/index.html"
+    },
+
     "welcomePageUrl": "home.html",
     "default_theme": "light",