diff --git a/hardhat.config.ts b/hardhat.config.ts
index 3331c2c..130dd8d 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -91,7 +91,7 @@ const config: HardhatUserConfig = {
     },
     tarbeth: {
       url: `${QUICKNODE_ARBITRUM_SEPOLIA_API_KEY}`,
-      accounts: [`${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT}`]
+      accounts: [`${TESTNET_PRIVATE_KEY_FOR_CONTRACT_DEPLOYMENT}`]
     },
     arbeth: {
       url: `${QUICKNODE_ARBITRUM_ONE_API_KEY}`,
@@ -99,7 +99,7 @@ const config: HardhatUserConfig = {
     },
     topeth: {
       url: `${QUICKNODE_OPTIMISM_SEPOLIA_API_KEY}`,
-      accounts: [`${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT}`]
+      accounts: [`${TESTNET_PRIVATE_KEY_FOR_CONTRACT_DEPLOYMENT}`]
     },
     opeth: {
       url: `${QUICKNODE_OPTIMISM_API_KEY}`,
diff --git a/scripts/deploy.ts b/scripts/deploy.ts
index 9677e07..95bfffa 100644
--- a/scripts/deploy.ts
+++ b/scripts/deploy.ts
@@ -57,15 +57,19 @@ async function main() {
     case 42161:
     // tarbeth
     case 421614:
-      walletImplementationContractName = 'ArbethWalletSimple';
-      contractPath = `contracts/coins/${walletImplementationContractName}.sol:${walletImplementationContractName}`;
+      walletImplementationContractName = 'WalletSimple';
+      forwarderContractName = 'Forwarder';
+      forwarderFactoryContractName = 'ForwarderFactory';
+      contractPath = `contracts/${walletImplementationContractName}.sol:${walletImplementationContractName}`;
       break;
     // opeth
     case 10:
     // topeth
     case 11155420:
-      walletImplementationContractName = 'OpethWalletSimple';
-      contractPath = `contracts/coins/${walletImplementationContractName}.sol:${walletImplementationContractName}`;
+      walletImplementationContractName = 'WalletSimple';
+      forwarderContractName = 'Forwarder';
+      forwarderFactoryContractName = 'ForwarderFactory';
+      contractPath = `contracts/${walletImplementationContractName}.sol:${walletImplementationContractName}`;
       break;
     // zketh
     case 324: