diff --git a/src/yb/integration-tests/cdcsdk_ysql_test_base.cc b/src/yb/integration-tests/cdcsdk_ysql_test_base.cc
index 2fc80d99d6a1..39d4fe6828b9 100644
--- a/src/yb/integration-tests/cdcsdk_ysql_test_base.cc
+++ b/src/yb/integration-tests/cdcsdk_ysql_test_base.cc
@@ -32,7 +32,7 @@
 #include "yb/util/status.h"
 #include "yb/util/test_thread_holder.h"
 
-DECLARE_bool(cdc_write_post_apply_metadata);
+DECLARE_bool(cdc_immediate_transaction_cleanup);
 
 namespace yb {
 namespace cdc {
@@ -2598,7 +2598,7 @@ Result<string> CDCSDKYsqlTest::GetUniverseId(PostgresMiniCluster* cluster) {
   }
 
   Status CDCSDKYsqlTest::WaitForPostApplyMetadataWritten(size_t expected_num_transactions) {
-    if (!GetAtomicFlag(&FLAGS_cdc_write_post_apply_metadata)) {
+    if (!GetAtomicFlag(&FLAGS_cdc_immediate_transaction_cleanup)) {
       return Status::OK();
     }
     size_t num_intents = 0;
diff --git a/src/yb/tablet/tablet_bootstrap.cc b/src/yb/tablet/tablet_bootstrap.cc
index 8bc1e3532dab..d905e3e3138b 100644
--- a/src/yb/tablet/tablet_bootstrap.cc
+++ b/src/yb/tablet/tablet_bootstrap.cc
@@ -136,7 +136,7 @@ DEFINE_RUNTIME_bool(skip_flushed_entries_in_first_replayed_segment, true,
             "If applicable, only replay entries that are not flushed to RocksDB or necessary "
             "to bootstrap retryable requests in the first replayed wal segment.");
 
-DEFINE_RUNTIME_bool(use_bootstrap_intent_ht_filter, true,
+DEFINE_RUNTIME_bool(use_bootstrap_intent_ht_filter, false,
                     "Use min replay txn start time filter for bootstrap.");
 
 DECLARE_int32(retryable_request_timeout_secs);
diff --git a/src/yb/tablet/transaction_participant.cc b/src/yb/tablet/transaction_participant.cc
index 8c611839ba39..139c7141d67d 100644
--- a/src/yb/tablet/transaction_participant.cc
+++ b/src/yb/tablet/transaction_participant.cc
@@ -109,7 +109,7 @@ DEFINE_RUNTIME_AUTO_bool(cdc_write_post_apply_metadata, kLocalPersisted, false,
     "Write post-apply transaction metadata to intentsdb for transaction that have been applied but "
     " have not yet been streamed by CDC.");
 
-DEFINE_RUNTIME_bool(cdc_immediate_transaction_cleanup, true,
+DEFINE_RUNTIME_bool(cdc_immediate_transaction_cleanup, false,
     "Clean up transactions from memory after apply, even if its changes have not yet been "
     "streamed by CDC.");
 DEFINE_test_flag(int32, stopactivetxns_sleep_in_abort_cb_ms, 0,