diff --git a/docker-compose.yml b/docker-compose.yml
index 5e2b6a05..29b3bfc0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -110,6 +110,10 @@ services:
             CHAIN_ID: '137'
             POSTGRES_URI: 'postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres/${POSTGRES_DB}'
             SCHEMA: 'events_polygon'
+            KAFKA_BROKERS: '${KAFKA_BROKERS}'
+            KAFKA_SSL: '${KAFKA_SSL}'
+            KAFKA_AUTH_USER: '${KAFKA_AUTH_USER}'
+            KAFKA_AUTH_PASSWORD: '${KAFKA_AUTH_PASSWORD}'
             ENABLE_PROMETHEUS_METRICS: "true"
             EP_DEPLOYMENT_BLOCK: 14391480
             MAX_BLOCKS_TO_SEARCH: 1000
@@ -138,6 +142,10 @@ services:
             CHAIN_ID: '43114'
             POSTGRES_URI: 'postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres/${POSTGRES_DB}'
             SCHEMA: 'events_avalanche'
+            KAFKA_BROKERS: '${KAFKA_BROKERS}'
+            KAFKA_SSL: '${KAFKA_SSL}'
+            KAFKA_AUTH_USER: '${KAFKA_AUTH_USER}'
+            KAFKA_AUTH_PASSWORD: '${KAFKA_AUTH_PASSWORD}'
             ENABLE_PROMETHEUS_METRICS: "true"
             EP_DEPLOYMENT_BLOCK: 3601700
             MAX_BLOCKS_TO_SEARCH: 5000
@@ -161,6 +169,10 @@ services:
             CHAIN_ID: '250'
             POSTGRES_URI: 'postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres/${POSTGRES_DB}'
             SCHEMA: 'events_fantom'
+            KAFKA_BROKERS: '${KAFKA_BROKERS}'
+            KAFKA_SSL: '${KAFKA_SSL}'
+            KAFKA_AUTH_USER: '${KAFKA_AUTH_USER}'
+            KAFKA_AUTH_PASSWORD: '${KAFKA_AUTH_PASSWORD}'
             EP_ADDRESS: "0xDEF189DeAEF76E379df891899eb5A00a94cBC250"
             ENABLE_PROMETHEUS_METRICS: "true"
             EP_DEPLOYMENT_BLOCK: 18855765
@@ -185,6 +197,10 @@ services:
             CHAIN_ID: '42220'
             POSTGRES_URI: 'postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres/${POSTGRES_DB}'
             SCHEMA: 'events_celo'
+            KAFKA_BROKERS: '${KAFKA_BROKERS}'
+            KAFKA_SSL: '${KAFKA_SSL}'
+            KAFKA_AUTH_USER: '${KAFKA_AUTH_USER}'
+            KAFKA_AUTH_PASSWORD: '${KAFKA_AUTH_PASSWORD}'
             ENABLE_PROMETHEUS_METRICS: "true"
             EP_DEPLOYMENT_BLOCK: 9350111
             MAX_BLOCKS_TO_SEARCH: 5000
@@ -205,6 +221,10 @@ services:
             CHAIN_ID: '10'
             POSTGRES_URI: 'postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres/${POSTGRES_DB}'
             SCHEMA: 'events_optimism'
+            KAFKA_BROKERS: '${KAFKA_BROKERS}'
+            KAFKA_SSL: '${KAFKA_SSL}'
+            KAFKA_AUTH_USER: '${KAFKA_AUTH_USER}'
+            KAFKA_AUTH_PASSWORD: '${KAFKA_AUTH_PASSWORD}'
             EP_DEPLOYMENT_BLOCK: 1691335
             MAX_BLOCKS_TO_SEARCH: 1000
             MAX_BLOCKS_TO_PULL: 1000
@@ -225,6 +245,10 @@ services:
             CHAIN_ID: '42161'
             POSTGRES_URI: 'postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres/${POSTGRES_DB}'
             SCHEMA: 'events_arbitrum'
+            KAFKA_BROKERS: '${KAFKA_BROKERS}'
+            KAFKA_SSL: '${KAFKA_SSL}'
+            KAFKA_AUTH_USER: '${KAFKA_AUTH_USER}'
+            KAFKA_AUTH_PASSWORD: '${KAFKA_AUTH_PASSWORD}'
             EP_DEPLOYMENT_BLOCK: 4050733
             MAX_BLOCKS_TO_SEARCH: 1000
             MAX_BLOCKS_TO_PULL: 1000
@@ -249,6 +273,10 @@ services:
             CHAIN_ID: '1'
             POSTGRES_URI: 'postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres/${POSTGRES_DB}'
             SCHEMA: 'events'
+            KAFKA_BROKERS: '${KAFKA_BROKERS}'
+            KAFKA_SSL: '${KAFKA_SSL}'
+            KAFKA_AUTH_USER: '${KAFKA_AUTH_USER}'
+            KAFKA_AUTH_PASSWORD: '${KAFKA_AUTH_PASSWORD}'
             LOG_LEVEL: "info"
             FEAT_EXCLUSIVE_TOKENS_FROM_TRANSACTIONS: "true"
             TOKENS_FROM_TRANSACTIONS_START_BLOCK: 9193266
diff --git a/src/index.ts b/src/index.ts
index e59e1d37..ab90812e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -12,6 +12,7 @@ import {
     ENABLE_PROMETHEUS_METRICS,
     FEAT_TOKENS_FROM_TRANSFERS,
     FEAT_TX_BACKFILL,
+    FEAT_UNISWAP_V2_PAIR_CREATED_EVENT,
     KAFKA_AUTH_PASSWORD,
     KAFKA_AUTH_USER,
     KAFKA_BROKERS,
@@ -70,7 +71,9 @@ createConnection(ormConfig as ConnectionOptions)
     .then(async (connection) => {
         await producer.connect();
         await TokenMetadataSingleton.getInstance(connection, producer);
-        await UniV2PoolSingleton.initInstance(connection);
+        if (FEAT_UNISWAP_V2_PAIR_CREATED_EVENT) {
+            await UniV2PoolSingleton.initInstance(connection);
+        }
         schedule(null, null, currentBlockMonitor.monitor, 'Current Block');
         schedule(connection, producer, blockScraper.getParseSaveEventsAsync, 'Pull and Save Blocks');
         schedule(connection, producer, eventsByTopicScraper.getParseSaveEventsAsync, 'Pull and Save Events by Topic');