diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml
index 1b00d22a0..5b8b5d3f7 100644
--- a/roles/custom/matrix-synapse/defaults/main.yml
+++ b/roles/custom/matrix-synapse/defaults/main.yml
@@ -785,6 +785,8 @@ matrix_synapse_sentry_dsn: ""
 matrix_synapse_database_txn_limit: 0
 matrix_synapse_database_host: ''
 matrix_synapse_database_port: 5432
+matrix_synapse_database_cp_min: 5
+matrix_synapse_database_cp_max: 10
 matrix_synapse_database_user: "synapse"
 matrix_synapse_database_password: ""
 matrix_synapse_database_database: "synapse"
diff --git a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
index 298b89e3a..c01f1b393 100644
--- a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -874,8 +874,8 @@ database:
     database: "{{ matrix_synapse_database_database }}"
     host: "{{ matrix_synapse_database_host }}"
     port: {{ matrix_synapse_database_port }}
-    cp_min: 5
-    cp_max: 10
+    cp_min: {{ matrix_synapse_database_cp_min | to_json }}
+    cp_max: {{ matrix_synapse_database_cp_max | to_json }}
 
 
 ## Logging ##