diff --git a/postgresql/values.yaml b/postgresql/values.yaml
index 2a60d486a..b990ebc71 100644
--- a/postgresql/values.yaml
+++ b/postgresql/values.yaml
@@ -293,6 +293,8 @@ conf:
         on_role_change: /tmp/set_password.sh
         on_start: /tmp/set_password.sh
       use_pg_rewind: true
+      remove_data_directory_on_rewind_failure: true
+      remove_data_directory_on_diverged_timelines: true
       parameters:
         archive_mode: 'off'
         datestyle: 'iso, mdy'