diff --git a/Cargo.lock b/Cargo.lock
index c3e26531..c17277fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1766,8 +1766,8 @@ dependencies = [
 
 [[package]]
 name = "geyser-grpc-connector"
-version = "0.7.1+yellowstone.1.11"
-source = "git+https://github.com/blockworks-foundation/geyser-grpc-connector.git?tag=v1.17.15#4d737e7c2e8a7bb85b1580da094370dafba3eb8e"
+version = "0.10.1+yellowstone.1.12"
+source = "git+https://github.com/blockworks-foundation/geyser-grpc-connector.git?tag=v0.10.3+yellowstone.1.12+solana.1.17.15-hacked-windowsize2#130845f30a1ea29c74bacd9b83aa1238020d973f"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -1780,6 +1780,7 @@ dependencies = [
  "merge-streams",
  "solana-sdk",
  "tokio",
+ "tonic-health",
  "tracing",
  "url",
  "yellowstone-grpc-client",
diff --git a/cluster-endpoints/Cargo.toml b/cluster-endpoints/Cargo.toml
index 9cb66e92..9d334d83 100644
--- a/cluster-endpoints/Cargo.toml
+++ b/cluster-endpoints/Cargo.toml
@@ -9,7 +9,7 @@ license = "AGPL"
 
 [dependencies]
 #geyser-grpc-connector = { path = "../../geyser-grpc-connector" }
-geyser-grpc-connector = { tag = "v0.10.3+yellowstone.1.12+solana.1.17.15-hacked-windowsize", git = "https://github.com/blockworks-foundation/geyser-grpc-connector.git" }
+geyser-grpc-connector = { tag = "v0.10.3+yellowstone.1.12+solana.1.17.15-hacked-windowsize2", git = "https://github.com/blockworks-foundation/geyser-grpc-connector.git" }
 
 solana-sdk = { workspace = true }
 solana-rpc-client-api = { workspace = true }
diff --git a/cluster-endpoints/src/grpc_multiplex.rs b/cluster-endpoints/src/grpc_multiplex.rs
index ce15ed7d..f6d5ca1f 100644
--- a/cluster-endpoints/src/grpc_multiplex.rs
+++ b/cluster-endpoints/src/grpc_multiplex.rs
@@ -3,8 +3,8 @@ use crate::grpc_subscription::{
 };
 use anyhow::Context;
 use futures::{Stream, StreamExt};
-use geyser_grpc_connector::grpc_subscription_autoreconnect::{
-    create_geyser_reconnecting_stream, GeyserFilter, GrpcSourceConfig,
+use geyser_grpc_connector::{
+    GeyserFilter, GrpcSourceConfig,
 };
 use geyser_grpc_connector::grpcmultiplex_fastestwins::{
     create_multiplexed_stream, FromYellowstoneExtractor,
@@ -19,6 +19,7 @@ use solana_sdk::clock::Slot;
 use solana_sdk::commitment_config::CommitmentConfig;
 use std::collections::{BTreeSet, HashMap, HashSet};
 use std::time::{Duration, Instant};
+use geyser_grpc_connector::grpc_subscription_autoreconnect_streams::create_geyser_reconnecting_stream;
 use tokio::sync::broadcast::Receiver;
 use yellowstone_grpc_proto::geyser::subscribe_update::UpdateOneof;
 use yellowstone_grpc_proto::geyser::SubscribeUpdate;
diff --git a/cluster-endpoints/src/grpc_subscription.rs b/cluster-endpoints/src/grpc_subscription.rs
index 2f387394..7a1f49f6 100644
--- a/cluster-endpoints/src/grpc_subscription.rs
+++ b/cluster-endpoints/src/grpc_subscription.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 use anyhow::Context;
 use futures::StreamExt;
-use geyser_grpc_connector::grpc_subscription_autoreconnect::GrpcSourceConfig;
+use geyser_grpc_connector::GrpcSourceConfig;
 use itertools::Itertools;
 use solana_client::nonblocking::rpc_client::RpcClient;
 use solana_lite_rpc_core::{
diff --git a/lite-rpc/src/main.rs b/lite-rpc/src/main.rs
index 625fbf93..17bd761d 100644
--- a/lite-rpc/src/main.rs
+++ b/lite-rpc/src/main.rs
@@ -11,7 +11,7 @@ use lite_rpc::DEFAULT_MAX_NUMBER_OF_TXS_IN_QUEUE;
 use log::{debug, info};
 use solana_lite_rpc_cluster_endpoints::endpoint_stremers::EndpointStreaming;
 
-use solana_lite_rpc_cluster_endpoints::geyser_grpc_connector::grpc_subscription_autoreconnect::{
+use solana_lite_rpc_cluster_endpoints::geyser_grpc_connector::{
     GrpcConnectionTimeouts, GrpcSourceConfig,
 };
 use solana_lite_rpc_cluster_endpoints::grpc_subscription::create_grpc_subscription;
@@ -138,9 +138,10 @@ pub async fn start_lite_rpc(args: Config, rpc_client: Arc<RpcClient>) -> anyhow:
         info!("Creating geyser subscription...");
 
         let timeouts = GrpcConnectionTimeouts {
-            connect_timeout: Duration::from_secs(5),
-            request_timeout: Duration::from_secs(5),
-            subscribe_timeout: Duration::from_secs(5),
+            connect_timeout: Duration::from_secs(25),
+            request_timeout: Duration::from_secs(25),
+            subscribe_timeout: Duration::from_secs(25),
+            receive_timeout: Duration::from_secs(25),
         };
 
         create_grpc_subscription(