diff --git a/roles/matrix-server/tasks/setup_nginx_proxy.yml b/roles/matrix-server/tasks/setup_nginx_proxy.yml
index 571080640..3ce874939 100644
--- a/roles/matrix-server/tasks/setup_nginx_proxy.yml
+++ b/roles/matrix-server/tasks/setup_nginx_proxy.yml
@@ -21,12 +21,13 @@
     - "{{ matrix_nginx_proxy_data_path }}"
     - "{{ matrix_nginx_proxy_confd_path }}"
 
-- name: Ensure Matrix Synapse proxy vhost configured
+- name: Ensure Matrix nginx-proxy configured
   template:
     src: "{{ role_path }}/templates/nginx-conf.d/{{ item }}.j2"
     dest: "{{ matrix_nginx_proxy_confd_path }}/{{ item }}"
     mode: 0644
   with_items:
+    - "nginx-http.conf"
     - "matrix-synapse.conf"
     - "matrix-riot-web.conf"
 
diff --git a/roles/matrix-server/templates/nginx-conf.d/nginx-http.conf.j2 b/roles/matrix-server/templates/nginx-conf.d/nginx-http.conf.j2
new file mode 100644
index 000000000..ed171cfaf
--- /dev/null
+++ b/roles/matrix-server/templates/nginx-conf.d/nginx-http.conf.j2
@@ -0,0 +1,5 @@
+# The default is aligned to the CPU's cache size,
+# which can sometimes be too low to handle our 2 vhosts (Synapse and Riot).
+#
+# Thus, we ensure a larger bucket size value is used.
+server_names_hash_bucket_size 64;
\ No newline at end of file