diff --git a/contracts/base/ProxyFactory.sol b/contracts/base/ProxyFactory.sol
new file mode 100644
index 00000000..d6dd269f
--- /dev/null
+++ b/contracts/base/ProxyFactory.sol
@@ -0,0 +1,7 @@
+pragma solidity ^0.8.0;
+
+import {ERC1967Factory} from "solady/utils/ERC1967Factory.sol";
+
+contract ProxyFactory is ERC1967Factory {
+    constructor() {}
+}
\ No newline at end of file
diff --git a/deployments/dev_addresses.json b/deployments/dev_addresses.json
index 6fb6b53c..242369d1 100644
--- a/deployments/dev_addresses.json
+++ b/deployments/dev_addresses.json
@@ -1,48 +1,32 @@
 {
-  "84532": {
-    "ContractFactoryPlug": "0xA557EBE094F939ae6eE8F18c8F88D06182168786",
-    "FastSwitchboard": "0x06234dB2D69Ac158793a3ce59c3764422028E964",
-    "FeesPlug": "0xD78f99D62BeaF0918bB0601C68EB537b6703Ce63",
-    "Socket": "0x6c40Fb39B03e32EC4D23e31DdE6D10283F2C7b4F",
-    "SocketBatcher": "0xA944BBe5D4F67a242C9e92d539fF2d55616283a7",
-    "startBlock": 22408552
-  },
   "421614": {
-    "ContractFactoryPlug": "0x73e72Df0e73d9ceA2C96D16D512B203bc8DC0A77",
-    "FastSwitchboard": "0x29E632aE79107A82C637016CA21030d922De5375",
-    "FeesPlug": "0x469B536c5Df15948c8759FEEE5DB1c17790d4152",
-    "Socket": "0xa0E1738a9Fc0698789866e09d7A335d30128C5C5",
-    "SocketBatcher": "0x6734a30B8f2d210faefa5aeD4E11b674C59641F1",
-    "startBlock": 127534886
+    "ContractFactoryPlug": "0xCE9aF7Fb0Ee31276Ea64Cd7414d54eC57dA9b675",
+    "FastSwitchboard": "0x772088727d003f5A6Cf816E745ba6B8F8dEBbCe9",
+    "FeesPlug": "0xcc38176545fa5f6c2aB970F6d2D62b2D90bBA3Ba",
+    "Socket": "0xdE177c392Ad47377BA944215A944f530F79E1d87",
+    "SocketBatcher": "0x6BF08F11bDA6CD571Bc942F23ec38b8652FFfB2D",
+    "startBlock": 127798344
   },
   "7625382": {
-    "AddressResolver": "0xA57B7ce75aF92ADd9f2e7D3F66cc3B8675B1D697",
-    "AddressResolverImpl": "0xbBfb525ADc6eC38Ef0D4b807d327c2Dd1C286de1",
-    "AuctionManager": "0x6Ba8F0fD3Aac6786D552e691486e49Cfdcc948C1",
-    "AuctionManagerImpl": "0x23EF7Af3bC1009EA6f95c3389921d5cB19950182",
-    "DeliveryHelper": "0xb69045D15f6c13c4b3718d0E03d8f6d4476c3A10",
-    "DeliveryHelperImpl": "0x4CCF8F511A364827E5e6749b196BB26Ea00bF512",
-    "ERC1967Factory": "0x208dC31cd6042a09bbFDdB31614A337a51b870ba",
-    "FeesManager": "0x3Df4D93F499fB4C489D4741ABd5e662D2EA58A49",
-    "FeesManagerImpl": "0x8dcEE196AFECe27545687426914d2830ff2dbc35",
-    "startBlock": 2316,
-    "WatcherPrecompile": "0x595bF33368B034da798be2a4345F52C26121C685",
-    "WatcherPrecompileImpl": "0x09B503e744DCB2cA2827ce5AF08Fd49Ba06D17e4"
-  },
-  "11155111": {
-    "ContractFactoryPlug": "0xf0f51Ba62284A98AbB5D447487d5E6B536DB9B72",
-    "FastSwitchboard": "0x6D54668ba18B425a1DbFC0BD720145c0aeE97f65",
-    "FeesPlug": "0xC559BABEbcD92278E91a545308190E4761efc347",
-    "Socket": "0xD78f99D62BeaF0918bB0601C68EB537b6703Ce63",
-    "SocketBatcher": "0xA557EBE094F939ae6eE8F18c8F88D06182168786",
-    "startBlock": 7790632
+    "AddressResolver": "0x403eCBcC4d4bB8Fad09034bf0d197dDC626C832f",
+    "AddressResolverImpl": "0xbAeF84edEae864Ff22Bd9c9912AdfF84aD490d82",
+    "AuctionManager": "0x7dc45C49650e2914e3fA6E194e2080775c58256E",
+    "AuctionManagerImpl": "0xa07e38cAB46eAA358C3653C63219f1009e8F7789",
+    "DeliveryHelper": "0x0861f0888125e5A243C7af2c3E0F80C357c4c0C0",
+    "DeliveryHelperImpl": "0x9F10A0c71178dbD4d049f2C04fD0e34966134b9e",
+    "ERC1967Factory": "0x945e9ab4c08c225C10F178a0bd600BcC2bA7Cc78",
+    "FeesManager": "0x777fAAf1c30Ce8E68262b1cbF0a752d4f1bA652C",
+    "FeesManagerImpl": "0xB423eE3bffc3604F96B59cF419C48AE05b8E9d0b",
+    "startBlock": 73062,
+    "WatcherPrecompile": "0xadA397123A6E80F67b1887895A62B2D9273E50b4",
+    "WatcherPrecompileImpl": "0x71956F006Ec5434581D3Fd5E7224BB3bae231907"
   },
   "11155420": {
-    "ContractFactoryPlug": "0xB0694bF9332ec67825B9Ad6E677941aeAF50995F",
-    "FastSwitchboard": "0x245C0DCF8eF6e52b4d03c96b563C83a5f78A1E14",
-    "FeesPlug": "0xa8176BE60350AA44Dd10d46f42720cD604EE85Ff",
-    "Socket": "0x79Ac996De9333956f4980397ED5Bd91f77f10b01",
-    "SocketBatcher": "0x4afd974a84F224ea25dd43be91C6fbaff8DcEcfa",
-    "startBlock": 24391377
+    "ContractFactoryPlug": "0x289A0413420f812a7b05F931FB0726168121ae5a",
+    "FastSwitchboard": "0x59D9c8C5515cF9C8A9c83458E3D78C2a246E3e7C",
+    "FeesPlug": "0x285d1b2e93c1c74E141dC37f759B8aFAcD479b2b",
+    "Socket": "0xa347A8475d4d218b22e8b0cc90FF76B3e6c8043c",
+    "SocketBatcher": "0x4a7Ccf2845222172A8B7Fc6E132eDb64cCB4E4a4",
+    "startBlock": 24425961
   }
 }
