diff --git a/deploy/gov-bridge-arbitrum.ts b/deploy/gov-bridge-arbitrum.ts
index ef8d44a..3e791a7 100644
--- a/deploy/gov-bridge-arbitrum.ts
+++ b/deploy/gov-bridge-arbitrum.ts
@@ -15,7 +15,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   } else {
     await deploy('ArbitrumGov', {
       args: [
-        ADDRESSES['ETHEREUM_GOV_EXECUTOR'],
+        ADDRESSES['ETHEREUM_GOV_EXECUTOR_SEPOLIA'],
         CONSTANTS['DELAY'],
         CONSTANTS['GRACE_PERIOD'],
         CONSTANTS['MIN_DELAY'],
diff --git a/deploy/gov-bridge-optimism.ts b/deploy/gov-bridge-optimism.ts
index d0b05d7..a906436 100644
--- a/deploy/gov-bridge-optimism.ts
+++ b/deploy/gov-bridge-optimism.ts
@@ -17,7 +17,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     await deploy('OptimisticGov', {
       args: [
         ADDRESSES['OVM_L2_MESSENGER'],
-        ADDRESSES['ETHEREUM_GOV_EXECUTOR'],
+        ADDRESSES['ETHEREUM_GOV_EXECUTOR_SEPOLIA'],
         CONSTANTS['DELAY'],
         CONSTANTS['GRACE_PERIOD'],
         CONSTANTS['MIN_DELAY'],
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 767aac0..051627e 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -111,26 +111,26 @@ const hardhatConfig: HardhatUserConfig = {
     apiKey: {
       optimisticEthereum: OPTIMISTIC_ETHERSCAN_KEY,
       arbitrumOne: ARBISCAN_KEY,
-      "optimism-testnet": OPTIMISTIC_ETHERSCAN_KEY,
+      optimisticSepolia: OPTIMISTIC_ETHERSCAN_KEY,
     },
     customChains: [
-        {
-          network: 'sepolia',
-          chainId: 11155111,
-          urls: {
-            apiURL: 'https://api-sepolia.etherscan.io/api',
-            browserURL: 'https://sepolia.etherscan.io',
-          },
+      {
+        network: 'sepolia',
+        chainId: 11155111,
+        urls: {
+          apiURL: 'https://api-sepolia.etherscan.io/api',
+          browserURL: 'https://sepolia.etherscan.io',
         },
-        {
-            network: 'optimism-testnet',
-            chainId: 11155420,
-            urls: {
-              apiURL: 'https://api-sepolia-optimism.etherscan.io/api',
-              browserURL: 'https://sepolia-optimism.etherscan.io',
-            },
-          },
-      ],
+      },
+      {
+        network: 'optimisticSepolia',
+        chainId: 11155420,
+        urls: {
+          apiURL: 'https://api-sepolia-optimism.etherscan.io/api',
+          browserURL: 'https://sepolia-optimism.etherscan.io',
+        },
+      },
+    ],
   },
   tenderly: {
     project: TENDERLY_PROJECT,
diff --git a/helpers/gov-constants.ts b/helpers/gov-constants.ts
index 6520857..e8ce250 100644
--- a/helpers/gov-constants.ts
+++ b/helpers/gov-constants.ts
@@ -5,7 +5,8 @@ export const ADDRESSES = {
   // Lido Aragon Agent before usage.
 
   // Common
-  ETHEREUM_GOV_EXECUTOR: '0x184d39300f2fa4419d04998e9c58cb5de586d879',
+  ETHEREUM_GOV_EXECUTOR_MAIN: '0x3e40D73EB977Dc6a537aF587D48316feE66E9C8c ',
+  ETHEREUM_GOV_EXECUTOR_SEPOLIA: '0x32A0E5828B62AAb932362a4816ae03b860b65e83',
 
   // Optimism
   // https://docs.optimism.io/chain/addresses
@@ -13,13 +14,13 @@ export const ADDRESSES = {
   OVM_GUARDIAN: '0x0000000000000000000000000000000000000000',
   OVM_L2_MESSENGER: '0x4200000000000000000000000000000000000007',
 
-  OVM_L1_MESSENGER_MAIN: '0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1',
+  OVM_L1_MESSENGER_MAINNET: '0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1',
 
   // Arbitrum
   ARB_GUARDIAN: '0x0000000000000000000000000000000000000000',
   RETRYABLE_TICKET_TX_ADDRESS: '0x000000000000000000000000000000000000006E',
   INBOX_MAIN: '0x4Dbd4fc535Ac27206064B68FfCf827b0A60BAB3f',
-  INBOX_RINKEBY: '0x578BAde599406A8fE3d24Fd7f7211c0911F5B29e',
+  INBOX_SEPOLIA: '0xaAe29B0366299461418F5324a79Afc425BE5ae21',
 };
 
 export const CONSTANTS = {
diff --git a/helpers/types.ts b/helpers/types.ts
index 0b61e85..50149c6 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -34,7 +34,7 @@ export enum eArbitrumNetwork {
 
 export enum eOptimismNetwork {
   main = 'optimism',
-  testnet = 'optimism-testnet',
+  testnet = 'optimisticSepolia',
 }
 
 export enum EthereumNetworkNames {
diff --git a/package.json b/package.json
index d0e37eb..958c5df 100644
--- a/package.json
+++ b/package.json
@@ -26,12 +26,12 @@
     "hardhat:mumbai": "hardhat --network mumbai",
     "hardhat:matic": "hardhat --network matic",
     "hardhat:optimism": "hardhat --network optimism",
-    "hardhat:optimism-testnet": "hardhat --network optimism-testnet",
+    "hardhat:optimism-testnet": "hardhat --network optimisticSepolia",
     "hardhat:arbitrum": "hardhat --network arbitrum",
     "hardhat:arbitrum-testnet": "hardhat --network arbitrum-testnet",
     "deploy:gov-bridge:optimism-testnet": "npm run hardhat:optimism-testnet -- --tags 'OptimisticGov,Greeter'",
     "deploy:gov-bridge:arbitrum-testnet": "npm run hardhat:arbitrum-testnet -- --tags 'ArbitrumGov,Greeter'",
-    "deploy:optimism:testnet": "hardhat --network optimism-testnet deploy --tags 'OptimisticGov'",
+    "deploy:optimism:testnet": "hardhat --network optimisticSepolia deploy --tags 'OptimisticGov'",
     "deploy:optimism:mainnet": "hardhat --network optimism deploy --tags 'OptimisticGov'",
     "deploy:arbitrum:testnet": "hardhat --network arbitrum-testnet deploy --tags 'ArbitrumGov'",
     "deploy:arbitrum:mainnet": "hardhat --network arbitrum deploy --tags 'ArbitrumGov'"
diff --git a/scripts/validate-deployment.ts b/scripts/validate-deployment.ts
index ade3e4f..56356c3 100644
--- a/scripts/validate-deployment.ts
+++ b/scripts/validate-deployment.ts
@@ -15,7 +15,7 @@ async function main() {
     const arbProvider = new providers.JsonRpcProvider('http://localhost:8546');
     const arbDeployer = new Wallet(testSignerPK, arbProvider);
     const arbBridgeExecutor = await new ArbitrumBridgeExecutor__factory(arbDeployer).deploy(
-      ADDRESSES['ETHEREUM_GOV_EXECUTOR'],
+      ADDRESSES['ETHEREUM_GOV_EXECUTOR_SEPOLIA'],
       CONSTANTS['DELAY'],
       CONSTANTS['GRACE_PERIOD'],
       CONSTANTS['MIN_DELAY'],
@@ -30,7 +30,7 @@ async function main() {
     const optDeployer = new Wallet(testSignerPK, optProvider);
     const arbBridgeExecutor = await new OptimismBridgeExecutor__factory(optDeployer).deploy(
       ADDRESSES['OVM_L2_MESSENGER'],
-      ADDRESSES['ETHEREUM_GOV_EXECUTOR'],
+      ADDRESSES['ETHEREUM_GOV_EXECUTOR_SEPOLIA'],
       CONSTANTS['DELAY'],
       CONSTANTS['GRACE_PERIOD'],
       CONSTANTS['MIN_DELAY'],