diff --git a/safe.csv b/safe.csv
index 7c4d7ac7..dda737f0 100644
--- a/safe.csv
+++ b/safe.csv
@@ -785,14 +785,14 @@ address,name,chainId
 0xA1c93D2687f7014Aaf588c764E3Ce80aF016229b,GhoEthereum GHO_LIQUIDITY_COMMITTEE,1
 0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f,GhoEthereum GHO_TOKEN,1
 0x167527DB01325408696326e3580cd8e55D99Dc1A,GhoEthereum GSM_REGISTRY,1
-0x0d8eFfC11dF3F229AA1EA0509BC9DFa632A13578,GhoEthereum GSM_USDC,1
-0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5,GhoEthereum GSM_USDC_FEE_STRATEGY,1
-0xef6beCa8D9543eC007bceA835aF768B58F730C1f,GhoEthereum GSM_USDC_ORACLE_SWAP_FREEZER,1
-0x430BEdcA5DfA6f94d1205Cb33AB4f008D0d9942a,GhoEthereum GSM_USDC_PRICE_STRATEGY,1
-0x686F8D21520f4ecEc7ba577be08354F4d1EB8262,GhoEthereum GSM_USDT,1
-0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5,GhoEthereum GSM_USDT_FEE_STRATEGY,1
-0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5,GhoEthereum GSM_USDT_ORACLE_SWAP_FREEZER,1
-0x4c707764cbFB4FFa078e169e6b8A6AdbE7526a2c,GhoEthereum GSM_USDT_PRICE_STRATEGY,1
+0xFeeb6FE430B7523fEF2a38327241eE7153779535,GhoEthereum GSM_USDC,1
+0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938,GhoEthereum GSM_USDC_FEE_STRATEGY,1
+0x29F8c924B7aB50649c9597B8811d08f9Ef0310c3,GhoEthereum GSM_USDC_ORACLE_SWAP_FREEZER,1
+0x00e89F4022FD13AD56e321D50612Eec598eF3b72,GhoEthereum GSM_USDC_PRICE_STRATEGY,1
+0x535b2f7C20B9C83d70e519cf9991578eF9816B7B,GhoEthereum GSM_USDT,1
+0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938,GhoEthereum GSM_USDT_FEE_STRATEGY,1
+0x6439DA186BD3d37fE7Fd36036543b403e9FAbaE7,GhoEthereum GSM_USDT_ORACLE_SWAP_FREEZER,1
+0x20Be7090711995336A13e24B9EA9e05ac2cdd8C0,GhoEthereum GSM_USDT_PRICE_STRATEGY,1
 0xEd42a7D8559a463722Ca4beD50E0Cc05a386b0e1,GovernanceV3Ethereum CROSS_CHAIN_CONTROLLER,1
 0xa638c14525CAEE8e498A67b409CCb1B7b34c3981,GovernanceV3Ethereum DATA_WAREHOUSE,1
 0x73C6Fb358dDA8e84D50e98A98F7c0dF32e15C7e9,GovernanceV3Ethereum EMERGENCY_REGISTRY,1
diff --git a/scripts/configs/gho/ethereum.ts b/scripts/configs/gho/ethereum.ts
index b8436c2c..3bf27ecf 100644
--- a/scripts/configs/gho/ethereum.ts
+++ b/scripts/configs/gho/ethereum.ts
@@ -1,5 +1,5 @@
-import {ChainId} from '@bgd-labs/rpc-env';
-import {GhoAddresses} from '../types';
+import { ChainId } from '@bgd-labs/rpc-env';
+import { GhoAddresses } from '../types';
 
 export const ghoEthereum: GhoAddresses = {
   name: 'Ethereum',
@@ -12,16 +12,17 @@ export const ghoEthereum: GhoAddresses = {
     GHO_GSM_STEWARD: '0xD1E856a947CdF56b4f000ee29d34F5808E0A6848',
     // TODO: perhaps makes sense to create a generator for GSM to automatically pull GSMs, for now let's see how this evolves
     GSM_REGISTRY: '0x167527DB01325408696326e3580cd8e55D99Dc1A',
-    GSM_USDC: '0x0d8eFfC11dF3F229AA1EA0509BC9DFa632A13578',
-    GSM_USDT: '0x686F8D21520f4ecEc7ba577be08354F4d1EB8262',
-    GSM_USDC_FEE_STRATEGY: '0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5',
-    GSM_USDT_FEE_STRATEGY: '0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5',
-    GSM_USDC_PRICE_STRATEGY: '0x430BEdcA5DfA6f94d1205Cb33AB4f008D0d9942a',
-    GSM_USDT_PRICE_STRATEGY: '0x4c707764cbFB4FFa078e169e6b8A6AdbE7526a2c',
-    GSM_USDC_ORACLE_SWAP_FREEZER: '0xef6beCa8D9543eC007bceA835aF768B58F730C1f',
-    GSM_USDT_ORACLE_SWAP_FREEZER: '0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5',
+    GSM_USDC: '0xFeeb6FE430B7523fEF2a38327241eE7153779535',
+    GSM_USDT: '0x535b2f7C20B9C83d70e519cf9991578eF9816B7B',
+    GSM_USDC_FEE_STRATEGY: '0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938',
+    GSM_USDT_FEE_STRATEGY: '0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938',
+    GSM_USDC_PRICE_STRATEGY: '0x00e89F4022FD13AD56e321D50612Eec598eF3b72',
+    GSM_USDT_PRICE_STRATEGY: '0x20Be7090711995336A13e24B9EA9e05ac2cdd8C0',
+    GSM_USDC_ORACLE_SWAP_FREEZER: '0x29F8c924B7aB50649c9597B8811d08f9Ef0310c3',
+    GSM_USDT_ORACLE_SWAP_FREEZER: '0x6439da186bd3d37fe7fd36036543b403e9fabae7',
     GHO_AAVE_CORE_STEWARD: '0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34',
     GHO_BUCKET_STEWARD: '0x46Aa1063e5265b43663E81329333B47c517A5409',
     GHO_CCIP_STEWARD: '0xC5BcC58BE6172769ca1a78B8A45752E3C5059c39',
   },
 };