diff --git a/deployments/dev_verification.json b/deployments/dev_verification.json
index e9eca4a3..08bfd6ce 100644
--- a/deployments/dev_verification.json
+++ b/deployments/dev_verification.json
@@ -61,6 +61,42 @@
     ]
   ],
   "7625382": [
+    [
+      "0xa07e38cAB46eAA358C3653C63219f1009e8F7789",
+      "AuctionManager",
+      "contracts/protocol/payload-delivery/AuctionManager.sol",
+      []
+    ],
+    [
+      "0x9F10A0c71178dbD4d049f2C04fD0e34966134b9e",
+      "DeliveryHelper",
+      "contracts/protocol/payload-delivery/app-gateway/DeliveryHelper.sol",
+      []
+    ],
+    [
+      "0xB423eE3bffc3604F96B59cF419C48AE05b8E9d0b",
+      "FeesManager",
+      "contracts/protocol/payload-delivery/FeesManager.sol",
+      []
+    ],
+    [
+      "0x71956F006Ec5434581D3Fd5E7224BB3bae231907",
+      "WatcherPrecompile",
+      "contracts/protocol/watcherPrecompile/WatcherPrecompile.sol",
+      []
+    ],
+    [
+      "0xbAeF84edEae864Ff22Bd9c9912AdfF84aD490d82",
+      "AddressResolver",
+      "contracts/protocol/AddressResolver.sol",
+      []
+    ],
+    [
+      "0x945e9ab4c08c225C10F178a0bd600BcC2bA7Cc78",
+      "ERC1967Factory",
+      "lib/solady/src/utils/ERC1967Factory.sol",
+      []
+    ],
     [
       "0x09B503e744DCB2cA2827ce5AF08Fd49Ba06D17e4",
       "WatcherPrecompile",
@@ -176,24 +212,6 @@
         "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18"
       ]
     ],
-    [
-      "0xB0694bF9332ec67825B9Ad6E677941aeAF50995F",
-      "ContractFactoryPlug",
-      "contracts/protocol/payload-delivery/ContractFactoryPlug.sol",
-      [
-        "0x79Ac996De9333956f4980397ED5Bd91f77f10b01",
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18"
-      ]
-    ],
-    [
-      "0xa8176BE60350AA44Dd10d46f42720cD604EE85Ff",
-      "FeesPlug",
-      "contracts/protocol/payload-delivery/FeesPlug.sol",
-      [
-        "0x79Ac996De9333956f4980397ED5Bd91f77f10b01",
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18"
-      ]
-    ],
     [
       "0xBf9Ec2b0441eeEA9bEb89C6638921c37c15A13E4",
       "FastSwitchboard",
@@ -204,15 +222,6 @@
         "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18"
       ]
     ],
