diff --git a/safe.csv b/safe.csv
index 60c36877..e1398153 100644
--- a/safe.csv
+++ b/safe.csv
@@ -22,7 +22,7 @@ address,name,chainId
 0x3Ed3B47Dd13EC9a98b44e6204A523E766B225811,AaveV2Ethereum ASSETS USDT A_TOKEN,1
 0xe91D55AB2240594855aBd11b3faAE801Fd4c4687,AaveV2Ethereum ASSETS USDT S_TOKEN,1
 0x531842cEbbdD378f8ee36D171d6cC9C4fcf475Ec,AaveV2Ethereum ASSETS USDT V_TOKEN,1
-0x5A3a8Aa25F0D61eF834Da59B4cD5bC48B8AB9910,AaveV2Ethereum ASSETS USDT INTEREST_RATE_STRATEGY,1
+0xa8850b94E4A0B881c3b08aE065D189D87F34F175,AaveV2Ethereum ASSETS USDT INTEREST_RATE_STRATEGY,1
 0xEfF57B0c8987eea8C491bdDD2F64c1c21297Cf74,AaveV2Ethereum ASSETS USDT ORACLE,1
 0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599,AaveV2Ethereum ASSETS WBTC UNDERLYING,1
 0x9ff58f4fFB29fA2266Ab25e75e2A8b3503311656,AaveV2Ethereum ASSETS WBTC A_TOKEN,1
@@ -76,7 +76,7 @@ address,name,chainId
 0x028171bCA77440897B824Ca71D1c56caC55b68A3,AaveV2Ethereum ASSETS DAI A_TOKEN,1
 0x778A13D3eeb110A4f7bb6529F99c000119a08E92,AaveV2Ethereum ASSETS DAI S_TOKEN,1
 0x6C3c78838c761c6Ac7bE9F59fe808ea2A6E4379d,AaveV2Ethereum ASSETS DAI V_TOKEN,1
-0xffeae1Bf7ddc089b8820B223220d76E537bf058E,AaveV2Ethereum ASSETS DAI INTEREST_RATE_STRATEGY,1
+0xA939B1f36E9a14B044B8149933184a18E0dFC17D,AaveV2Ethereum ASSETS DAI INTEREST_RATE_STRATEGY,1
 0xd486FE27AAB0b3CAd1462D767292dd7a84F06E58,AaveV2Ethereum ASSETS DAI ORACLE,1
 0xF629cBd94d3791C9250152BD8dfBDF380E2a3B9c,AaveV2Ethereum ASSETS ENJ UNDERLYING,1
 0xaC6Df26a590F08dcC95D5a4705ae8abbc88509Ef,AaveV2Ethereum ASSETS ENJ A_TOKEN,1
@@ -136,7 +136,7 @@ address,name,chainId
 0xBcca60bB61934080951369a648Fb03DF4F96263C,AaveV2Ethereum ASSETS USDC A_TOKEN,1
 0xE4922afAB0BbaDd8ab2a88E0C79d884Ad337fcA6,AaveV2Ethereum ASSETS USDC S_TOKEN,1
 0x619beb58998eD2278e08620f97007e1116D5D25b,AaveV2Ethereum ASSETS USDC V_TOKEN,1
-0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60,AaveV2Ethereum ASSETS USDC INTEREST_RATE_STRATEGY,1
+0x6a8C8119b2BA9460162B8C999f5A8C84f28a033f,AaveV2Ethereum ASSETS USDC INTEREST_RATE_STRATEGY,1
 0x9f2817536Cfd48BF59243d9D8802a5670F5Be05d,AaveV2Ethereum ASSETS USDC ORACLE,1
 0xD533a949740bb3306d119CC777fa900bA034cd52,AaveV2Ethereum ASSETS CRV UNDERLYING,1
 0x8dAE6Cb04688C62d939ed9B68d32Bc62e49970b1,AaveV2Ethereum ASSETS CRV A_TOKEN,1