+
diff --git a/src/GhoEthereum.sol b/src/GhoEthereum.sol
index 00ce0cef..13e5a91a 100644
--- a/src/GhoEthereum.sol
+++ b/src/GhoEthereum.sol
@@ -22,31 +22,31 @@ library GhoEthereum {
   // https://etherscan.io/address/0x167527DB01325408696326e3580cd8e55D99Dc1A
   address internal constant GSM_REGISTRY = 0x167527DB01325408696326e3580cd8e55D99Dc1A;
 
-  // https://etherscan.io/address/0x0d8eFfC11dF3F229AA1EA0509BC9DFa632A13578
-  address internal constant GSM_USDC = 0x0d8eFfC11dF3F229AA1EA0509BC9DFa632A13578;
+  // https://etherscan.io/address/0xFeeb6FE430B7523fEF2a38327241eE7153779535
+  address internal constant GSM_USDC = 0xFeeb6FE430B7523fEF2a38327241eE7153779535;
 
-  // https://etherscan.io/address/0x686F8D21520f4ecEc7ba577be08354F4d1EB8262
-  address internal constant GSM_USDT = 0x686F8D21520f4ecEc7ba577be08354F4d1EB8262;
+  // https://etherscan.io/address/0x535b2f7C20B9C83d70e519cf9991578eF9816B7B
+  address internal constant GSM_USDT = 0x535b2f7C20B9C83d70e519cf9991578eF9816B7B;
 
-  // https://etherscan.io/address/0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5
-  address internal constant GSM_USDC_FEE_STRATEGY = 0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5;
+  // https://etherscan.io/address/0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938
+  address internal constant GSM_USDC_FEE_STRATEGY = 0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938;
 
-  // https://etherscan.io/address/0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5
-  address internal constant GSM_USDT_FEE_STRATEGY = 0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5;
+  // https://etherscan.io/address/0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938
+  address internal constant GSM_USDT_FEE_STRATEGY = 0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938;
 
-  // https://etherscan.io/address/0x430BEdcA5DfA6f94d1205Cb33AB4f008D0d9942a
-  address internal constant GSM_USDC_PRICE_STRATEGY = 0x430BEdcA5DfA6f94d1205Cb33AB4f008D0d9942a;
+  // https://etherscan.io/address/0x00e89F4022FD13AD56e321D50612Eec598eF3b72
+  address internal constant GSM_USDC_PRICE_STRATEGY = 0x00e89F4022FD13AD56e321D50612Eec598eF3b72;
 
-  // https://etherscan.io/address/0x4c707764cbFB4FFa078e169e6b8A6AdbE7526a2c
-  address internal constant GSM_USDT_PRICE_STRATEGY = 0x4c707764cbFB4FFa078e169e6b8A6AdbE7526a2c;
+  // https://etherscan.io/address/0x20Be7090711995336A13e24B9EA9e05ac2cdd8C0
+  address internal constant GSM_USDT_PRICE_STRATEGY = 0x20Be7090711995336A13e24B9EA9e05ac2cdd8C0;
 
-  // https://etherscan.io/address/0xef6beCa8D9543eC007bceA835aF768B58F730C1f
+  // https://etherscan.io/address/0x29F8c924B7aB50649c9597B8811d08f9Ef0310c3
   address internal constant GSM_USDC_ORACLE_SWAP_FREEZER =
-    0xef6beCa8D9543eC007bceA835aF768B58F730C1f;
+    0x29F8c924B7aB50649c9597B8811d08f9Ef0310c3;
 
-  // https://etherscan.io/address/0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5
+  // https://etherscan.io/address/0x6439DA186BD3d37fE7Fd36036543b403e9FAbaE7
   address internal constant GSM_USDT_ORACLE_SWAP_FREEZER =
-    0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5;
+    0x6439DA186BD3d37fE7Fd36036543b403e9FAbaE7;
 
   // https://etherscan.io/address/0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34
   address internal constant GHO_AAVE_CORE_STEWARD = 0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34;
diff --git a/src/ts/GhoEthereum.ts b/src/ts/GhoEthereum.ts
index 1227b6f4..c8738d09 100644
--- a/src/ts/GhoEthereum.ts
+++ b/src/ts/GhoEthereum.ts
@@ -17,29 +17,29 @@ export const GHO_GSM_STEWARD = '0xD1E856a947CdF56b4f000ee29d34F5808E0A6848';
 // https://etherscan.io/address/0x167527DB01325408696326e3580cd8e55D99Dc1A
 export const GSM_REGISTRY = '0x167527DB01325408696326e3580cd8e55D99Dc1A';
 
-// https://etherscan.io/address/0x0d8eFfC11dF3F229AA1EA0509BC9DFa632A13578
-export const GSM_USDC = '0x0d8eFfC11dF3F229AA1EA0509BC9DFa632A13578';
+// https://etherscan.io/address/0xFeeb6FE430B7523fEF2a38327241eE7153779535
+export const GSM_USDC = '0xFeeb6FE430B7523fEF2a38327241eE7153779535';
 
-// https://etherscan.io/address/0x686F8D21520f4ecEc7ba577be08354F4d1EB8262
-export const GSM_USDT = '0x686F8D21520f4ecEc7ba577be08354F4d1EB8262';
+// https://etherscan.io/address/0x535b2f7C20B9C83d70e519cf9991578eF9816B7B
+export const GSM_USDT = '0x535b2f7C20B9C83d70e519cf9991578eF9816B7B';
 
-// https://etherscan.io/address/0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5
-export const GSM_USDC_FEE_STRATEGY = '0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5';
+// https://etherscan.io/address/0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938
+export const GSM_USDC_FEE_STRATEGY = '0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938';
 
-// https://etherscan.io/address/0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5
-export const GSM_USDT_FEE_STRATEGY = '0xD4478A76aCeA81D3768A0ACB6e38f25eEB6Eb1B5';
+// https://etherscan.io/address/0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938
+export const GSM_USDT_FEE_STRATEGY = '0x83896a35db4519BD8CcBAF5cF86CCA61b5cfb938';
 
-// https://etherscan.io/address/0x430BEdcA5DfA6f94d1205Cb33AB4f008D0d9942a
-export const GSM_USDC_PRICE_STRATEGY = '0x430BEdcA5DfA6f94d1205Cb33AB4f008D0d9942a';
+// https://etherscan.io/address/0x00e89F4022FD13AD56e321D50612Eec598eF3b72
+export const GSM_USDC_PRICE_STRATEGY = '0x00e89F4022FD13AD56e321D50612Eec598eF3b72';
 
-// https://etherscan.io/address/0x4c707764cbFB4FFa078e169e6b8A6AdbE7526a2c
-export const GSM_USDT_PRICE_STRATEGY = '0x4c707764cbFB4FFa078e169e6b8A6AdbE7526a2c';
+// https://etherscan.io/address/0x20Be7090711995336A13e24B9EA9e05ac2cdd8C0
+export const GSM_USDT_PRICE_STRATEGY = '0x20Be7090711995336A13e24B9EA9e05ac2cdd8C0';
 
-// https://etherscan.io/address/0xef6beCa8D9543eC007bceA835aF768B58F730C1f
-export const GSM_USDC_ORACLE_SWAP_FREEZER = '0xef6beCa8D9543eC007bceA835aF768B58F730C1f';
+// https://etherscan.io/address/0x29F8c924B7aB50649c9597B8811d08f9Ef0310c3
+export const GSM_USDC_ORACLE_SWAP_FREEZER = '0x29F8c924B7aB50649c9597B8811d08f9Ef0310c3';
 
-// https://etherscan.io/address/0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5
-export const GSM_USDT_ORACLE_SWAP_FREEZER = '0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5';
+// https://etherscan.io/address/0x6439DA186BD3d37fE7Fd36036543b403e9FAbaE7
+export const GSM_USDT_ORACLE_SWAP_FREEZER = '0x6439DA186BD3d37fE7Fd36036543b403e9FAbaE7';
 
 // https://etherscan.io/address/0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34
 export const GHO_AAVE_CORE_STEWARD = '0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34';