diff --git a/roles/postgresql_server/templates/postgresql.conf b/roles/postgresql_server/templates/postgresql.conf
index 00320a8561..c38a2fd689 100644
--- a/roles/postgresql_server/templates/postgresql.conf
+++ b/roles/postgresql_server/templates/postgresql.conf
@@ -268,7 +268,7 @@ log_truncate_on_rotation = on           # If on, an existing log file of the
                                         # in all cases.                         
 log_rotation_age = 1d                   # Automatic rotation of logfiles will   
                                         # happen after that time.  0 to disable.
-log_rotation_size = 0                   # Automatic rotation of logfiles will   
+log_rotation_size = 10000               # Automatic rotation of logfiles will   
                                         # happen after that much log output.    
                                         # 0 to disable.                         
 
@@ -357,8 +357,8 @@ log_checkpoints = on
                                         #        processes                     
                                         #   %% = '%'                           
                                         # e.g. '<%u%%%d> '                     
-#log_lock_waits = off                   # log lock waits >= deadlock_timeout   
-#log_statement = 'none'                 # none, ddl, mod, all                  
+log_lock_waits = on                     # log lock waits >= deadlock_timeout   
+log_statement = 'all'                 # none, ddl, mod, all                  
 log_temp_files = 0                      # log temporary files equal or larger  
                                         # than specified size;                 
                                         # -1 disables, 0 logs all temp files