diff --git a/src/AaveV2Ethereum.sol b/src/AaveV2Ethereum.sol
index 50fadd9b..88075596 100644
--- a/src/AaveV2Ethereum.sol
+++ b/src/AaveV2Ethereum.sol
@@ -108,9 +108,9 @@ library AaveV2EthereumAssets {
   // https://etherscan.io/address/0xEfF57B0c8987eea8C491bdDD2F64c1c21297Cf74
   address internal constant USDT_ORACLE = 0xEfF57B0c8987eea8C491bdDD2F64c1c21297Cf74;
 
-  // https://etherscan.io/address/0x5A3a8Aa25F0D61eF834Da59B4cD5bC48B8AB9910
+  // https://etherscan.io/address/0xa8850b94E4A0B881c3b08aE065D189D87F34F175
   address internal constant USDT_INTEREST_RATE_STRATEGY =
-    0x5A3a8Aa25F0D61eF834Da59B4cD5bC48B8AB9910;
+    0xa8850b94E4A0B881c3b08aE065D189D87F34F175;
 
   // https://etherscan.io/address/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599
   address internal constant WBTC_UNDERLYING = 0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599;
@@ -290,8 +290,8 @@ library AaveV2EthereumAssets {
   // https://etherscan.io/address/0xd486FE27AAB0b3CAd1462D767292dd7a84F06E58
   address internal constant DAI_ORACLE = 0xd486FE27AAB0b3CAd1462D767292dd7a84F06E58;
 
-  // https://etherscan.io/address/0xffeae1Bf7ddc089b8820B223220d76E537bf058E
-  address internal constant DAI_INTEREST_RATE_STRATEGY = 0xffeae1Bf7ddc089b8820B223220d76E537bf058E;
+  // https://etherscan.io/address/0xA939B1f36E9a14B044B8149933184a18E0dFC17D
+  address internal constant DAI_INTEREST_RATE_STRATEGY = 0xA939B1f36E9a14B044B8149933184a18E0dFC17D;
 
   // https://etherscan.io/address/0xF629cBd94d3791C9250152BD8dfBDF380E2a3B9c
   address internal constant ENJ_UNDERLYING = 0xF629cBd94d3791C9250152BD8dfBDF380E2a3B9c;
@@ -494,9 +494,9 @@ library AaveV2EthereumAssets {
   // https://etherscan.io/address/0x9f2817536Cfd48BF59243d9D8802a5670F5Be05d
   address internal constant USDC_ORACLE = 0x9f2817536Cfd48BF59243d9D8802a5670F5Be05d;
 
-  // https://etherscan.io/address/0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60
+  // https://etherscan.io/address/0x6a8C8119b2BA9460162B8C999f5A8C84f28a033f
   address internal constant USDC_INTEREST_RATE_STRATEGY =
-    0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60;
+    0x6a8C8119b2BA9460162B8C999f5A8C84f28a033f;
 
   // https://etherscan.io/address/0xD533a949740bb3306d119CC777fa900bA034cd52
   address internal constant CRV_UNDERLYING = 0xD533a949740bb3306d119CC777fa900bA034cd52;
diff --git a/src/ts/AaveV2Ethereum.ts b/src/ts/AaveV2Ethereum.ts
index 0517f848..0f09186c 100644
--- a/src/ts/AaveV2Ethereum.ts
+++ b/src/ts/AaveV2Ethereum.ts
@@ -82,7 +82,7 @@ export const ASSETS = {
     A_TOKEN: '0x3Ed3B47Dd13EC9a98b44e6204A523E766B225811',
     S_TOKEN: '0xe91D55AB2240594855aBd11b3faAE801Fd4c4687',
     V_TOKEN: '0x531842cEbbdD378f8ee36D171d6cC9C4fcf475Ec',
-    INTEREST_RATE_STRATEGY: '0x5A3a8Aa25F0D61eF834Da59B4cD5bC48B8AB9910',
+    INTEREST_RATE_STRATEGY: '0xa8850b94E4A0B881c3b08aE065D189D87F34F175',
     ORACLE: '0xEfF57B0c8987eea8C491bdDD2F64c1c21297Cf74',
   },
   WBTC: {
@@ -163,7 +163,7 @@ export const ASSETS = {
     A_TOKEN: '0x028171bCA77440897B824Ca71D1c56caC55b68A3',
     S_TOKEN: '0x778A13D3eeb110A4f7bb6529F99c000119a08E92',
     V_TOKEN: '0x6C3c78838c761c6Ac7bE9F59fe808ea2A6E4379d',
-    INTEREST_RATE_STRATEGY: '0xffeae1Bf7ddc089b8820B223220d76E537bf058E',
+    INTEREST_RATE_STRATEGY: '0xA939B1f36E9a14B044B8149933184a18E0dFC17D',
     ORACLE: '0xd486FE27AAB0b3CAd1462D767292dd7a84F06E58',
   },
   ENJ: {
@@ -253,7 +253,7 @@ export const ASSETS = {
     A_TOKEN: '0xBcca60bB61934080951369a648Fb03DF4F96263C',
     S_TOKEN: '0xE4922afAB0BbaDd8ab2a88E0C79d884Ad337fcA6',
     V_TOKEN: '0x619beb58998eD2278e08620f97007e1116D5D25b',
-    INTEREST_RATE_STRATEGY: '0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60',
+    INTEREST_RATE_STRATEGY: '0x6a8C8119b2BA9460162B8C999f5A8C84f28a033f',
     ORACLE: '0x9f2817536Cfd48BF59243d9D8802a5670F5Be05d',
   },
   CRV: {