diff --git a/app/data/compose/docker-compose-peer-test-app.yml b/app/data/compose/docker-compose-peer-test-app.yml
index 0a8d1c65..18968bd1 100644
--- a/app/data/compose/docker-compose-peer-test-app.yml
+++ b/app/data/compose/docker-compose-peer-test-app.yml
@@ -10,9 +10,14 @@ services:
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       CERC_RELAY_NODES: ${CERC_RELAY_NODES}
-    command: ["sh", "./test-app-start.sh"]
+    command:
+      - sh
+      - -c
+      - ./wait-for-it.sh -h ${CERC_WATCHER_HOST:-$${DEFAULT_CERC_WATCHER_HOST}} -p ${CERC_WATCHER_PORT:-$${DEFAULT_CERC_WATCHER_PORT}} -s -t 0 -- ./test-app-start.sh
     volumes:
-      - ../config/watcher-mobymask-v2/test-app-start.sh:/scripts/test-app-start.sh
+      - ../config/wait-for-it.sh:/app/packages/test-app/wait-for-it.sh
+      - ../config/watcher-mobymask-v2/test-app-config.json:/app/packages/test-app/src/test-app-config.json
+      - ../config/watcher-mobymask-v2/test-app-start.sh:/app/packages/test-app/test-app-start.sh
       - peers_ids:/peers
     ports:
       - "0.0.0.0:3003:80"
diff --git a/app/data/repository-list.txt b/app/data/repository-list.txt
index 3f8c84bf..bfb6085c 100644
--- a/app/data/repository-list.txt
+++ b/app/data/repository-list.txt
@@ -12,6 +12,7 @@ cerc-io/laconic-registry-cli
 cerc-io/laconic-console
 cerc-io/mobymask-watcher
 cerc-io/watcher-ts
+cerc-io/mobymask-v2-watcher-ts
 cerc-io/react-peer
 cerc-io/mobymask-ui
 cerc-io/MobyMask
diff --git a/app/data/stacks/mobymask-v2/README.md b/app/data/stacks/mobymask-v2/README.md
index 32a58b08..30f15f36 100644
--- a/app/data/stacks/mobymask-v2/README.md
+++ b/app/data/stacks/mobymask-v2/README.md
@@ -23,7 +23,7 @@ Checkout to the required versions and branches in repos
 ```bash
 # watcher-ts
 cd ~/cerc/watcher-ts
-git checkout v0.2.35
+git checkout v0.2.39
 
 # react-peer
 cd ~/cerc/react-peer
@@ -73,7 +73,7 @@ Deploy the stack:
 Find the watcher container's id and export it for later use:
 
 ```bash
-export CONTAINER_ID=$(docker ps -q --filter "name=watcher-ts-peer")
+export CONTAINER_ID=$(docker ps -q --filter "name=peer-tests")
 ```
 
 Run the peer tests:
diff --git a/app/data/stacks/mobymask-v2/stack.yml b/app/data/stacks/mobymask-v2/stack.yml
index 3ef84499..7e5b83f7 100644
--- a/app/data/stacks/mobymask-v2/stack.yml
+++ b/app/data/stacks/mobymask-v2/stack.yml
@@ -6,6 +6,7 @@ repos:
   - ethereum-optimism/optimism
   - ethereum-optimism/op-geth
   - cerc-io/watcher-ts
+  - cerc-io/mobymask-v2-watcher-ts
   - cerc-io/react-peer
   - cerc-io/mobymask-ui
   - cerc-io/MobyMask