diff --git a/etc/services/core/compose.yml b/etc/services/core/compose.yml
index dc7cb13..0c45f7e 100644
--- a/etc/services/core/compose.yml
+++ b/etc/services/core/compose.yml
@@ -26,14 +26,20 @@ services:
     - ./synapse/media-store:/media-store
 
   element-web:
-    image: docker.io/vectorim/element-web:v1.11.93
+    image: ghcr.io/element-hq/element-web:v1.11.96
     user: "${UID}:${GID}"
     restart: unless-stopped
+    environment:
+      ELEMENT_WEB_PORT: 8080
     ports:
       - "${SERVICE_ELEMENT_WEB_BIND_PORT_HTTP}:8080"
     volumes:
-    - ../../etc/services/core/element-web/nginx.conf:/etc/nginx/nginx.conf:ro
     - ../../etc/services/core/element-web/config.json:/app/config.json:ro
+    tmpfs:
+      - /var/cache/nginx:rw,mode=777
+      - /var/run:rw,mode=777
+      - /tmp/element-web-config:rw,mode=777
+      - /etc/nginx/conf.d:rw,mode=777
 
 networks:
   default:
diff --git a/etc/services/core/element-web/config.json b/etc/services/core/element-web/config.json
index 80a2e68..71bae7b 100644
--- a/etc/services/core/element-web/config.json
+++ b/etc/services/core/element-web/config.json
@@ -3,7 +3,7 @@
     "default_is_url": "https://vector.im",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "enableLabs": true,
     "roomDirectory": {
         "servers": [
diff --git a/etc/services/core/element-web/nginx.conf b/etc/services/core/element-web/nginx.conf
deleted file mode 100644
index b72cb4e..0000000
--- a/etc/services/core/element-web/nginx.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# This is a custom nginx configuration file that we use in the container (instead of the default one),
-# because it allows us to run nginx with a non-root user.
-#
-# For this to work, the default vhost file (`/etc/nginx/conf.d/default.conf`) also needs to be removed.
-# (mounting `/dev/null` over `/etc/nginx/conf.d/default.conf` works well)
-#
-# The following changes have been done compared to a default nginx configuration file:
-# - default server port is changed (80 -> 8080), so that a non-root user can bind it
-# - various temp paths are changed to `/tmp`, so that a non-root user can write to them
-# - the `user` directive was removed, as we don't want nginx to switch users
-
-worker_processes  1;
-
-error_log /var/log/nginx/error.log warn;
-pid /tmp/nginx.pid;
-
-
-events {
-	worker_connections  1024;
-}
-
-
-http {
-	client_body_temp_path /tmp/client_body_temp;
-	proxy_temp_path /tmp/proxy_temp;
-	fastcgi_temp_path /tmp/fastcgi_temp;
-	uwsgi_temp_path /tmp/uwsgi_temp;
-	scgi_temp_path /tmp/scgi_temp;
-
-	include       /etc/nginx/mime.types;
-	default_type  application/octet-stream;
-
-	log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-					  '$status $body_bytes_sent "$http_referer" '
-					  '"$http_user_agent" "$http_x_forwarded_for"';
-
-	access_log  /var/log/nginx/access.log  main;
-
-	sendfile        on;
-	#tcp_nopush     on;
-
-	keepalive_timeout  65;
-
-	#gzip  on;
-
-	server {
-		listen       8080;
-		server_name  localhost;
-
-		location / {
-			root   /usr/share/nginx/html;
-			index  index.html index.htm;
-		}
-
-		error_page   500 502 503 504  /50x.html;
-		location = /50x.html {
-			root   /usr/share/nginx/html;
-		}
-	}
-}
\ No newline at end of file