-    [
-      "0x4afd974a84F224ea25dd43be91C6fbaff8DcEcfa",
-      "SocketBatcher",
-      "contracts/protocol/socket/SocketBatcher.sol",
-      [
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "0x79Ac996De9333956f4980397ED5Bd91f77f10b01"
-      ]
-    ],
     [
       "0x79Ac996De9333956f4980397ED5Bd91f77f10b01",
       "Socket",
diff --git a/hardhat-scripts/deploy/1.deploy.ts b/hardhat-scripts/deploy/1.deploy.ts
index 3b2eaf77..2639bb17 100644
--- a/hardhat-scripts/deploy/1.deploy.ts
+++ b/hardhat-scripts/deploy/1.deploy.ts
@@ -105,7 +105,7 @@ const deployEVMxContracts = async () => {
 
       deployUtils = await deployContractWithProxy(
         EVMxCoreContracts.FeesManager,
-        `contracts/protocol/payload-delivery/app-gateway/FeesManager.sol`,
+        `contracts/protocol/payload-delivery/FeesManager.sol`,
         [addressResolver.address, EVMxOwner, EVMX_CHAIN_ID],
         proxyFactory,
         deployUtils
@@ -125,7 +125,7 @@ const deployEVMxContracts = async () => {
 
       deployUtils = await deployContractWithProxy(
         EVMxCoreContracts.AuctionManager,
-        `contracts/protocol/payload-delivery/app-gateway/AuctionManager.sol`,
+        `contracts/protocol/payload-delivery/AuctionManager.sol`,
         [
           EVMX_CHAIN_ID,
           auctionEndDelaySeconds,
diff --git a/hardhat-scripts/deploy/2.roles.ts b/hardhat-scripts/deploy/2.roles.ts
index cf96de35..4c517e5e 100644
--- a/hardhat-scripts/deploy/2.roles.ts
+++ b/hardhat-scripts/deploy/2.roles.ts
@@ -120,10 +120,6 @@ export const main = async () => {
   try {
     console.log("Setting Roles");
     const addresses = getAddresses(mode) as unknown as DeploymentAddresses;
-
-    console.log("Setting Roles for EVMx");
-    await setRolesForEVMx(addresses);
-
     console.log("Setting Roles for On Chain");
     for (const chain of chains) {
       await setRolesForOnChain(chain, addresses);
diff --git a/package.json b/package.json
index bf794bff..8529f8ac 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "socket protocol",
   "scripts": {
     "build": "hardhat export-abi && tsc --project lib.tsconfig.json",
diff --git a/setupInfraContracts.sh b/setupInfraContracts.sh
index 5040cc54..19d7adb8 100644
--- a/setupInfraContracts.sh
+++ b/setupInfraContracts.sh
@@ -1,7 +1,11 @@
-time npx hardhat run hardhat-scripts/deploy/1.deploy.ts 
+if [ "$1" = "compile" ]; then
+  time npx hardhat run hardhat-scripts/deploy/1.deploy.ts
+else
+  time npx hardhat run hardhat-scripts/deploy/1.deploy.ts --no-compile
+fi
 time npx hardhat run hardhat-scripts/deploy/2.roles.ts --no-compile
 time npx hardhat run hardhat-scripts/deploy/3.upgradeManagers.ts --no-compile
 time npx hardhat run hardhat-scripts/deploy/4.connect.ts --no-compile
 time npx ts-node hardhat-scripts/deploy/5.upload.ts --resolveJsonModule
 time npx hardhat run hardhat-scripts/deploy/6.setupEnv.ts --no-compile
-time npx hardhat run hardhat-scripts/verify/verify.ts --no-compile
+time npx hardhat run hardhat-scripts/verify/verify.ts --no-compile & disown
diff --git a/testScript.sh b/testScript.sh
index d69c2f14..456bd718 100644
--- a/testScript.sh
+++ b/testScript.sh
@@ -11,7 +11,7 @@ source .env && forge script script/parallel-counter/checkCounters.s.sol --broadc
 source .env && forge script script/counter/deployEVMxCounterApp.s.sol --broadcast --skip-simulation --legacy --gas-price 0
 source .env && forge script script/counter/DeployCounterOnchain.s.sol --broadcast --skip-simulation
 ## set limits for the app gateway using API
-source .env && cast send $DEPLOYER "deployContracts(uint32)" 421614 --private-key $PRIVATE_KEY --legacy --gas-price 0
+source .env && cast send $APP_GATEWAY "deployContracts(uint32)" 421614 --private-key $PRIVATE_KEY --legacy --gas-price 0
 source .env && cast send $APP_GATEWAY "incrementCounters(address[])" '[0x18a93d520879524e0c215b64f05914da5883540f]' --private-key $PRIVATE_KEY --legacy --gas-price 0
 source .env && cast send $APP_GATEWAY "readCounters(address[])" '[0x18a93d520879524e0c215b64f05914da5883540f]' --private-key $PRIVATE_KEY --legacy --gas-price 0