diff --git a/playbooks/matrix.archlinux.org.yml b/playbooks/matrix.archlinux.org.yml
index 5c5ce6dc..c4140d87 100644
--- a/playbooks/matrix.archlinux.org.yml
+++ b/playbooks/matrix.archlinux.org.yml
@@ -13,7 +13,7 @@
     - { role: certbot }
     - { role: nginx }
     - role: postgres
-      postgres_shared_buffers: 1GB
+      postgres_shared_buffers: 256MB
       postgres_work_mem: 64MB
       postgres_maintenance_work_mem: 256MB
       postgres_effective_cache_size: 4GB
diff --git a/roles/matrix/templates/homeserver.yaml.j2 b/roles/matrix/templates/homeserver.yaml.j2
index 00625323..1c812109 100644
--- a/roles/matrix/templates/homeserver.yaml.j2
+++ b/roles/matrix/templates/homeserver.yaml.j2
@@ -773,7 +773,7 @@ caches:
    #
    # Defaults to 0.5, which will half the size of all caches.
    #
-   #global_factor: 1.0
+   global_factor: 0.7
 
    # A dictionary of cache name to cache factor for that individual
    # cache. Overrides the global cache factor for a given cache.
@@ -840,7 +840,7 @@ database:
     user: synapse
     password: {{ vault_postgres_users.synapse }}
     cp_min: 1
-    cp_max: 5
+    cp_max: 8
 
 
 ## Logging ##