diff --git a/containers/bootstrap.sh b/containers/bootstrap.sh
index 1952593..299bf4e 100755
--- a/containers/bootstrap.sh
+++ b/containers/bootstrap.sh
@@ -104,6 +104,9 @@ write_ponder_env() {
 PONDER_NETWORK=$NETWORK_NAME
 KRAIKEN_ADDRESS=$KRAIKEN
 STAKE_ADDRESS=$STAKE
+LM_ADDRESS=$LIQUIDITY_MANAGER
+POOL_ADDRESS=$POOL_ADDRESS
+MINIMUM_BLOCKS_FOR_RINGBUFFER=0
 START_BLOCK=$DEPLOY_BLOCK
 PONDER_RPC_URL_${NETWORK_NAME}=$ANVIL_RPC
 DATABASE_URL=postgresql://ponder:ponder_local@postgres:5432/ponder_local
diff --git a/scripts/bootstrap-common.sh b/scripts/bootstrap-common.sh
index 2c6182b..763d714 100755
--- a/scripts/bootstrap-common.sh
+++ b/scripts/bootstrap-common.sh
@@ -102,6 +102,19 @@ extract_addresses() {
     bootstrap_log "LiquidityManager address missing"
     exit 1
   fi
+
+  # Discover Uniswap pool address from factory
+  POOL_ADDRESS=""
+  detect_swap_router
+  local factory
+  factory=$(cast call --rpc-url "$ANVIL_RPC" "$SWAP_ROUTER" "factory()(address)" 2>/dev/null) || factory=""
+  if [[ -n "$factory" && "$factory" != "0x" ]]; then
+    POOL_ADDRESS=$(cast call --rpc-url "$ANVIL_RPC" "$factory" "getPool(address,address,uint24)(address)" "$WETH" "$KRAIKEN" 10000 2>/dev/null) || POOL_ADDRESS=""
+  fi
+  if [[ -z "$POOL_ADDRESS" || "$POOL_ADDRESS" == "0x0000000000000000000000000000000000000000" ]]; then
+    bootstrap_log "Warning: could not discover pool address"
+    POOL_ADDRESS=""
+  fi
 }
 
 write_contracts_env() {
diff --git a/services/ponder/src/helpers/stats.ts b/services/ponder/src/helpers/stats.ts
index 7d9bff9..b226a0d 100644
--- a/services/ponder/src/helpers/stats.ts
+++ b/services/ponder/src/helpers/stats.ts
@@ -7,7 +7,7 @@ export type StatsContext = HandlerArgs extends { context: infer C } ? C : never;
 type StatsEvent = HandlerArgs extends { event: infer E } ? E : never;
 
 export const RING_BUFFER_SEGMENTS = 4; // ethReserve, minted, burned, holderCount
-export const MINIMUM_BLOCKS_FOR_RINGBUFFER = 100;
+export const MINIMUM_BLOCKS_FOR_RINGBUFFER = parseInt(process.env.MINIMUM_BLOCKS_FOR_RINGBUFFER || '100');
 
 // Get deploy block from environment (set by bootstrap)
 const DEPLOY_BLOCK = BigInt(process.env.START_BLOCK || '0');