diff --git a/defaults/main.yml b/defaults/main.yml
index f4a9156..45e2ca9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,8 +8,6 @@ pg_use_postgresql_org_repo: True
 psql_postgresql_install: True
 psql_pkg_state: present
 postgresql_enabled: True
-postgresql_streaming_replication: False
-postgresql_streaming_replication_primary_node: 'localhost'
 psql_version: 13
 psql_db_host: localhost
 psql_db_port: 5432
@@ -97,6 +95,7 @@ psql_autovacuum_configuration:
   - { name: 'autovacuum_naptime', value: '10', set: 'True' }
 
 # Streaming replication settings
+postgresql_streaming_replication: False
 postgresql_streaming_replication_primary_node: 'localhost'
 psql_streaming_replication_hosts:
   - 'localhost'
@@ -105,7 +104,6 @@ psql_streaming_replication_user: psql_replica
 psql_streaming_replication_config:
   - { name: 'wal_level', value: 'replica' }
   - { name: 'max_wal_senders', value: '10' }
-  - { name: 'wal_keep_segments', value: '8' }
   - { name: 'wal_keep_size', value: '1GB' }
   - { name: 'wal_compression', value: 'on' }
   - { name: 'wal_log_hints', value: 'on' }