diff --git a/package.json b/package.json
index 62a5da76..b081f81b 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,8 @@
     "tsup": "^8.0.2",
     "tsx": "^4.7.1",
     "typescript": "^5.4.2",
-    "viem": "^2.8.5"
+    "viem": "^2.8.5",
+    "dotenv": "^16.4.1"
   },
   "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }
diff --git a/scripts/configs/pools/arbitrum.ts b/scripts/configs/pools/arbitrum.ts
index a7826e6f..691a3b1d 100644
--- a/scripts/configs/pools/arbitrum.ts
+++ b/scripts/configs/pools/arbitrum.ts
@@ -31,9 +31,8 @@ export const arbitrumSepoliaProtoV3: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0xB25a5D144626a0D488e52AE717A051a2E9997076',
   additionalAddresses: {
     L2_ENCODER: '0x2E45e7dCD1e94d8edf1605FfF4602912FDC662bC',
-    CONFIG_ENGINE: '0x0a275C06556EeB3c7Ff2b0f0cfD462A7645772EF',
+    CONFIG_ENGINE: '0xEB442296880a3FC7C00FFe695c40B09d970fb936',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0xbB7492Cce831eE6F349960a6E2da8eadC4b50cA3',
-    RATES_FACTORY: '0x6376D4df995f32f308f2d5049a7a320943023232',
     UI_INCENTIVE_DATA_PROVIDER: '0xB90fa850a4af6D30feA8b41989eaAecDcA8fd414',
     UI_POOL_DATA_PROVIDER: '0x97Cf44bF6a9A3D2B4F32b05C480dBEdC018F72A9',
     WALLET_BALANCE_PROVIDER: '0x1Be33D186a081eFDf15310e4bdEd81E828C47f9b',
diff --git a/scripts/configs/pools/avalanche.ts b/scripts/configs/pools/avalanche.ts
index 212e228a..99cf93b7 100644
--- a/scripts/configs/pools/avalanche.ts
+++ b/scripts/configs/pools/avalanche.ts
@@ -57,11 +57,10 @@ export const avalancheProtoV3: PoolConfig = {
     CAPS_PLUS_RISK_STEWARD: '0xD2C92b5A793e196aB11dBefBe3Af6BddeD6c3DD5',
     FREEZING_STEWARD: '0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99',
     DEBT_SWAP_ADAPTER: '0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4',
-    CONFIG_ENGINE: '0x0587B66Bc824368cFA5849bc56216a59260Df2c5',
+    CONFIG_ENGINE: '0x5fF5c392C5D397926364789E22f74043f7E42f2b',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x770ef9f4fe897e59daCc474EF11238303F9552b6',
     PROOF_OF_RESERVE: '0xab22988D93d5F942fC6B6c6Ea285744809D1d9Cc',
     PROOF_OF_RESERVE_AGGREGATOR: '0x80f2c02224a2E548FC67c0bF705eBFA825dd5439',
-    RATES_FACTORY: '0xDd81E6F85358292075B78fc8D5830BE8434aF8BA',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9',
     STATIC_A_TOKEN_FACTORY: '0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19',
     SWAP_COLLATERAL_ADAPTER: '0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A',
diff --git a/scripts/configs/pools/base.ts b/scripts/configs/pools/base.ts
index 4b889b39..4c4b278c 100644
--- a/scripts/configs/pools/base.ts
+++ b/scripts/configs/pools/base.ts
@@ -15,7 +15,6 @@ export const baseProtoV3: PoolConfig = {
     STATIC_A_TOKEN_FACTORY: '0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22',
     STATIC_A_TOKEN_ORACLE: '0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88',
     CONFIG_ENGINE: '0xc7751400F809cdB0C167F87985083C558a0610F7',
-    RATES_FACTORY: '0x0D1Fe8eAdb0a3e44C4Cc9D73De8dA50C1E475832',
     L2_ENCODER: '0x39e97c588B2907Fb67F44fea256Ae3BA064207C5',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x2f6571d3Eb9a4e350C68C36bCD2afe39530078E2',
     UI_INCENTIVE_DATA_PROVIDER: '0xEdD3b4737C1a0011626631a977b91Cf3E944982d',
@@ -30,7 +29,7 @@ export const baseSepoliaProtoV3: PoolConfig = {
   chainId: ChainId.base_sepolia,
   POOL_ADDRESSES_PROVIDER: '0xd449FeD49d9C443688d6816fE6872F21402e41de',
   additionalAddresses: {
-    CONFIG_ENGINE: '0xC18ECB3DEf8BAaB2be2714324c5AdA75608e0a48',
+    CONFIG_ENGINE: '0x08183F38166f640D60895150d99e57c6ad948451',
     RATES_FACTORY: '0x777fBA024bA1228fDa76149A4ff8B23475ed057D',
     L2_ENCODER: '0x458d281bFFCE958E34571B33F1F26Bd42Aa27c44',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x1169e227cD901899A02c8FD242251a311D73b252',
diff --git a/scripts/configs/pools/bnb.ts b/scripts/configs/pools/bnb.ts
index 7087f6a1..9780933a 100644
--- a/scripts/configs/pools/bnb.ts
+++ b/scripts/configs/pools/bnb.ts
@@ -9,9 +9,8 @@ export const bnbProtoV3: PoolConfig = {
     CAPS_PLUS_RISK_STEWARD: '0x971F1C94b139AdEdedA729DA636e2B0C433Ff595',
     FREEZING_STEWARD: '0x83f15Bc50d1A212576B202f80489502a7cc10412',
     DEBT_SWAP_ADAPTER: '0xAe13e4DA0952f0B8fE04E21df53716fCF799a923',
-    CONFIG_ENGINE: '0xcb0670258e5961CCA85D8F71D29C1167Ef20De99',
+    CONFIG_ENGINE: '0x2ecC4F6CDbe6ea77107dd131Af81ec82Db330d6b',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x117684358D990E42Eb1649E7e8C4691951dc1E71',
-    RATES_FACTORY: '0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x0727a6494095511078d63143A8a1E90b9f310880',
     SWAP_COLLATERAL_ADAPTER: '0x33E0b3fc976DC9C516926BA48CfC0A9E10a2aAA5',
     UI_INCENTIVE_DATA_PROVIDER: '0x1236010CECea55998384e795B59815D871f5f94d',
diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts
index 82fd7fcd..b89a8132 100644
--- a/scripts/configs/pools/ethereum.ts
+++ b/scripts/configs/pools/ethereum.ts
@@ -69,9 +69,8 @@ export const mainnetProtoV3Pool: PoolConfig = {
     FREEZING_STEWARD: '0x2eE68ACb6A1319de1b49DC139894644E424fefD6',
     DEBT_SWAP_ADAPTER: '0x8761e0370f94f68Db8EaA731f4fC581f6AD0Bd68',
     DELEGATION_AWARE_A_TOKEN_IMPL_REV_1: '0x21714092D90c7265F52fdfDae068EC11a23C6248',
-    CONFIG_ENGINE: '0xA3e44d830440dF5098520F62Ebec285B1198c51E',
+    CONFIG_ENGINE: '0x8689b8add004a9fd2320031b7d3f5af1f7f41e17',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0xbaA999AC55EAce41CcAE355c77809e68Bb345170',
-    RATES_FACTORY: '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x02e7B8511831B1b02d9018215a0f8f500Ea5c6B3',
     STATIC_A_TOKEN_FACTORY: '0x411D79b8cC43384FDE66CaBf9b6a17180c842511',
     SWAP_COLLATERAL_ADAPTER: '0xADC0A53095A0af87F3aa29FE0715B5c28016364e',
diff --git a/scripts/configs/pools/gnosis.ts b/scripts/configs/pools/gnosis.ts
index 894e29d7..4c5991e1 100644
--- a/scripts/configs/pools/gnosis.ts
+++ b/scripts/configs/pools/gnosis.ts
@@ -6,9 +6,8 @@ export const gnosisProtoV3: PoolConfig = {
   chainId: ChainId.gnosis,
   POOL_ADDRESSES_PROVIDER: '0x36616cf17557639614c1cdDb356b1B83fc0B2132',
   additionalAddresses: {
-    CONFIG_ENGINE: '0x3238FC1d642b60F41a35f62570237656C85F4744',
+    CONFIG_ENGINE: '0xE2a33403eaD139873820da597531f07f65ED0E3c',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x1236010CECea55998384e795B59815D871f5f94d',
-    RATES_FACTORY: '0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25',
     UI_INCENTIVE_DATA_PROVIDER: '0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9',
     UI_POOL_DATA_PROVIDER: '0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809',
     WALLET_BALANCE_PROVIDER: '0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D',
diff --git a/scripts/configs/pools/metis.ts b/scripts/configs/pools/metis.ts
index fb6fcf97..5008a32c 100644
--- a/scripts/configs/pools/metis.ts
+++ b/scripts/configs/pools/metis.ts
@@ -9,9 +9,8 @@ export const metisProtoV3: PoolConfig = {
     CAPS_PLUS_RISK_STEWARD: '0x5f4d15d761528c57a5C30c43c1DAb26Fc5452731',
     FREEZING_STEWARD: '0x2C77153fF4a1e83A8d8D750735FB101ECB55949f',
     L2_ENCODER: '0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9',
-    CONFIG_ENGINE: '0x8be473dCfA93132658821E67CbEB684ec8Ea2E74',
+    CONFIG_ENGINE: '0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5',
-    RATES_FACTORY: '0x87Aaba7cf8e1F319d0E3402d68017171201dEcd5',
     UI_INCENTIVE_DATA_PROVIDER: '0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927',
     UI_POOL_DATA_PROVIDER: '0x7dd60bd8507fDC3d300d53427b7AE566701a7320',
     WALLET_BALANCE_PROVIDER: '0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b',
diff --git a/scripts/configs/pools/optimism.ts b/scripts/configs/pools/optimism.ts
index fb26d935..615461e7 100644
--- a/scripts/configs/pools/optimism.ts
+++ b/scripts/configs/pools/optimism.ts
@@ -12,7 +12,6 @@ export const optimismProtoV3: PoolConfig = {
     L2_ENCODER: '0x9abADECD08572e0eA5aF4d47A9C7984a5AA503dC',
     CONFIG_ENGINE: '0x893411580e590D62dDBca8a703d61Cc4A8c7b2b9',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x770ef9f4fe897e59daCc474EF11238303F9552b6',
-    RATES_FACTORY: '0xDd81E6F85358292075B78fc8D5830BE8434aF8BA',
     REPAY_WITH_COLLATERAL_ADAPTER: '0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa',
     STATIC_A_TOKEN_FACTORY: '0x22D76094730fA377184100EFB8CEfC673B89B372',
     SWAP_COLLATERAL_ADAPTER: '0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857',
@@ -30,12 +29,12 @@ export const optimismSepoliaProtoV3: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0x36616cf17557639614c1cdDb356b1B83fc0B2132',
   additionalAddresses: {
     L2_ENCODER: '0xBeC519531F0E78BcDdB295242fA4EC5251B38574',
-    CONFIG_ENGINE: '0x1D0f881Ce1a646E2f27Dec3c57Fa056cB838BCC2',
+    CONFIG_ENGINE: '0x619643b346E3389062527cdb60C8720415B39860',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x1236010CECea55998384e795B59815D871f5f94d',
     RATES_FACTORY: '0x83E0E6095a318446b313f7D27e0c33Ed1e9c0213',
     UI_INCENTIVE_DATA_PROVIDER: '0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9',
     UI_POOL_DATA_PROVIDER: '0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809',
     WALLET_BALANCE_PROVIDER: '0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D',
-    WETH_GATEWAY: '0x589750BA8aF186cE5B55391B0b7148cAD43a1619'
+    WETH_GATEWAY: '0x589750BA8aF186cE5B55391B0b7148cAD43a1619',
   },
 };
diff --git a/scripts/configs/pools/polygon.ts b/scripts/configs/pools/polygon.ts
index 5d39cacf..90db3807 100644
--- a/scripts/configs/pools/polygon.ts
+++ b/scripts/configs/pools/polygon.ts
@@ -28,9 +28,8 @@ export const polygonProtoV3: PoolConfig = {
     CAPS_PLUS_RISK_STEWARD: '0xc5de989E0D1BF605d19478Fdd32Aa827a10b464f',
     FREEZING_STEWARD: '0xa7b40ed4dfAC9255EA9Dd218A3874f380D9FbBEB',
     DEBT_SWAP_ADAPTER: '0xb58Fd91558fa213D97Ac94C97F831c7289278084',
-    CONFIG_ENGINE: '0xfFD6F13c9574bedb3f4E131e9C4320186AF83c1D',
+    CONFIG_ENGINE: '0xAF0C901489790c35D9cef02CFA11123009E81e2a',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x770ef9f4fe897e59daCc474EF11238303F9552b6',
-    RATES_FACTORY: '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896',
     REPAY_WITH_COLLATERAL_ADAPTER: '0xE3090207A2de94A856EA10a7e1Bd36dD6145712B',
     STATIC_A_TOKEN_FACTORY: '0x397202AB0b4E7C954ac0c493c00749C517210953',
     SWAP_COLLATERAL_ADAPTER: '0xC4aff49fCeD8ac1D818a6DCAB063f9f97E66ec5E',
diff --git a/scripts/configs/pools/scroll.ts b/scripts/configs/pools/scroll.ts
index 5aebfbd9..5f6ea10c 100644
--- a/scripts/configs/pools/scroll.ts
+++ b/scripts/configs/pools/scroll.ts
@@ -23,9 +23,8 @@ export const scrollProtoV3: PoolConfig = {
     L2_ENCODER: '0x8714E5ED2d8edD4E88eFf66637C3FE8eCf2B8C40',
     CAPS_PLUS_RISK_STEWARD: '0xc4dca550ef04fd0f8abd4c384575fb8a8123054e',
     FREEZING_STEWARD: '0xc68d0c511076283075bd5cc9aa61e43673135f37',
-    CONFIG_ENGINE: '0x9CBC05104c3ff7EC0885770911a0828C40fd0a32',
+    CONFIG_ENGINE: '0x8543A1c3f8D4Cb0D7363047bec613b6b54740B1d',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0xFBedc64AeE24921cb43004312B9eF367a4162b57',
-    RATES_FACTORY: '0xe48fb34452fae3cd5d906f748490fbe16c3ce31b',
     UI_INCENTIVE_DATA_PROVIDER: '0x37A2f0b0b5FC33999e3E7fdECcFAe1e894fF9b07',
     UI_POOL_DATA_PROVIDER: '0x639c4ae31A02D54d66A9c696c63404BCa8B2734C',
     WALLET_BALANCE_PROVIDER: '0xE51642875Af07Fea1B03d821E41a9DB24bC4447E',
diff --git a/scripts/generateAddresses.ts b/scripts/generateAddresses.ts
index f1ea77ae..55945e76 100644
--- a/scripts/generateAddresses.ts
+++ b/scripts/generateAddresses.ts
@@ -1,3 +1,4 @@
+import 'dotenv/config';
 import {appendFileSync, existsSync, mkdirSync, readdirSync, rmSync, writeFileSync} from 'fs';
 import {governanceConfigMainnet} from './configs/governance/ethereum';
 import {arbitrumProtoV3, arbitrumSepoliaProtoV3} from './configs/pools/arbitrum';
diff --git a/src/AaveV3ArbitrumSepolia.sol b/src/AaveV3ArbitrumSepolia.sol
index 1fc7f24a..ae20bb85 100644
--- a/src/AaveV3ArbitrumSepolia.sol
+++ b/src/AaveV3ArbitrumSepolia.sol
@@ -61,16 +61,13 @@ library AaveV3ArbitrumSepolia {
   // https://sepolia.arbiscan.io/address/0x2E45e7dCD1e94d8edf1605FfF4602912FDC662bC
   address internal constant L2_ENCODER = 0x2E45e7dCD1e94d8edf1605FfF4602912FDC662bC;
 
-  // https://sepolia.arbiscan.io/address/0x0a275C06556EeB3c7Ff2b0f0cfD462A7645772EF
-  address internal constant CONFIG_ENGINE = 0x0a275C06556EeB3c7Ff2b0f0cfD462A7645772EF;
+  // https://sepolia.arbiscan.io/address/0xEB442296880a3FC7C00FFe695c40B09d970fb936
+  address internal constant CONFIG_ENGINE = 0xEB442296880a3FC7C00FFe695c40B09d970fb936;
 
   // https://sepolia.arbiscan.io/address/0xbB7492Cce831eE6F349960a6E2da8eadC4b50cA3
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0xbB7492Cce831eE6F349960a6E2da8eadC4b50cA3;
 
-  // https://sepolia.arbiscan.io/address/0x6376D4df995f32f308f2d5049a7a320943023232
-  address internal constant RATES_FACTORY = 0x6376D4df995f32f308f2d5049a7a320943023232;
-
   // https://sepolia.arbiscan.io/address/0xB90fa850a4af6D30feA8b41989eaAecDcA8fd414
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xB90fa850a4af6D30feA8b41989eaAecDcA8fd414;
 
diff --git a/src/AaveV3Avalanche.sol b/src/AaveV3Avalanche.sol
index 19489086..c8ab7e12 100644
--- a/src/AaveV3Avalanche.sol
+++ b/src/AaveV3Avalanche.sol
@@ -67,8 +67,8 @@ library AaveV3Avalanche {
   // https://snowscan.xyz/address/0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4
   address internal constant DEBT_SWAP_ADAPTER = 0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4;
 
-  // https://snowscan.xyz/address/0x0587B66Bc824368cFA5849bc56216a59260Df2c5
-  address internal constant CONFIG_ENGINE = 0x0587B66Bc824368cFA5849bc56216a59260Df2c5;
+  // https://snowscan.xyz/address/0x5fF5c392C5D397926364789E22f74043f7E42f2b
+  address internal constant CONFIG_ENGINE = 0x5fF5c392C5D397926364789E22f74043f7E42f2b;
 
   // https://snowscan.xyz/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
@@ -81,9 +81,6 @@ library AaveV3Avalanche {
   address internal constant PROOF_OF_RESERVE_AGGREGATOR =
     0x80f2c02224a2E548FC67c0bF705eBFA825dd5439;
 
-  // https://snowscan.xyz/address/0xDd81E6F85358292075B78fc8D5830BE8434aF8BA
-  address internal constant RATES_FACTORY = 0xDd81E6F85358292075B78fc8D5830BE8434aF8BA;
-
   // https://snowscan.xyz/address/0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9;
diff --git a/src/AaveV3BNB.sol b/src/AaveV3BNB.sol
index ca007567..559859ec 100644
--- a/src/AaveV3BNB.sol
+++ b/src/AaveV3BNB.sol
@@ -67,16 +67,13 @@ library AaveV3BNB {
   // https://bscscan.com/address/0xAe13e4DA0952f0B8fE04E21df53716fCF799a923
   address internal constant DEBT_SWAP_ADAPTER = 0xAe13e4DA0952f0B8fE04E21df53716fCF799a923;
 
-  // https://bscscan.com/address/0xcb0670258e5961CCA85D8F71D29C1167Ef20De99
-  address internal constant CONFIG_ENGINE = 0xcb0670258e5961CCA85D8F71D29C1167Ef20De99;
+  // https://bscscan.com/address/0x2ecC4F6CDbe6ea77107dd131Af81ec82Db330d6b
+  address internal constant CONFIG_ENGINE = 0x2ecC4F6CDbe6ea77107dd131Af81ec82Db330d6b;
 
   // https://bscscan.com/address/0x117684358D990E42Eb1649E7e8C4691951dc1E71
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x117684358D990E42Eb1649E7e8C4691951dc1E71;
 
-  // https://bscscan.com/address/0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6
-  address internal constant RATES_FACTORY = 0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6;
-
   // https://bscscan.com/address/0x0727a6494095511078d63143A8a1E90b9f310880
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0x0727a6494095511078d63143A8a1E90b9f310880;
diff --git a/src/AaveV3Base.sol b/src/AaveV3Base.sol
index 05481202..6c98f162 100644
--- a/src/AaveV3Base.sol
+++ b/src/AaveV3Base.sol
@@ -89,9 +89,6 @@ library AaveV3Base {
   // https://basescan.org/address/0xc7751400F809cdB0C167F87985083C558a0610F7
   address internal constant CONFIG_ENGINE = 0xc7751400F809cdB0C167F87985083C558a0610F7;
 
-  // https://basescan.org/address/0x0D1Fe8eAdb0a3e44C4Cc9D73De8dA50C1E475832
-  address internal constant RATES_FACTORY = 0x0D1Fe8eAdb0a3e44C4Cc9D73De8dA50C1E475832;
-
   // https://basescan.org/address/0x39e97c588B2907Fb67F44fea256Ae3BA064207C5
   address internal constant L2_ENCODER = 0x39e97c588B2907Fb67F44fea256Ae3BA064207C5;
 
diff --git a/src/AaveV3BaseSepolia.sol b/src/AaveV3BaseSepolia.sol
index 5d3d5b2c..f45ce5ec 100644
--- a/src/AaveV3BaseSepolia.sol
+++ b/src/AaveV3BaseSepolia.sol
@@ -58,8 +58,8 @@ library AaveV3BaseSepolia {
   // https://sepolia.basescan.org/address/0x0D42405bc97AeF309c22aB2D30dD3d35eD41d05f
   address internal constant EMISSION_MANAGER = 0x0D42405bc97AeF309c22aB2D30dD3d35eD41d05f;
 
-  // https://sepolia.basescan.org/address/0xC18ECB3DEf8BAaB2be2714324c5AdA75608e0a48
-  address internal constant CONFIG_ENGINE = 0xC18ECB3DEf8BAaB2be2714324c5AdA75608e0a48;
+  // https://sepolia.basescan.org/address/0x08183F38166f640D60895150d99e57c6ad948451
+  address internal constant CONFIG_ENGINE = 0x08183F38166f640D60895150d99e57c6ad948451;
 
   // https://sepolia.basescan.org/address/0x777fBA024bA1228fDa76149A4ff8B23475ed057D
   address internal constant RATES_FACTORY = 0x777fBA024bA1228fDa76149A4ff8B23475ed057D;
diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol
index 8a317c44..adf09507 100644
--- a/src/AaveV3Ethereum.sol
+++ b/src/AaveV3Ethereum.sol
@@ -71,16 +71,13 @@ library AaveV3Ethereum {
   address internal constant DELEGATION_AWARE_A_TOKEN_IMPL_REV_1 =
     0x21714092D90c7265F52fdfDae068EC11a23C6248;
 
-  // https://etherscan.io/address/0xA3e44d830440dF5098520F62Ebec285B1198c51E
-  address internal constant CONFIG_ENGINE = 0xA3e44d830440dF5098520F62Ebec285B1198c51E;
+  // https://etherscan.io/address/0x8689b8aDD004A9fD2320031b7d3f5aF1f7F41e17
+  address internal constant CONFIG_ENGINE = 0x8689b8aDD004A9fD2320031b7d3f5aF1f7F41e17;
 
   // https://etherscan.io/address/0xbaA999AC55EAce41CcAE355c77809e68Bb345170
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0xbaA999AC55EAce41CcAE355c77809e68Bb345170;
 
-  // https://etherscan.io/address/0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896
-  address internal constant RATES_FACTORY = 0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896;
-
   // https://etherscan.io/address/0x02e7B8511831B1b02d9018215a0f8f500Ea5c6B3
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0x02e7B8511831B1b02d9018215a0f8f500Ea5c6B3;
diff --git a/src/AaveV3Gnosis.sol b/src/AaveV3Gnosis.sol
index f703ee74..880f0598 100644
--- a/src/AaveV3Gnosis.sol
+++ b/src/AaveV3Gnosis.sol
@@ -58,16 +58,13 @@ library AaveV3Gnosis {
   // https://gnosisscan.io/address/0x41585C50524fb8c3899B43D7D797d9486AAc94DB
   address internal constant EMISSION_MANAGER = 0x41585C50524fb8c3899B43D7D797d9486AAc94DB;
 
-  // https://gnosisscan.io/address/0x3238FC1d642b60F41a35f62570237656C85F4744
-  address internal constant CONFIG_ENGINE = 0x3238FC1d642b60F41a35f62570237656C85F4744;
+  // https://gnosisscan.io/address/0xE2a33403eaD139873820da597531f07f65ED0E3c
+  address internal constant CONFIG_ENGINE = 0xE2a33403eaD139873820da597531f07f65ED0E3c;
 
   // https://gnosisscan.io/address/0x1236010CECea55998384e795B59815D871f5f94d
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x1236010CECea55998384e795B59815D871f5f94d;
 
-  // https://gnosisscan.io/address/0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25
-  address internal constant RATES_FACTORY = 0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25;
-
   // https://gnosisscan.io/address/0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9;
 
diff --git a/src/AaveV3Metis.sol b/src/AaveV3Metis.sol
index bca05197..aab5630f 100644
--- a/src/AaveV3Metis.sol
+++ b/src/AaveV3Metis.sol
@@ -70,16 +70,13 @@ library AaveV3Metis {
   // https://andromeda-explorer.metis.io/address/0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9
   address internal constant L2_ENCODER = 0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9;
 
-  // https://andromeda-explorer.metis.io/address/0x8be473dCfA93132658821E67CbEB684ec8Ea2E74
-  address internal constant CONFIG_ENGINE = 0x8be473dCfA93132658821E67CbEB684ec8Ea2E74;
+  // https://andromeda-explorer.metis.io/address/0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957
+  address internal constant CONFIG_ENGINE = 0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957;
 
   // https://andromeda-explorer.metis.io/address/0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5;
 
-  // https://andromeda-explorer.metis.io/address/0x87Aaba7cf8e1F319d0E3402d68017171201dEcd5
-  address internal constant RATES_FACTORY = 0x87Aaba7cf8e1F319d0E3402d68017171201dEcd5;
-
   // https://andromeda-explorer.metis.io/address/0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927;
 
diff --git a/src/AaveV3Optimism.sol b/src/AaveV3Optimism.sol
index 78317e73..74d336c0 100644
--- a/src/AaveV3Optimism.sol
+++ b/src/AaveV3Optimism.sol
@@ -80,9 +80,6 @@ library AaveV3Optimism {
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x770ef9f4fe897e59daCc474EF11238303F9552b6;
 
-  // https://optimistic.etherscan.io/address/0xDd81E6F85358292075B78fc8D5830BE8434aF8BA
-  address internal constant RATES_FACTORY = 0xDd81E6F85358292075B78fc8D5830BE8434aF8BA;
-
   // https://optimistic.etherscan.io/address/0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa;
diff --git a/src/AaveV3OptimismSepolia.sol b/src/AaveV3OptimismSepolia.sol
index d5354266..357d39ff 100644
--- a/src/AaveV3OptimismSepolia.sol
+++ b/src/AaveV3OptimismSepolia.sol
@@ -61,8 +61,8 @@ library AaveV3OptimismSepolia {
   // https://optimism-sepolia.blockscout.com/address/0xBeC519531F0E78BcDdB295242fA4EC5251B38574
   address internal constant L2_ENCODER = 0xBeC519531F0E78BcDdB295242fA4EC5251B38574;
 
-  // https://optimism-sepolia.blockscout.com/address/0x1D0f881Ce1a646E2f27Dec3c57Fa056cB838BCC2
-  address internal constant CONFIG_ENGINE = 0x1D0f881Ce1a646E2f27Dec3c57Fa056cB838BCC2;
+  // https://optimism-sepolia.blockscout.com/address/0x619643b346E3389062527cdb60C8720415B39860
+  address internal constant CONFIG_ENGINE = 0x619643b346E3389062527cdb60C8720415B39860;
 
   // https://optimism-sepolia.blockscout.com/address/0x1236010CECea55998384e795B59815D871f5f94d
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
diff --git a/src/AaveV3Polygon.sol b/src/AaveV3Polygon.sol
index a881fab8..99923e13 100644
--- a/src/AaveV3Polygon.sol
+++ b/src/AaveV3Polygon.sol
@@ -67,16 +67,13 @@ library AaveV3Polygon {
   // https://polygonscan.com/address/0xb58Fd91558fa213D97Ac94C97F831c7289278084
   address internal constant DEBT_SWAP_ADAPTER = 0xb58Fd91558fa213D97Ac94C97F831c7289278084;
 
-  // https://polygonscan.com/address/0xfFD6F13c9574bedb3f4E131e9C4320186AF83c1D
-  address internal constant CONFIG_ENGINE = 0xfFD6F13c9574bedb3f4E131e9C4320186AF83c1D;
+  // https://polygonscan.com/address/0xAF0C901489790c35D9cef02CFA11123009E81e2a
+  address internal constant CONFIG_ENGINE = 0xAF0C901489790c35D9cef02CFA11123009E81e2a;
 
   // https://polygonscan.com/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x770ef9f4fe897e59daCc474EF11238303F9552b6;
 
-  // https://polygonscan.com/address/0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896
-  address internal constant RATES_FACTORY = 0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896;
-
   // https://polygonscan.com/address/0xE3090207A2de94A856EA10a7e1Bd36dD6145712B
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0xE3090207A2de94A856EA10a7e1Bd36dD6145712B;
diff --git a/src/AaveV3Scroll.sol b/src/AaveV3Scroll.sol
index ba45ff81..7035fd8e 100644
--- a/src/AaveV3Scroll.sol
+++ b/src/AaveV3Scroll.sol
@@ -70,16 +70,13 @@ library AaveV3Scroll {
   // https://scrollscan.com/address/0xc68D0C511076283075bD5cc9aA61E43673135f37
   address internal constant FREEZING_STEWARD = 0xc68D0C511076283075bD5cc9aA61E43673135f37;
 
-  // https://scrollscan.com/address/0x9CBC05104c3ff7EC0885770911a0828C40fd0a32
-  address internal constant CONFIG_ENGINE = 0x9CBC05104c3ff7EC0885770911a0828C40fd0a32;
+  // https://scrollscan.com/address/0x8543A1c3f8D4Cb0D7363047bec613b6b54740B1d
+  address internal constant CONFIG_ENGINE = 0x8543A1c3f8D4Cb0D7363047bec613b6b54740B1d;
 
   // https://scrollscan.com/address/0xFBedc64AeE24921cb43004312B9eF367a4162b57
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0xFBedc64AeE24921cb43004312B9eF367a4162b57;
 
-  // https://scrollscan.com/address/0xe48fb34452FaE3Cd5d906F748490FBE16c3Ce31b
-  address internal constant RATES_FACTORY = 0xe48fb34452FaE3Cd5d906F748490FBE16c3Ce31b;
-
   // https://scrollscan.com/address/0x37A2f0b0b5FC33999e3E7fdECcFAe1e894fF9b07
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x37A2f0b0b5FC33999e3E7fdECcFAe1e894fF9b07;
 
diff --git a/src/ts/AaveV3ArbitrumSepolia.ts b/src/ts/AaveV3ArbitrumSepolia.ts
index b8df9a2a..d71ff175 100644
--- a/src/ts/AaveV3ArbitrumSepolia.ts
+++ b/src/ts/AaveV3ArbitrumSepolia.ts
@@ -47,15 +47,12 @@ export const EMISSION_MANAGER = '0x54E3aa872c3d2A89D1A6495F770f2cCa2C4Fc185';
 // https://sepolia.arbiscan.io/address/0x2E45e7dCD1e94d8edf1605FfF4602912FDC662bC
 export const L2_ENCODER = '0x2E45e7dCD1e94d8edf1605FfF4602912FDC662bC';
 
-// https://sepolia.arbiscan.io/address/0x0a275C06556EeB3c7Ff2b0f0cfD462A7645772EF
-export const CONFIG_ENGINE = '0x0a275C06556EeB3c7Ff2b0f0cfD462A7645772EF';
+// https://sepolia.arbiscan.io/address/0xEB442296880a3FC7C00FFe695c40B09d970fb936
+export const CONFIG_ENGINE = '0xEB442296880a3FC7C00FFe695c40B09d970fb936';
 
 // https://sepolia.arbiscan.io/address/0xbB7492Cce831eE6F349960a6E2da8eadC4b50cA3
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0xbB7492Cce831eE6F349960a6E2da8eadC4b50cA3';
 
-// https://sepolia.arbiscan.io/address/0x6376D4df995f32f308f2d5049a7a320943023232
-export const RATES_FACTORY = '0x6376D4df995f32f308f2d5049a7a320943023232';
-
 // https://sepolia.arbiscan.io/address/0xB90fa850a4af6D30feA8b41989eaAecDcA8fd414
 export const UI_INCENTIVE_DATA_PROVIDER = '0xB90fa850a4af6D30feA8b41989eaAecDcA8fd414';
 
diff --git a/src/ts/AaveV3Avalanche.ts b/src/ts/AaveV3Avalanche.ts
index e698e023..d1ba1525 100644
--- a/src/ts/AaveV3Avalanche.ts
+++ b/src/ts/AaveV3Avalanche.ts
@@ -53,8 +53,8 @@ export const FREEZING_STEWARD = '0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99';
 // https://snowscan.xyz/address/0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4
 export const DEBT_SWAP_ADAPTER = '0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4';
 
-// https://snowscan.xyz/address/0x0587B66Bc824368cFA5849bc56216a59260Df2c5
-export const CONFIG_ENGINE = '0x0587B66Bc824368cFA5849bc56216a59260Df2c5';
+// https://snowscan.xyz/address/0x5fF5c392C5D397926364789E22f74043f7E42f2b
+export const CONFIG_ENGINE = '0x5fF5c392C5D397926364789E22f74043f7E42f2b';
 
 // https://snowscan.xyz/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x770ef9f4fe897e59daCc474EF11238303F9552b6';
@@ -65,9 +65,6 @@ export const PROOF_OF_RESERVE = '0xab22988D93d5F942fC6B6c6Ea285744809D1d9Cc';
 // https://snowscan.xyz/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
 export const PROOF_OF_RESERVE_AGGREGATOR = '0x80f2c02224a2E548FC67c0bF705eBFA825dd5439';
 
-// https://snowscan.xyz/address/0xDd81E6F85358292075B78fc8D5830BE8434aF8BA
-export const RATES_FACTORY = '0xDd81E6F85358292075B78fc8D5830BE8434aF8BA';
-
 // https://snowscan.xyz/address/0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9';
 
diff --git a/src/ts/AaveV3BNB.ts b/src/ts/AaveV3BNB.ts
index 6e98add2..246dfb8b 100644
--- a/src/ts/AaveV3BNB.ts
+++ b/src/ts/AaveV3BNB.ts
@@ -53,15 +53,12 @@ export const FREEZING_STEWARD = '0x83f15Bc50d1A212576B202f80489502a7cc10412';
 // https://bscscan.com/address/0xAe13e4DA0952f0B8fE04E21df53716fCF799a923
 export const DEBT_SWAP_ADAPTER = '0xAe13e4DA0952f0B8fE04E21df53716fCF799a923';
 
-// https://bscscan.com/address/0xcb0670258e5961CCA85D8F71D29C1167Ef20De99
-export const CONFIG_ENGINE = '0xcb0670258e5961CCA85D8F71D29C1167Ef20De99';
+// https://bscscan.com/address/0x2ecC4F6CDbe6ea77107dd131Af81ec82Db330d6b
+export const CONFIG_ENGINE = '0x2ecC4F6CDbe6ea77107dd131Af81ec82Db330d6b';
 
 // https://bscscan.com/address/0x117684358D990E42Eb1649E7e8C4691951dc1E71
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x117684358D990E42Eb1649E7e8C4691951dc1E71';
 
-// https://bscscan.com/address/0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6
-export const RATES_FACTORY = '0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6';
-
 // https://bscscan.com/address/0x0727a6494095511078d63143A8a1E90b9f310880
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0x0727a6494095511078d63143A8a1E90b9f310880';
 
diff --git a/src/ts/AaveV3Base.ts b/src/ts/AaveV3Base.ts
index 2c9a8569..5244c87f 100644
--- a/src/ts/AaveV3Base.ts
+++ b/src/ts/AaveV3Base.ts
@@ -74,9 +74,6 @@ export const STATIC_A_TOKEN_ORACLE = '0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88
 // https://basescan.org/address/0xc7751400F809cdB0C167F87985083C558a0610F7
 export const CONFIG_ENGINE = '0xc7751400F809cdB0C167F87985083C558a0610F7';
 
-// https://basescan.org/address/0x0D1Fe8eAdb0a3e44C4Cc9D73De8dA50C1E475832
-export const RATES_FACTORY = '0x0D1Fe8eAdb0a3e44C4Cc9D73De8dA50C1E475832';
-
 // https://basescan.org/address/0x39e97c588B2907Fb67F44fea256Ae3BA064207C5
 export const L2_ENCODER = '0x39e97c588B2907Fb67F44fea256Ae3BA064207C5';
 
diff --git a/src/ts/AaveV3BaseSepolia.ts b/src/ts/AaveV3BaseSepolia.ts
index 01989bf4..a0f21792 100644
--- a/src/ts/AaveV3BaseSepolia.ts
+++ b/src/ts/AaveV3BaseSepolia.ts
@@ -44,8 +44,8 @@ export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = '0x3E02696004a98D757791e6eD3
 // https://sepolia.basescan.org/address/0x0D42405bc97AeF309c22aB2D30dD3d35eD41d05f
 export const EMISSION_MANAGER = '0x0D42405bc97AeF309c22aB2D30dD3d35eD41d05f';
 
-// https://sepolia.basescan.org/address/0xC18ECB3DEf8BAaB2be2714324c5AdA75608e0a48
-export const CONFIG_ENGINE = '0xC18ECB3DEf8BAaB2be2714324c5AdA75608e0a48';
+// https://sepolia.basescan.org/address/0x08183F38166f640D60895150d99e57c6ad948451
+export const CONFIG_ENGINE = '0x08183F38166f640D60895150d99e57c6ad948451';
 
 // https://sepolia.basescan.org/address/0x777fBA024bA1228fDa76149A4ff8B23475ed057D
 export const RATES_FACTORY = '0x777fBA024bA1228fDa76149A4ff8B23475ed057D';
diff --git a/src/ts/AaveV3Ethereum.ts b/src/ts/AaveV3Ethereum.ts
index e7e28e95..efec9d87 100644
--- a/src/ts/AaveV3Ethereum.ts
+++ b/src/ts/AaveV3Ethereum.ts
@@ -56,15 +56,12 @@ export const DEBT_SWAP_ADAPTER = '0x8761e0370f94f68Db8EaA731f4fC581f6AD0Bd68';
 // https://etherscan.io/address/0x21714092D90c7265F52fdfDae068EC11a23C6248
 export const DELEGATION_AWARE_A_TOKEN_IMPL_REV_1 = '0x21714092D90c7265F52fdfDae068EC11a23C6248';
 
-// https://etherscan.io/address/0xA3e44d830440dF5098520F62Ebec285B1198c51E
-export const CONFIG_ENGINE = '0xA3e44d830440dF5098520F62Ebec285B1198c51E';
+// https://etherscan.io/address/0x8689b8aDD004A9fD2320031b7d3f5aF1f7F41e17
+export const CONFIG_ENGINE = '0x8689b8aDD004A9fD2320031b7d3f5aF1f7F41e17';
 
 // https://etherscan.io/address/0xbaA999AC55EAce41CcAE355c77809e68Bb345170
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0xbaA999AC55EAce41CcAE355c77809e68Bb345170';
 
-// https://etherscan.io/address/0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896
-export const RATES_FACTORY = '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896';
-
 // https://etherscan.io/address/0x02e7B8511831B1b02d9018215a0f8f500Ea5c6B3
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0x02e7B8511831B1b02d9018215a0f8f500Ea5c6B3';
 
diff --git a/src/ts/AaveV3Gnosis.ts b/src/ts/AaveV3Gnosis.ts
index 3dd3bb98..55c941b4 100644
--- a/src/ts/AaveV3Gnosis.ts
+++ b/src/ts/AaveV3Gnosis.ts
@@ -44,15 +44,12 @@ export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = '0x06C35Cfd3FC61eC2aC437f0d0
 // https://gnosisscan.io/address/0x41585C50524fb8c3899B43D7D797d9486AAc94DB
 export const EMISSION_MANAGER = '0x41585C50524fb8c3899B43D7D797d9486AAc94DB';
 
-// https://gnosisscan.io/address/0x3238FC1d642b60F41a35f62570237656C85F4744
-export const CONFIG_ENGINE = '0x3238FC1d642b60F41a35f62570237656C85F4744';
+// https://gnosisscan.io/address/0xE2a33403eaD139873820da597531f07f65ED0E3c
+export const CONFIG_ENGINE = '0xE2a33403eaD139873820da597531f07f65ED0E3c';
 
 // https://gnosisscan.io/address/0x1236010CECea55998384e795B59815D871f5f94d
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x1236010CECea55998384e795B59815D871f5f94d';
 
-// https://gnosisscan.io/address/0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25
-export const RATES_FACTORY = '0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25';
-
 // https://gnosisscan.io/address/0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9
 export const UI_INCENTIVE_DATA_PROVIDER = '0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9';
 
diff --git a/src/ts/AaveV3Metis.ts b/src/ts/AaveV3Metis.ts
index a439c365..67542c49 100644
--- a/src/ts/AaveV3Metis.ts
+++ b/src/ts/AaveV3Metis.ts
@@ -56,15 +56,12 @@ export const FREEZING_STEWARD = '0x2C77153fF4a1e83A8d8D750735FB101ECB55949f';
 // https://andromeda-explorer.metis.io/address/0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9
 export const L2_ENCODER = '0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9';
 
-// https://andromeda-explorer.metis.io/address/0x8be473dCfA93132658821E67CbEB684ec8Ea2E74
-export const CONFIG_ENGINE = '0x8be473dCfA93132658821E67CbEB684ec8Ea2E74';
+// https://andromeda-explorer.metis.io/address/0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957
+export const CONFIG_ENGINE = '0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957';
 
 // https://andromeda-explorer.metis.io/address/0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5';
 
-// https://andromeda-explorer.metis.io/address/0x87Aaba7cf8e1F319d0E3402d68017171201dEcd5
-export const RATES_FACTORY = '0x87Aaba7cf8e1F319d0E3402d68017171201dEcd5';
-
 // https://andromeda-explorer.metis.io/address/0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927
 export const UI_INCENTIVE_DATA_PROVIDER = '0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927';
 
diff --git a/src/ts/AaveV3Optimism.ts b/src/ts/AaveV3Optimism.ts
index 5dde89bf..a9289372 100644
--- a/src/ts/AaveV3Optimism.ts
+++ b/src/ts/AaveV3Optimism.ts
@@ -65,9 +65,6 @@ export const CONFIG_ENGINE = '0x893411580e590D62dDBca8a703d61Cc4A8c7b2b9';
 // https://optimistic.etherscan.io/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x770ef9f4fe897e59daCc474EF11238303F9552b6';
 
-// https://optimistic.etherscan.io/address/0xDd81E6F85358292075B78fc8D5830BE8434aF8BA
-export const RATES_FACTORY = '0xDd81E6F85358292075B78fc8D5830BE8434aF8BA';
-
 // https://optimistic.etherscan.io/address/0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa';
 
diff --git a/src/ts/AaveV3OptimismSepolia.ts b/src/ts/AaveV3OptimismSepolia.ts
index 470a6691..9d5da43d 100644
--- a/src/ts/AaveV3OptimismSepolia.ts
+++ b/src/ts/AaveV3OptimismSepolia.ts
@@ -47,8 +47,8 @@ export const EMISSION_MANAGER = '0xB438D5376ADB4b31D0103E659f1673eAD684BAD9';
 // https://optimism-sepolia.blockscout.com/address/0xBeC519531F0E78BcDdB295242fA4EC5251B38574
 export const L2_ENCODER = '0xBeC519531F0E78BcDdB295242fA4EC5251B38574';
 
-// https://optimism-sepolia.blockscout.com/address/0x1D0f881Ce1a646E2f27Dec3c57Fa056cB838BCC2
-export const CONFIG_ENGINE = '0x1D0f881Ce1a646E2f27Dec3c57Fa056cB838BCC2';
+// https://optimism-sepolia.blockscout.com/address/0x619643b346E3389062527cdb60C8720415B39860
+export const CONFIG_ENGINE = '0x619643b346E3389062527cdb60C8720415B39860';
 
 // https://optimism-sepolia.blockscout.com/address/0x1236010CECea55998384e795B59815D871f5f94d
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x1236010CECea55998384e795B59815D871f5f94d';
diff --git a/src/ts/AaveV3Polygon.ts b/src/ts/AaveV3Polygon.ts
index 62c6d3dc..e065ec2b 100644
--- a/src/ts/AaveV3Polygon.ts
+++ b/src/ts/AaveV3Polygon.ts
@@ -53,15 +53,12 @@ export const FREEZING_STEWARD = '0xa7b40ed4dfAC9255EA9Dd218A3874f380D9FbBEB';
 // https://polygonscan.com/address/0xb58Fd91558fa213D97Ac94C97F831c7289278084
 export const DEBT_SWAP_ADAPTER = '0xb58Fd91558fa213D97Ac94C97F831c7289278084';
 
-// https://polygonscan.com/address/0xfFD6F13c9574bedb3f4E131e9C4320186AF83c1D
-export const CONFIG_ENGINE = '0xfFD6F13c9574bedb3f4E131e9C4320186AF83c1D';
+// https://polygonscan.com/address/0xAF0C901489790c35D9cef02CFA11123009E81e2a
+export const CONFIG_ENGINE = '0xAF0C901489790c35D9cef02CFA11123009E81e2a';
 
 // https://polygonscan.com/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x770ef9f4fe897e59daCc474EF11238303F9552b6';
 
-// https://polygonscan.com/address/0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896
-export const RATES_FACTORY = '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896';
-
 // https://polygonscan.com/address/0xE3090207A2de94A856EA10a7e1Bd36dD6145712B
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0xE3090207A2de94A856EA10a7e1Bd36dD6145712B';
 
diff --git a/src/ts/AaveV3Scroll.ts b/src/ts/AaveV3Scroll.ts
index 1762abd5..a8045497 100644
--- a/src/ts/AaveV3Scroll.ts
+++ b/src/ts/AaveV3Scroll.ts
@@ -56,15 +56,12 @@ export const CAPS_PLUS_RISK_STEWARD = '0xc4dcA550EF04FD0f8AbD4c384575Fb8a8123054
 // https://scrollscan.com/address/0xc68D0C511076283075bD5cc9aA61E43673135f37
 export const FREEZING_STEWARD = '0xc68D0C511076283075bD5cc9aA61E43673135f37';
 
-// https://scrollscan.com/address/0x9CBC05104c3ff7EC0885770911a0828C40fd0a32
-export const CONFIG_ENGINE = '0x9CBC05104c3ff7EC0885770911a0828C40fd0a32';
+// https://scrollscan.com/address/0x8543A1c3f8D4Cb0D7363047bec613b6b54740B1d
+export const CONFIG_ENGINE = '0x8543A1c3f8D4Cb0D7363047bec613b6b54740B1d';
 
 // https://scrollscan.com/address/0xFBedc64AeE24921cb43004312B9eF367a4162b57
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0xFBedc64AeE24921cb43004312B9eF367a4162b57';
 
-// https://scrollscan.com/address/0xe48fb34452FaE3Cd5d906F748490FBE16c3Ce31b
-export const RATES_FACTORY = '0xe48fb34452FaE3Cd5d906F748490FBE16c3Ce31b';
-
 // https://scrollscan.com/address/0x37A2f0b0b5FC33999e3E7fdECcFAe1e894fF9b07
 export const UI_INCENTIVE_DATA_PROVIDER = '0x37A2f0b0b5FC33999e3E7fdECcFAe1e894fF9b07';
 
diff --git a/yarn.lock b/yarn.lock
index 2b80d64b..fccd2d31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -750,6 +750,11 @@ domutils@^3.0.1:
     domelementtype "^2.3.0"
     domhandler "^5.0.3"
 
+dotenv@^16.4.1:
+  version "16.4.5"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
+  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
+
 entities@^4.2.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"