diff --git a/app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh b/app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh
index 615a525c..f5a32a4e 100755
--- a/app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh
+++ b/app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh
@@ -19,4 +19,16 @@ jq --arg privateKey "$PRIVATE_KEY_DEPLOYER" '.privateKey = $privateKey' secrets-
 export L2_GETH_URL="http://${L2_GETH_HOST}:${L2_GETH_PORT}"
 jq --arg rpcUrl "$L2_GETH_URL" '.rpcUrl = $rpcUrl' secrets.json > secrets_updated.json && mv secrets_updated.json secrets.json
 
+export RPC_URL=L2_GETH_URL
+while true; do
+  ACCOUNT_BALANCE=$(yarn hardhat --network deployment balance $PRIVATE_KEY_DEPLOYER | grep ETH)
+
+  if [ "$ACCOUNT_BALANCE" != "0.0 ETH" ]; then
+    echo "Account balance updated: $ACCOUNT_BALANCE"
+    break # exit the loop
+  fi
+
+  sleep 2 # wait for 2 seconds before checking again
+done
+
 npm run deployAndGenerateInvite
diff --git a/app/data/stacks/fixturenet-optimism/README.md b/app/data/stacks/fixturenet-optimism/README.md
index 49e61dbd..61ca97b3 100644
--- a/app/data/stacks/fixturenet-optimism/README.md
+++ b/app/data/stacks/fixturenet-optimism/README.md
@@ -74,8 +74,6 @@ Clear volumes created by this stack:
 
 ```bash
 # List all relevant volumes
-docker volume ls -q --filter name=laconic*
-
 docker volume ls -q --filter "name=.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data"
 
 # Remove all the listed volumes
diff --git a/app/data/stacks/fixturenet-optimism/l2-only.md b/app/data/stacks/fixturenet-optimism/l2-only.md
index 456a1edf..a1c33717 100644
--- a/app/data/stacks/fixturenet-optimism/l2-only.md
+++ b/app/data/stacks/fixturenet-optimism/l2-only.md
@@ -55,7 +55,7 @@ The `fixturenet-optimism-contracts` service may take a while (`~15 mins`) to com
 To list down and monitor the running containers:
 
 ```bash
-laconic-so --stack fixturenet-optimism deploy ps
+laconic-so --stack fixturenet-optimism deploy --include fixturenet-optimism ps
 
 # With status
 docker ps
diff --git a/app/data/stacks/mobymask-v2/README.md b/app/data/stacks/mobymask-v2/README.md
index 0da86128..e7dfa587 100644
--- a/app/data/stacks/mobymask-v2/README.md
+++ b/app/data/stacks/mobymask-v2/README.md
@@ -72,19 +72,9 @@ Deploy the stack:
 Find the watcher container's id and export it for later use:
 
 ```bash
-laconic-so --stack mobymask-v2 deploy-system ps | grep "mobymask-watcher-server"
-
-export CONTAINER_ID=<CONTAINER_ID>
+export CONTAINER_ID=$(docker ps -q --filter "name=mobymask-watcher-server")
 ```
 
-Example output:
-
-```
-id: 5d3aae4b22039fcd1c9b18feeb91318ede1100581e75bb5ac54f9e436066b02c, name: laconic-bfb01caf98b1b8f7c8db4d33f11b905a-mobymask-watcher-server-1, ports: 0.0.0.0:3001->3001/tcp, 0.0.0.0:9001->9001/tcp, 0.0.0.0:9090->9090/tcp
-```
-
-In above output the container ID is `5d3aae4b22039fcd1c9b18feeb91318ede1100581e75bb5ac54f9e436066b02c`
-
 Run the peer tests:
 
 ```bash
diff --git a/app/data/stacks/mobymask-v2/mobymask-only.md b/app/data/stacks/mobymask-v2/mobymask-only.md
index a85eb7f4..e7326a73 100644
--- a/app/data/stacks/mobymask-v2/mobymask-only.md
+++ b/app/data/stacks/mobymask-v2/mobymask-only.md
@@ -32,10 +32,6 @@ git checkout laconic
 cd ~/cerc/MobyMask
 # TODO: Checkout to updated version
 git checkout v0.1.1
-
-# Optimism
-cd ~/cerc/optimism
-git checkout @eth-optimism/sdk@0.0.0-20230329025055
 ```
 
 Build the container images:
@@ -63,36 +59,14 @@ laconic-so --stack mobymask-v2 deploy --include watcher-mobymask-v2 up
 To list down and monitor the running containers:
 
 ```bash
-laconic-so --stack mobymask-v2 deploy ps
+laconic-so --stack mobymask-v2 deploy --include watcher-mobymask-v2 ps
 # With status
 docker ps
 # Check logs for a container
 docker logs -f <CONTAINER_ID>
 ```
 
-## Tests
-
-Find the watcher container's id and export it for later use:
-
-```bash
-laconic-so --stack mobymask-v2 deploy-system --include watcher-mobymask-v2 ps | grep "mobymask-watcher-server"
-
-export CONTAINER_ID=<CONTAINER_ID>
-```
-
-Example output:
-
-```
-id: 5d3aae4b22039fcd1c9b18feeb91318ede1100581e75bb5ac54f9e436066b02c, name: laconic-bfb01caf98b1b8f7c8db4d33f11b905a-mobymask-watcher-server-1, ports: 0.0.0.0:3001->3001/tcp, 0.0.0.0:9001->9001/tcp, 0.0.0.0:9090->9090/tcp
-```
-
-In above output the container ID is `5d3aae4b22039fcd1c9b18feeb91318ede1100581e75bb5ac54f9e436066b02c`
-
-Run the peer tests:
-
-```bash
-docker exec -w /app/packages/peer $CONTAINER_ID yarn test
-```
+See [Tests](./README.md#tests) and [Demo](./README.md#demo) to interact with stack
 
 ## Clean up