diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a70f76a..cfdc08c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -68,7 +68,35 @@ jobs:
 
       - name: Run Forge tests
         run: |
-          forge test -vvv
+          forge test -vvv --no-match-contract MPCOperatorManagerTest
+        id: test
+  test-mpc:
+    name: Foundry Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - uses: actions/cache@v3
+        with:
+          path: "~/.foundry/cache/rpc"
+          key: "${{ runner.os }}-rpc-cache-v1"
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Run Forge build
+        run: |
+          forge --version
+          forge build --sizes
+        id: build
+
+      - name: Run Forge tests
+        run: |
+          forge test -vvv --match-contract MPCOperatorManagerTest --mt ".*MPC"
         id: test
   coverage:
     name: Foundry Coverage
diff --git a/script/scripts/LocalMPC.s.sol b/script/scripts/LocalMPC.s.sol
new file mode 100644
index 0000000..2e96b17
--- /dev/null
+++ b/script/scripts/LocalMPC.s.sol
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: CC0-1.0
+
+pragma solidity 0.8.15;
+
+import "forge-std/Script.sol";
+import "./Env.s.sol";
+import "../../test/shared/EIP2470.t.sol";
+import "../../src/BobToken.sol";
+import "../../src/proxy/EIP1967Proxy.sol";
+import "../../src/zkbob/ZkBobPoolBOB.sol";
+import "../../src/zkbob/manager/MutableOperatorManager.sol";
+import "../../src/zkbob/manager/MPCGuard.sol";
+import "../../src/zkbob/ZkBobDirectDepositQueue.sol";
+import "../../src/zkbob/utils/ZkBobAccounting.sol";
+
+contract DeployLocal is Script {
+    function run() external {
+        vm.startBroadcast();
+
+        EIP1967Proxy bobProxy = new EIP1967Proxy(tx.origin, mockImpl, "");
+        BobToken bobImpl = new BobToken(address(bobProxy));
+        bobProxy.upgradeTo(address(bobImpl));
+        BobToken bob = BobToken(address(bobProxy));
+
+        if (bobMinter != address(0)) {
+            bob.updateMinter(bobMinter, true, true);
+        }
+
+        ITransferVerifier transferVerifier;
+        ITreeVerifier treeVerifier;
+        IBatchDepositVerifier batchDepositVerifier;
+        bytes memory code1 =
+            vm.getCode(string.concat("out/", zkBobVerifiers, "/TransferVerifier.sol/TransferVerifier.json"));
+        bytes memory code2 =
+            vm.getCode(string.concat("out/", zkBobVerifiers, "/TreeUpdateVerifier.sol/TreeUpdateVerifier.json"));
+        bytes memory code3 = vm.getCode(
+            string.concat("out/", zkBobVerifiers, "/DelegatedDepositVerifier.sol/DelegatedDepositVerifier.json")
+        );
+        assembly {
+            transferVerifier := create(0, add(code1, 0x20), mload(code1))
+            treeVerifier := create(0, add(code2, 0x20), mload(code2))
+            batchDepositVerifier := create(0, add(code3, 0x20), mload(code3))
+        }
+
+        EIP1967Proxy poolProxy = new EIP1967Proxy(tx.origin, mockImpl, "");
+        EIP1967Proxy queueProxy = new EIP1967Proxy(tx.origin, mockImpl, "");
+
+        ZkBobPoolBOB poolImpl = new ZkBobPoolBOB(
+            zkBobPoolId, address(bob), transferVerifier, treeVerifier, batchDepositVerifier, address(queueProxy)
+        );
+        {
+            bytes memory initData = abi.encodeWithSelector(ZkBobPool.initialize.selector, zkBobInitialRoot);
+            poolProxy.upgradeToAndCall(address(poolImpl), initData);
+        }
+        ZkBobPoolBOB pool = ZkBobPoolBOB(address(poolProxy));
+
+        ZkBobDirectDepositQueue queueImpl = new ZkBobDirectDepositQueue(address(pool), address(bob), 1_000_000_000);
+        queueProxy.upgradeTo(address(queueImpl));
+        ZkBobDirectDepositQueue queue = ZkBobDirectDepositQueue(address(queueProxy));
+
+        {
+            ZkBobAccounting accounting = new ZkBobAccounting(address(pool), 1_000_000_000);
+            accounting.setLimits(
+                0,
+                zkBobPoolCap,
+                zkBobDailyDepositCap,
+                zkBobDailyWithdrawalCap,
+                zkBobDailyUserDepositCap,
+                zkBobDepositCap,
+                zkBobDailyUserDirectDepositCap,
+                zkBobDirectDepositCap
+            );
+            pool.setAccounting(accounting);
+        }
+
+        {
+
+            MPCGuard guard = new MPCGuard(zkBobRelayer,address(pool));
+            address[] memory guardians = new address[](2);
+            guardians[0] = address(0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266);
+            guardians[1] = address(0x70997970C51812dc3A010C7d01b50e0d17dc79C8);
+            IOperatorManager operatorManager =
+                new MutableOperatorManager(address(guard), zkBobRelayerFeeReceiver, zkBobRelayerURL);
+            pool.setOperatorManager(operatorManager);
+            queue.setOperatorManager(operatorManager);
+            queue.setDirectDepositFee(uint64(zkBobDirectDepositFee));
+            queue.setDirectDepositTimeout(uint40(zkBobDirectDepositTimeout));
+            console2.log("MPCGuard:", address(guard));
+        }
+
+        {
+            if (owner != address(0)) {
+                bob.transferOwnership(owner);
+                pool.transferOwnership(owner);
+                queue.transferOwnership(owner);
+            }
+
+            if (admin != tx.origin) {
+                bobProxy.setAdmin(admin);
+                poolProxy.setAdmin(admin);
+                queueProxy.setAdmin(admin);
+            }
+        }
+
+        vm.stopBroadcast();
+
+        require(bobProxy.implementation() == address(bobImpl), "Invalid implementation address");
+        require(bobProxy.admin() == admin, "Proxy admin is not configured");
+        require(bob.owner() == owner, "Owner is not configured");
+        require(bobMinter == address(0) || bob.isMinter(bobMinter), "Bob minter is not configured");
+        require(poolProxy.implementation() == address(poolImpl), "Invalid implementation address");
+        require(poolProxy.admin() == admin, "Proxy admin is not configured");
+        require(pool.owner() == owner, "Owner is not configured");
+        require(pool.transfer_verifier() == transferVerifier, "Transfer verifier is not configured");
+        require(pool.tree_verifier() == treeVerifier, "Tree verifier is not configured");
+
+        console2.log("BobToken:", address(bob));
+        console2.log("BobToken implementation:", address(bobImpl));
+        console2.log("ZkBobPool:", address(pool));
+        console2.log("ZkBobPool implementation:", address(poolImpl));
+        console2.log("ZkBobDirectDepositQueue:", address(queue));
+        console2.log("ZkBobDirectDepositQueue implementation:", address(queueImpl));
+    }
+}
diff --git a/src/zkbob/manager/MPCGuard.sol b/src/zkbob/manager/MPCGuard.sol
index 9f9dff0..ce8c227 100644
--- a/src/zkbob/manager/MPCGuard.sol
+++ b/src/zkbob/manager/MPCGuard.sol
@@ -52,7 +52,14 @@ contract MPCGuard is Ownable, CustomABIDecoder {
         require(
             checkQuorum(
                 signatures,
-                digest(abi.encodePacked(_mpc_message(), transferRoot, currentRoot))
+                digest(
+                    abi.encodePacked(
+                        _mpc_message(),
+                        transferRoot,
+                        currentRoot,
+                        poolContract.pool_id()
+                    )
+                )
             ),
             "MPCWrapper: wrong quorum"
         );
@@ -113,7 +120,8 @@ contract MPCGuard is Ownable, CustomABIDecoder {
             _out_commit,
             _batch_deposit_proof,
             _tree_proof,
-            poolContract.roots(poolContract.pool_index())
+            poolContract.roots(poolContract.pool_index()),
+            poolContract.pool_id()
         );
 
         require(checkQuorum(signatures, digest(mpc_message)));
diff --git a/test/zkbob/manager/MPCGuard.t.sol b/test/zkbob/manager/MPCGuard.t.sol
index ba96680..1831dcc 100644
--- a/test/zkbob/manager/MPCGuard.t.sol
+++ b/test/zkbob/manager/MPCGuard.t.sol
@@ -75,7 +75,8 @@ contract MPCOperatorManagerTest is
         bytes memory challenge = abi.encodePacked(
             data,
             transfer_root,
-            current_root
+            current_root,
+            poolContract.pool_id()
         );
         (, uint256 guard1Key) = makeAddrAndKey("guard1");
         (, uint256 guard2Key) = makeAddrAndKey("guard2");
@@ -156,7 +157,8 @@ contract MPCOperatorManagerTest is
             outCommitment,
             batch_deposit_proof,
             tree_proof,
-            poolContract.roots(poolContract.pool_index())
+            poolContract.roots(poolContract.pool_index()),
+            poolContract.pool_id()
         );
 
         (, uint256 guard1Key) = makeAddrAndKey("guard1");