diff --git a/roles/matrix-server/defaults/main.yml b/roles/matrix-server/defaults/main.yml
index 54422bace..148eb97a6 100644
--- a/roles/matrix-server/defaults/main.yml
+++ b/roles/matrix-server/defaults/main.yml
@@ -348,7 +348,7 @@ matrix_corporal_debug: false
 # you may wish to disable this.
 matrix_riot_web_enabled: true
 
-matrix_riot_web_docker_image: "avhost/docker-matrix-riot:v0.17.8"
+matrix_riot_web_docker_image: "bubuntux/riot-web:v0.17.8"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"
 
diff --git a/roles/matrix-server/tasks/setup/setup_riot_web.yml b/roles/matrix-server/tasks/setup/setup_riot_web.yml
index 5a279074f..c3a2fa313 100644
--- a/roles/matrix-server/tasks/setup/setup_riot_web.yml
+++ b/roles/matrix-server/tasks/setup/setup_riot_web.yml
@@ -26,7 +26,6 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - {src: "{{ role_path }}/templates/riot-web/riot.im.conf.j2", name: "riot.im.conf"}
     - {src: "{{ role_path }}/templates/riot-web/config.json.j2", name: "config.json"}
     - {src: "{{ matrix_riot_web_homepage_template }}", name: "home.html"}
   when: matrix_riot_web_enabled
diff --git a/roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2 b/roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2
index 273915a88..c3eea7b32 100644
--- a/roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2
+++ b/roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2
@@ -43,7 +43,7 @@ server {
 		{% if matrix_nginx_proxy_enabled %}
 			{# Use the embedded DNS resolver in Docker containers to discover the service #}
 			resolver 127.0.0.11 valid=5s;
-			set $backend "matrix-riot-web:8765";
+			set $backend "matrix-riot-web:80";
 			proxy_pass http://$backend;
 		{% else %}
 			{# Generic configuration for use outside of our container setup #}
diff --git a/roles/matrix-server/templates/riot-web/riot.im.conf.j2 b/roles/matrix-server/templates/riot-web/riot.im.conf.j2
deleted file mode 100644
index 0d0922ed9..000000000
--- a/roles/matrix-server/templates/riot-web/riot.im.conf.j2
+++ /dev/null
@@ -1,3 +0,0 @@
--p 8765
--A 0.0.0.0
--c 3500
\ No newline at end of file
diff --git a/roles/matrix-server/templates/systemd/matrix-riot-web.service.j2 b/roles/matrix-server/templates/systemd/matrix-riot-web.service.j2
index 806402d50..a4742a382 100644
--- a/roles/matrix-server/templates/systemd/matrix-riot-web.service.j2
+++ b/roles/matrix-server/templates/systemd/matrix-riot-web.service.j2
@@ -9,13 +9,11 @@ ExecStartPre=-/usr/bin/docker kill matrix-riot-web
 ExecStartPre=-/usr/bin/docker rm matrix-riot-web
 ExecStart=/usr/bin/docker run --rm --name matrix-riot-web \
 			--log-driver=none \
-			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
-			-v {{ matrix_riot_web_data_path }}/config.json:/riot-web/webapp/config.json:ro \
-			-v {{ matrix_riot_web_data_path }}/home.html:/riot-web/webapp/home.html:ro \
-			-v {{ matrix_riot_web_data_path }}/riot.im.conf:/data/riot.im.conf:ro \
+			-v {{ matrix_riot_web_data_path }}/config.json:/etc/riot-web/config.json:ro \
+			-v {{ matrix_riot_web_data_path }}/home.html:/etc/riot-web/home.html:ro \
 			--network={{ matrix_docker_network }} \
 			{% if not matrix_nginx_proxy_enabled %}
-			-p 127.0.0.1:8765:8765 \
+			-p 127.0.0.1:8765:80 \
 			{% endif %}
 			{{ matrix_riot_web_docker_image }}
 ExecStop=-/usr/bin/docker kill matrix-riot-web