diff --git a/defaults/main.yml b/defaults/main.yml
index c3e5044..881b5db 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -105,12 +105,14 @@ psql_streaming_replication_config:
   - { name: 'wal_level', value: 'replica' }
   - { name: 'max_wal_senders', value: '10' }
   - { name: 'wal_keep_size', value: '1GB' }
+  - { name: 'max_slot_wal_keep_size', value: '15' }
   - { name: 'wal_compression', value: 'on' }
   - { name: 'wal_log_hints', value: 'on' }
   - { name: 'hot_standby', value: 'on' }
   - { name: 'archive_mode', value: 'always' }
   - { name: 'archive_command', value: "cp %p {{ psql_wal_archiving_log_dir }}/%f" }
   - { name: 'restore_command', value: "cp {{ psql_wal_archiving_log_dir }}/%f %p" }
+  - { name: 'archive_cleanup_command', value: "pg_archivecleanup {{ psql_wal_archiving_log_dir }} %r" }
 
 # SSL as a special case
 psql_enable_ssl: False