diff --git a/src/AaveV2Avalanche.sol b/src/AaveV2Avalanche.sol
index 7109166d..829ca928 100644
--- a/src/AaveV2Avalanche.sol
+++ b/src/AaveV2Avalanche.sol
@@ -136,9 +136,9 @@ library AaveV2AvalancheAssets {
   // https://snowscan.xyz/address/0xf82da795727633aFA9BB0f1B08A87c0F6A38723f
   address internal constant DAIe_ORACLE = 0xf82da795727633aFA9BB0f1B08A87c0F6A38723f;
 
-  // https://snowscan.xyz/address/0x7e7B8d96C08881c3e1F506E3a81baE759aeFacA7
+  // https://snowscan.xyz/address/0xd814D29bBd27b97d58255632C498c34b25DC72bD
   address internal constant DAIe_INTEREST_RATE_STRATEGY =
-    0x7e7B8d96C08881c3e1F506E3a81baE759aeFacA7;
+    0xd814D29bBd27b97d58255632C498c34b25DC72bD;
 
   // https://snowscan.xyz/address/0xc7198437980c041c805A1EDcbA50c1Ce5db95118
   address internal constant USDTe_UNDERLYING = 0xc7198437980c041c805A1EDcbA50c1Ce5db95118;
@@ -157,9 +157,9 @@ library AaveV2AvalancheAssets {
   // https://snowscan.xyz/address/0x39185f2236A6022b682e8BB93C040d125DA093CF
   address internal constant USDTe_ORACLE = 0x39185f2236A6022b682e8BB93C040d125DA093CF;
 
-  // https://snowscan.xyz/address/0x7e7B8d96C08881c3e1F506E3a81baE759aeFacA7
+  // https://snowscan.xyz/address/0xd814D29bBd27b97d58255632C498c34b25DC72bD
   address internal constant USDTe_INTEREST_RATE_STRATEGY =
-    0x7e7B8d96C08881c3e1F506E3a81baE759aeFacA7;
+    0xd814D29bBd27b97d58255632C498c34b25DC72bD;
 
   // https://snowscan.xyz/address/0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664
   address internal constant USDCe_UNDERLYING = 0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664;
@@ -178,9 +178,9 @@ library AaveV2AvalancheAssets {
   // https://snowscan.xyz/address/0xD8277249e871BE9A402fa286C2C5ec16046dC512
   address internal constant USDCe_ORACLE = 0xD8277249e871BE9A402fa286C2C5ec16046dC512;
 
-  // https://snowscan.xyz/address/0xb1f13B58D6a3B1aEdB211Db58D9e42d28D09DbF4
+  // https://snowscan.xyz/address/0x6b410D0d53Efc7d4cAF23b9df2F38558998A1716
   address internal constant USDCe_INTEREST_RATE_STRATEGY =
-    0xb1f13B58D6a3B1aEdB211Db58D9e42d28D09DbF4;
+    0x6b410D0d53Efc7d4cAF23b9df2F38558998A1716;
 
   // https://snowscan.xyz/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9
   address internal constant AAVEe_UNDERLYING = 0x63a72806098Bd3D9520cC43356dD78afe5D386D9;
diff --git a/src/AaveV3Avalanche.sol b/src/AaveV3Avalanche.sol
index 61df857b..2044a2df 100644
--- a/src/AaveV3Avalanche.sol
+++ b/src/AaveV3Avalanche.sol
@@ -128,9 +128,9 @@ library AaveV3AvalancheAssets {
   // https://snowscan.xyz/address/0xf82da795727633aFA9BB0f1B08A87c0F6A38723f
   address internal constant DAIe_ORACLE = 0xf82da795727633aFA9BB0f1B08A87c0F6A38723f;
 
-  // https://snowscan.xyz/address/0x41365f2aC2D19c3B4Bc691007d314aba80af3669
+  // https://snowscan.xyz/address/0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4
   address internal constant DAIe_INTEREST_RATE_STRATEGY =
-    0x41365f2aC2D19c3B4Bc691007d314aba80af3669;
+    0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4;
 
   // https://snowscan.xyz/address/0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888
   address internal constant DAIe_STATA_TOKEN = 0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888;
@@ -176,9 +176,9 @@ library AaveV3AvalancheAssets {
   // https://snowscan.xyz/address/0xD8277249e871BE9A402fa286C2C5ec16046dC512
   address internal constant USDC_ORACLE = 0xD8277249e871BE9A402fa286C2C5ec16046dC512;
 
-  // https://snowscan.xyz/address/0xf895e42505E48E3aa83fa41994CBd8d1D006C42B
+  // https://snowscan.xyz/address/0x769EbC5106bF09D9A665CCb691e1907612b57F16
   address internal constant USDC_INTEREST_RATE_STRATEGY =
-    0xf895e42505E48E3aa83fa41994CBd8d1D006C42B;
+    0x769EbC5106bF09D9A665CCb691e1907612b57F16;
 
   // https://snowscan.xyz/address/0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4
   address internal constant USDC_STATA_TOKEN = 0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4;
@@ -248,9 +248,9 @@ library AaveV3AvalancheAssets {
   // https://snowscan.xyz/address/0x39185f2236A6022b682e8BB93C040d125DA093CF
   address internal constant USDt_ORACLE = 0x39185f2236A6022b682e8BB93C040d125DA093CF;
 
-  // https://snowscan.xyz/address/0x41365f2aC2D19c3B4Bc691007d314aba80af3669
+  // https://snowscan.xyz/address/0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4
   address internal constant USDt_INTEREST_RATE_STRATEGY =
-    0x41365f2aC2D19c3B4Bc691007d314aba80af3669;
+    0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4;
 
   // https://snowscan.xyz/address/0x5525Ee69BC1e354B356864187De486fab5AD67d7
   address internal constant USDt_STATA_TOKEN = 0x5525Ee69BC1e354B356864187De486fab5AD67d7;
@@ -344,9 +344,9 @@ library AaveV3AvalancheAssets {
   // https://snowscan.xyz/address/0x6208576378D06ce69A27987b7A524A9B15d499a4
   address internal constant FRAX_ORACLE = 0x6208576378D06ce69A27987b7A524A9B15d499a4;
 
-  // https://snowscan.xyz/address/0x41365f2aC2D19c3B4Bc691007d314aba80af3669
+  // https://snowscan.xyz/address/0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4
   address internal constant FRAX_INTEREST_RATE_STRATEGY =
-    0x41365f2aC2D19c3B4Bc691007d314aba80af3669;
+    0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4;
 
   // https://snowscan.xyz/address/0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73
   address internal constant FRAX_STATA_TOKEN = 0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73;
@@ -368,8 +368,8 @@ library AaveV3AvalancheAssets {
   // https://snowscan.xyz/address/0xCcC55Db26B78a19Dba1beE0066F9c1665575439A
   address internal constant MAI_ORACLE = 0xCcC55Db26B78a19Dba1beE0066F9c1665575439A;
 
-  // https://snowscan.xyz/address/0x049E42fe40368384d04bC10f8494Ea6FD164442a
-  address internal constant MAI_INTEREST_RATE_STRATEGY = 0x049E42fe40368384d04bC10f8494Ea6FD164442a;
+  // https://snowscan.xyz/address/0xB57Ff919A953424d6B143ABfD6740A225eab953e
+  address internal constant MAI_INTEREST_RATE_STRATEGY = 0xB57Ff919A953424d6B143ABfD6740A225eab953e;
 
   // https://snowscan.xyz/address/0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce
   address internal constant MAI_STATA_TOKEN = 0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce;
diff --git a/src/AaveV3Base.sol b/src/AaveV3Base.sol
index 0d410099..e58e86f6 100644
--- a/src/AaveV3Base.sol
+++ b/src/AaveV3Base.sol
@@ -178,9 +178,9 @@ library AaveV3BaseAssets {
   // https://basescan.org/address/0x978D8878b53Fbe40dab7D4AB47b97AB622FFeF9f
   address internal constant USDbC_ORACLE = 0x978D8878b53Fbe40dab7D4AB47b97AB622FFeF9f;
 
-  // https://basescan.org/address/0x64163263753A9610a391A5D0276ae94B0d42fB75
+  // https://basescan.org/address/0x992ff76913Db79eCA51666D1e09b4F5Cf078dF7D
   address internal constant USDbC_INTEREST_RATE_STRATEGY =
-    0x64163263753A9610a391A5D0276ae94B0d42fB75;
+    0x992ff76913Db79eCA51666D1e09b4F5Cf078dF7D;
 
   // https://basescan.org/address/0x6fCe2756794128B1771324caA860965801DCbCdB
   address internal constant USDbC_STATA_TOKEN = 0x6fCe2756794128B1771324caA860965801DCbCdB;
@@ -223,9 +223,9 @@ library AaveV3BaseAssets {
   // https://basescan.org/address/0x978D8878b53Fbe40dab7D4AB47b97AB622FFeF9f
   address internal constant USDC_ORACLE = 0x978D8878b53Fbe40dab7D4AB47b97AB622FFeF9f;
 
-  // https://basescan.org/address/0xcbF65e0708961Da6Dd3F1A4e1cE17D97D1E8C29A
+  // https://basescan.org/address/0xA802E6c96572f4C7efbf1e611d161CF63ad74Ef9
   address internal constant USDC_INTEREST_RATE_STRATEGY =
-    0xcbF65e0708961Da6Dd3F1A4e1cE17D97D1E8C29A;
+    0xA802E6c96572f4C7efbf1e611d161CF63ad74Ef9;
 
   // https://basescan.org/address/0x4EA71A20e655794051D1eE8b6e4A3269B13ccaCc
   address internal constant USDC_STATA_TOKEN = 0x4EA71A20e655794051D1eE8b6e4A3269B13ccaCc;
diff --git a/src/ts/AaveV2Avalanche.ts b/src/ts/AaveV2Avalanche.ts
index 8dd492f7..9b324d16 100644
--- a/src/ts/AaveV2Avalanche.ts
+++ b/src/ts/AaveV2Avalanche.ts
@@ -97,7 +97,7 @@ export const ASSETS = {
     A_TOKEN: '0x47AFa96Cdc9fAb46904A55a6ad4bf6660B53c38a',
     S_TOKEN: '0x3676E4EE689D527dDb89812B63fAD0B7501772B3',
     V_TOKEN: '0x1852DC24d1a8956a0B356AA18eDe954c7a0Ca5ae',
-    INTEREST_RATE_STRATEGY: '0x7e7B8d96C08881c3e1F506E3a81baE759aeFacA7',
+    INTEREST_RATE_STRATEGY: '0xd814D29bBd27b97d58255632C498c34b25DC72bD',
     ORACLE: '0xf82da795727633aFA9BB0f1B08A87c0F6A38723f',
   },
   USDTe: {
@@ -106,7 +106,7 @@ export const ASSETS = {
     A_TOKEN: '0x532E6537FEA298397212F09A61e03311686f548e',
     S_TOKEN: '0x9c7B81A867499B7387ed05017a13d4172a0c17bF',
     V_TOKEN: '0xfc1AdA7A288d6fCe0d29CcfAAa57Bc9114bb2DbE',
-    INTEREST_RATE_STRATEGY: '0x7e7B8d96C08881c3e1F506E3a81baE759aeFacA7',
+    INTEREST_RATE_STRATEGY: '0xd814D29bBd27b97d58255632C498c34b25DC72bD',
     ORACLE: '0x39185f2236A6022b682e8BB93C040d125DA093CF',
   },
   USDCe: {
@@ -115,7 +115,7 @@ export const ASSETS = {
     A_TOKEN: '0x46A51127C3ce23fb7AB1DE06226147F446e4a857',
     S_TOKEN: '0x5B14679135dbE8B02015ec3Ca4924a12E4C6C85a',
     V_TOKEN: '0x848c080d2700CBE1B894a3374AD5E887E5cCb89c',
-    INTEREST_RATE_STRATEGY: '0xb1f13B58D6a3B1aEdB211Db58D9e42d28D09DbF4',
+    INTEREST_RATE_STRATEGY: '0x6b410D0d53Efc7d4cAF23b9df2F38558998A1716',
     ORACLE: '0xD8277249e871BE9A402fa286C2C5ec16046dC512',
   },
   AAVEe: {
diff --git a/src/ts/AaveV3Avalanche.ts b/src/ts/AaveV3Avalanche.ts
index c82c8937..37f34027 100644
--- a/src/ts/AaveV3Avalanche.ts
+++ b/src/ts/AaveV3Avalanche.ts
@@ -100,7 +100,7 @@ export const ASSETS = {
     A_TOKEN: '0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE',
     S_TOKEN: '0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B',
     V_TOKEN: '0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC',
-    INTEREST_RATE_STRATEGY: '0x41365f2aC2D19c3B4Bc691007d314aba80af3669',
+    INTEREST_RATE_STRATEGY: '0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4',
     ORACLE: '0xf82da795727633aFA9BB0f1B08A87c0F6A38723f',
     STATA_TOKEN: '0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888',
   },
@@ -120,7 +120,7 @@ export const ASSETS = {
     A_TOKEN: '0x625E7708f30cA75bfd92586e17077590C60eb4cD',
     S_TOKEN: '0x307ffe186F84a3bc2613D1eA417A5737D69A7007',
     V_TOKEN: '0xFCCf3cAbbe80101232d343252614b6A3eE81C989',
-    INTEREST_RATE_STRATEGY: '0xf895e42505E48E3aa83fa41994CBd8d1D006C42B',
+    INTEREST_RATE_STRATEGY: '0x769EbC5106bF09D9A665CCb691e1907612b57F16',
     ORACLE: '0xD8277249e871BE9A402fa286C2C5ec16046dC512',
     STATA_TOKEN: '0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4',
   },
@@ -150,7 +150,7 @@ export const ASSETS = {
     A_TOKEN: '0x6ab707Aca953eDAeFBc4fD23bA73294241490620',
     S_TOKEN: '0x70eFfc565DB6EEf7B927610155602d31b670e802',
     V_TOKEN: '0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7',
-    INTEREST_RATE_STRATEGY: '0x41365f2aC2D19c3B4Bc691007d314aba80af3669',
+    INTEREST_RATE_STRATEGY: '0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4',
     ORACLE: '0x39185f2236A6022b682e8BB93C040d125DA093CF',
     STATA_TOKEN: '0x5525Ee69BC1e354B356864187De486fab5AD67d7',
   },
@@ -190,7 +190,7 @@ export const ASSETS = {
     A_TOKEN: '0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA',
     S_TOKEN: '0x78246294a4c6fBf614Ed73CcC9F8b875ca8eE841',
     V_TOKEN: '0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907',
-    INTEREST_RATE_STRATEGY: '0x41365f2aC2D19c3B4Bc691007d314aba80af3669',
+    INTEREST_RATE_STRATEGY: '0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4',
     ORACLE: '0x6208576378D06ce69A27987b7A524A9B15d499a4',
     STATA_TOKEN: '0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73',
   },
@@ -200,7 +200,7 @@ export const ASSETS = {
     A_TOKEN: '0x8Eb270e296023E9D92081fdF967dDd7878724424',
     S_TOKEN: '0x3EF10DFf4928279c004308EbADc4Db8B7620d6fc',
     V_TOKEN: '0xCE186F6Cccb0c955445bb9d10C59caE488Fea559',
-    INTEREST_RATE_STRATEGY: '0x049E42fe40368384d04bC10f8494Ea6FD164442a',
+    INTEREST_RATE_STRATEGY: '0xB57Ff919A953424d6B143ABfD6740A225eab953e',
     ORACLE: '0xCcC55Db26B78a19Dba1beE0066F9c1665575439A',
     STATA_TOKEN: '0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce',
   },
diff --git a/src/ts/AaveV3Base.ts b/src/ts/AaveV3Base.ts
index a1b2e628..52722bf2 100644
--- a/src/ts/AaveV3Base.ts
+++ b/src/ts/AaveV3Base.ts
@@ -123,7 +123,7 @@ export const ASSETS = {
     A_TOKEN: '0x0a1d576f3eFeF75b330424287a95A366e8281D54',
     S_TOKEN: '0xBBaDd47fbaFa9dE717FE203e4707DEB893C64654',
     V_TOKEN: '0x7376b2F323dC56fCd4C191B34163ac8a84702DAB',
-    INTEREST_RATE_STRATEGY: '0x64163263753A9610a391A5D0276ae94B0d42fB75',
+    INTEREST_RATE_STRATEGY: '0x992ff76913Db79eCA51666D1e09b4F5Cf078dF7D',
     ORACLE: '0x978D8878b53Fbe40dab7D4AB47b97AB622FFeF9f',
     STATA_TOKEN: '0x6fCe2756794128B1771324caA860965801DCbCdB',
   },
@@ -142,7 +142,7 @@ export const ASSETS = {
     A_TOKEN: '0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB',
     S_TOKEN: '0x03506214379aA86ad1176af71c260278cfa10B38',
     V_TOKEN: '0x59dca05b6c26dbd64b5381374aAaC5CD05644C28',
-    INTEREST_RATE_STRATEGY: '0xcbF65e0708961Da6Dd3F1A4e1cE17D97D1E8C29A',
+    INTEREST_RATE_STRATEGY: '0xA802E6c96572f4C7efbf1e611d161CF63ad74Ef9',
     ORACLE: '0x978D8878b53Fbe40dab7D4AB47b97AB622FFeF9f',
     STATA_TOKEN: '0x4EA71A20e655794051D1eE8b6e4A3269B13ccaCc',
   },