diff --git a/Dockerfile b/Dockerfile
index 699d772..3f8a1e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,4 +37,4 @@ ADD /rootfs /
 RUN chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse
 ENV HOME /var/lib/matrix-synapse
 
-VOLUME /var/lib/matrix-synapse/media_store/ /var/lib/matrix-synapse/uploads /var/lib/matrix-synapse/signing/ /etc/ssl/matrix-synapse/ /var/lib/matrix-synapse/registrations/
+VOLUME /var/lib/matrix-synapse/media_store/ /var/lib/matrix-synapse/signing/ /etc/ssl/matrix-synapse/ /var/lib/matrix-synapse/registrations/
diff --git a/README.md b/README.md
index 91b4fcc..a34c285 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,6 @@
 # Volumes
 - `/var/lib/matrix-synapse/media_store/`
 - `/var/lib/matrix-synapse/signing/`
-- `/var/lib/matrix-synapse/uploads/`
-- `/etc/ssl/matrix-synapse/:ro`: certificates have to be here
 - `/var/lib/matrix-synapse/registrations/`
 
 # Environment Variables
@@ -64,9 +62,6 @@ Maximum number of pixels that will be thumbnailed.
 
 Whether to generate new thumbnails on the fly to precisely match the resolution requested by the client.
 
-## REPORT_STATS
-- default: no
-
 ## REGISTRATIONS
 - default: []
 
diff --git a/rootfs/etc/confd/templates/server.yaml.tmpl b/rootfs/etc/confd/templates/server.yaml.tmpl
index ad3e4af..787ba46 100644
--- a/rootfs/etc/confd/templates/server.yaml.tmpl
+++ b/rootfs/etc/confd/templates/server.yaml.tmpl
@@ -1321,7 +1321,7 @@ metrics_flags:
 
 # Whether or not to report anonymized homeserver usage statistics.
 #
-#report_stats: false
+report_stats: true
 
 # The endpoint to report the anonymized homeserver usage statistics to.
 # Defaults to https://matrix.org/report-usage-stats/push
@@ -1707,13 +1707,13 @@ oidc_config:
       #
       # This must be configured if using the default mapping provider.
       #
-      localpart_template: "{{ user.preferred_username }}"
+      localpart_template: "user.preferred_username"
 
       # Jinja2 template for the display name to set on first login.
       #
       # If unset, no displayname will be set.
       #
-      #display_name_template: "{{ user.given_name }} {{ user.last_name }}"
+      #display_name_template: "user.given_name user.last_name"
 
 
 
@@ -2369,7 +2369,7 @@ encryption_enabled_by_default_for_room_type: invite
 
 ## Opentracing ##
 
-# These settings enable opentracing, which implements distributed tracing.
+# These settings enable opentracing, which im plements distributed tracing.
 # This allows you to observe the causal chains of events across servers
 # including requests, key lookups etc., across any server running
 # synapse or any other other services which supports opentracing