diff --git a/roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml b/roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml
index e1386c752..21de6abc7 100644
--- a/roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml
+++ b/roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml
@@ -8,6 +8,8 @@
     matrix_synapse_rust_synapse_compress_state_compress_room_command: >-
       {{ matrix_host_command_docker }} run --rm --name matrix-rust-synapse-compress-state-compress-room
       --user={{ matrix_user_uid }}:{{ matrix_user_gid }}
+      --cpus=8
+      --memory=8G
       --cap-drop=ALL
       --network={{ matrix_docker_network }}
       --mount type=bind,src={{ matrix_synapse_rust_synapse_compress_state_base_path }},dst=/work
diff --git a/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml b/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml
index 219f1c986..0250a0552 100644
--- a/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml
+++ b/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml
@@ -16,19 +16,19 @@
 
 - name: Set matrix_synapse_rust_synapse_compress_state_compress_room_time, if not provided
   set_fact:
-    matrix_synapse_rust_synapse_compress_state_compress_room_time: 3600
+    matrix_synapse_rust_synapse_compress_state_compress_room_time: 7200
   when: "matrix_synapse_rust_synapse_compress_state_compress_room_time|default('') == ''"
 
 - name: Set matrix_synapse_rust_synapse_compress_state_psql_import_time, if not provided
   set_fact:
-    matrix_synapse_rust_synapse_compress_state_psql_import_time: 3600
+    matrix_synapse_rust_synapse_compress_state_psql_import_time: 7200
   when: "matrix_synapse_rust_synapse_compress_state_psql_import_time|default('') == ''"
 
 - name: Set matrix_synapse_rust_synapse_compress_state_min_state_groups_required, if not provided
   set_fact:
     # The minimum number of state groups we're looking for before we consider a room eligible for compression.
     # Rooms with a smaller state groups count will not be compressed.
-    matrix_synapse_rust_synapse_compress_state_min_state_groups_required: 100000
+    matrix_synapse_rust_synapse_compress_state_min_state_groups_required: 50000
   when: "matrix_synapse_rust_synapse_compress_state_min_state_groups_required|default('') == ''"