diff --git a/accounts-on-demand/src/accounts_on_demand.rs b/accounts-on-demand/src/accounts_on_demand.rs
index 5f62988c..1d4000cb 100644
--- a/accounts-on-demand/src/accounts_on_demand.rs
+++ b/accounts-on-demand/src/accounts_on_demand.rs
@@ -148,6 +148,7 @@ impl AccountStorageInterface for AccountsOnDemand {
                             // create a notify for accounts under loading
                             lk.insert(account_pk, Arc::new(Notify::new()));
                             self.accounts_subscribed.insert(account_pk);
+                            log::info!("Accounts on demand loading: {}", account_pk.to_string());
                             drop(lk);
                             self.refresh_subscription().await;
                             let mut return_value = None;
diff --git a/accounts-on-demand/src/subscription_manager.rs b/accounts-on-demand/src/subscription_manager.rs
index 908b6472..e093a8da 100644
--- a/accounts-on-demand/src/subscription_manager.rs
+++ b/accounts-on-demand/src/subscription_manager.rs
@@ -82,7 +82,7 @@ pub fn create_grpc_account_streaming_tasks(
     grpc_sources: Vec<GrpcSourceConfig>,
     mut account_filter_watch: watch::Receiver<AccountFilters>,
 ) -> (AnyhowJoinHandle, AccountStream) {
-    let (account_sender, accounts_stream) = broadcast::channel::<AccountNotificationMessage>(128);
+    let (account_sender, accounts_stream) = broadcast::channel::<AccountNotificationMessage>(5000);
 
     let jh: AnyhowJoinHandle = tokio::spawn(async move {
         match account_filter_watch.changed().await {
diff --git a/accounts/src/get_program_account.rs b/accounts/src/get_program_account.rs
index 9bf5d044..12e4be73 100644
--- a/accounts/src/get_program_account.rs
+++ b/accounts/src/get_program_account.rs
@@ -42,7 +42,7 @@ pub async fn get_program_account(
     // setting larget timeout because gPA can take a lot of time
     let rpc_client = Arc::new(RpcClient::new_with_timeout_and_commitment(
         rpc_url,
-        Duration::from_secs(60 * 10),
+        Duration::from_secs(60 * 20),
         CommitmentConfig::processed(),
     ));
 
diff --git a/cd/lite-rpc-accounts.toml b/cd/lite-rpc-accounts.toml
index 52110c65..7c0630c0 100644
--- a/cd/lite-rpc-accounts.toml
+++ b/cd/lite-rpc-accounts.toml
@@ -13,8 +13,8 @@ kill_timeout = 5
   RUST_LOG = "info"
   ENABLE_ADDRESS_LOOKUP_TABLES = "true"
   ACCOUNT_FILTERS = "[{\"accounts\":[],\"programId\":\"4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg\",\"filters\":null},{\"accounts\":[],\"programId\":\"3BUZXy9mPcsSCoxJQiBu2xxpMP6HEvFMZbaL5CAWwLUf\",\"filters\":null},{\"accounts\":[],\"programId\":\"SBondMDrcV3K4kxZR1HNVT7osZxAHVHgYXL5Ze1oMUv\",\"filters\":null},{\"accounts\":[],\"programId\":\"SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f\",\"filters\":null},{\"accounts\":[],\"programId\":\"srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX\",\"filters\":null},{\"accounts\":[],\"programId\":\"opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb\",\"filters\":null},{\"accounts\":[],\"programId\":\"PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY\",\"filters\":null},{\"accounts\":[],\"programId\":\"DjVE6JNiYqPL2QXyCUUh8rNjHrbz9hXHNYt99MQ59qw1\",\"filters\":null},{\"accounts\":[],\"programId\":\"9W959DqEETiGZocYWCQPaJ6sBmUzgfxXfqGeTEdp3aQP\",\"filters\":null},{\"accounts\":[],\"programId\":\"whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc\",\"filters\":null},{\"accounts\":[],\"programId\":\"82yxjeMsvaURa4MbZZ7WZZHfobirZYkH1zF8fmeGtyaQ\",\"filters\":null},{\"accounts\":[],\"programId\":\"CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK\",\"filters\":null},{\"accounts\":[],\"programId\":\"675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8\",\"filters\":null},{\"accounts\":[],\"programId\":\"LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo\",\"filters\":null},{\"accounts\":[],\"programId\":\"24Uqj9JCLxUeoC3hGfh5W3s9FM9uCHDS2SG3LYwBpyTi\",\"filters\":null},{\"accounts\":[],\"programId\":\"Eo7WjKq67rjJQSZxS6z3YkapzY3eMj6Xy8X5EQVn5UaB\",\"filters\":null},{\"accounts\":[],\"programId\":\"FsJ3A3u2vn5cTVofAjvy6y5kwABJAqYWpe4975bi2epH\",\"filters\":null}]"
-  ENABLE_ACCOUNT_ON_DEMAND = "true"
-  ENABLE_SMART_ACCOUNTS_WARMUP = "true"
+  ENABLE_ACCOUNT_ON_DEMAND = "false"
+  ENABLE_SMART_ACCOUNTS_WARMUP = "false"
   PG_ENABLED = "false"
   USE_GRPC = "true"
   DISABLE_GSO = "true"
diff --git a/lite-rpc/src/main.rs b/lite-rpc/src/main.rs
index bc23e5b5..47a8c65a 100644
--- a/lite-rpc/src/main.rs
+++ b/lite-rpc/src/main.rs
@@ -194,7 +194,7 @@ pub async fn start_lite_rpc(args: Config, rpc_client: Arc<RpcClient>) -> anyhow:
         const MAX_CONNECTIONS_IN_PARALLEL: usize = 10;
         // Accounts notifications will be spurious when slots change
         // 256 seems very reasonable so that there are no account notification is missed and memory usage
-        let (account_notification_sender, _) = tokio::sync::broadcast::channel(256);
+        let (account_notification_sender, _) = tokio::sync::broadcast::channel(5000);
 
         let account_storage = if enable_accounts_on_demand_accounts_service {
             Arc::new(AccountsOnDemand::new(