diff --git a/stack_orchestrator/data/config/watcher-sushiswap-v3/watcher-config-template.toml b/stack_orchestrator/data/config/watcher-sushiswap-v3/watcher-config-template.toml
index 817d5323..aa1eae9a 100644
--- a/stack_orchestrator/data/config/watcher-sushiswap-v3/watcher-config-template.toml
+++ b/stack_orchestrator/data/config/watcher-sushiswap-v3/watcher-config-template.toml
@@ -77,6 +77,10 @@
     # Boolean flag to filter event logs by topics
     filterLogsByTopics = true
 
+    # Switch clients if eth_getLogs call takes more than threshold (in secs)
+    # Set to 0 for disabling switching
+    getLogsClientSwitchThresholdInSecs = 30
+
   [upstream.cache]
     name = "requests"
     enabled = false
@@ -92,7 +96,7 @@
   blockDelayInMilliSecs = 30000
 
   # Number of blocks by which block processing lags behind head
-  blockProcessingOffset = 0
+  blockProcessingOffset = 3
 
   # Boolean to switch between modes of processing events when starting the server.
   # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them.
diff --git a/stack_orchestrator/data/stacks/ajna/stack.yml b/stack_orchestrator/data/stacks/ajna/stack.yml
index 3b88a4c7..81662741 100644
--- a/stack_orchestrator/data/stacks/ajna/stack.yml
+++ b/stack_orchestrator/data/stacks/ajna/stack.yml
@@ -2,7 +2,7 @@ version: "1.0"
 name: ajna
 description: "Ajna watcher stack"
 repos:
-  - git.vdb.to/cerc-io/ajna-watcher-ts@v0.1.14
+  - git.vdb.to/cerc-io/ajna-watcher-ts@v0.1.15
 containers:
   - cerc/watcher-ajna
 pods:
diff --git a/stack_orchestrator/data/stacks/sushiswap-v3/stack.yml b/stack_orchestrator/data/stacks/sushiswap-v3/stack.yml
index ac29632b..1b2453f2 100644
--- a/stack_orchestrator/data/stacks/sushiswap-v3/stack.yml
+++ b/stack_orchestrator/data/stacks/sushiswap-v3/stack.yml
@@ -2,7 +2,7 @@ version: "1.0"
 name: sushiswap-v3
 description: "SushiSwap v3 watcher stack"
 repos:
-  - github.com/cerc-io/sushiswap-v3-watcher-ts@v0.1.14
+  - github.com/cerc-io/sushiswap-v3-watcher-ts@v0.1.15
 containers:
   - cerc/watcher-sushiswap-v3
 pods: