diff --git a/app/data/compose/docker-compose-watcher-v2-mobymask.yml b/app/data/compose/docker-compose-watcher-mobymask-v2.yml
similarity index 80%
rename from app/data/compose/docker-compose-watcher-v2-mobymask.yml
rename to app/data/compose/docker-compose-watcher-mobymask-v2.yml
index 86e73591..250653f1 100644
--- a/app/data/compose/docker-compose-watcher-v2-mobymask.yml
+++ b/app/data/compose/docker-compose-watcher-mobymask-v2.yml
@@ -26,12 +26,12 @@ services:
     depends_on:
       mobymask-watcher-db:
         condition: service_healthy
-    image: cerc/watcher-v2-mobymask:local
+    image: cerc/watcher-mobymask-v2:local
     command: ["sh", "-c", "yarn server"]
     volumes:
-      - ../config/watcher-v2-mobymask/mobymask-v2-watcher.toml:/app/packages/mobymask-v2-watcher/environments/local.toml
-      - ../config/watcher-v2-mobymask/.env:/app/packages/peer/.env
-      - ../config/watcher-v2-mobymask/relay-id.json:/app/packages/mobymask-v2-watcher/relay-id.json
+      - ../config/watcher-mobymask-v2/watcher.toml:/app/packages/mobymask-v2-watcher/environments/local.toml
+      - ../config/watcher-mobymask-v2/.env:/app/packages/peer/.env
+      - ../config/watcher-mobymask-v2/relay-id.json:/app/packages/mobymask-v2-watcher/relay-id.json
     ports:
       - "0.0.0.0:3001:3001"
       - "0.0.0.0:9001:9001"
diff --git a/app/data/config/watcher-v2-mobymask/.env b/app/data/config/watcher-mobymask-v2/.env
similarity index 100%
rename from app/data/config/watcher-v2-mobymask/.env
rename to app/data/config/watcher-mobymask-v2/.env
diff --git a/app/data/config/watcher-v2-mobymask/config.json b/app/data/config/watcher-mobymask-v2/config.json
similarity index 100%
rename from app/data/config/watcher-v2-mobymask/config.json
rename to app/data/config/watcher-mobymask-v2/config.json
diff --git a/app/data/config/watcher-v2-mobymask/relay-id.json b/app/data/config/watcher-mobymask-v2/relay-id.json
similarity index 100%
rename from app/data/config/watcher-v2-mobymask/relay-id.json
rename to app/data/config/watcher-mobymask-v2/relay-id.json
diff --git a/app/data/config/watcher-v2-mobymask/mobymask-v2-watcher.toml b/app/data/config/watcher-mobymask-v2/watcher.toml
similarity index 100%
rename from app/data/config/watcher-v2-mobymask/mobymask-v2-watcher.toml
rename to app/data/config/watcher-mobymask-v2/watcher.toml
diff --git a/app/data/container-build/cerc-react-peer/Dockerfile b/app/data/container-build/cerc-react-peer/Dockerfile
index 0440ff01..2511d623 100644
--- a/app/data/container-build/cerc-react-peer/Dockerfile
+++ b/app/data/container-build/cerc-react-peer/Dockerfile
@@ -7,6 +7,6 @@ WORKDIR /app
 COPY . .
 
 RUN echo "Building react-peer" && \
-    yarn
+    yarn && yarn workspace @cerc-io/react-peer build
 
 WORKDIR /app
diff --git a/app/data/container-build/cerc-watcher-v2-mobymask/Dockerfile b/app/data/container-build/cerc-watcher-mobymask-v2/Dockerfile
similarity index 100%
rename from app/data/container-build/cerc-watcher-v2-mobymask/Dockerfile
rename to app/data/container-build/cerc-watcher-mobymask-v2/Dockerfile
diff --git a/app/data/container-build/cerc-watcher-v2-mobymask/build.sh b/app/data/container-build/cerc-watcher-mobymask-v2/build.sh
similarity index 66%
rename from app/data/container-build/cerc-watcher-v2-mobymask/build.sh
rename to app/data/container-build/cerc-watcher-mobymask-v2/build.sh
index fd866bd1..19e82818 100755
--- a/app/data/container-build/cerc-watcher-v2-mobymask/build.sh
+++ b/app/data/container-build/cerc-watcher-mobymask-v2/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-# Build cerc/watcher-v2-mobymask
+# Build cerc/watcher-mobymask-v2
 
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-docker build -t cerc/watcher-v2-mobymask:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/watcher-ts
+docker build -t cerc/watcher-mobymask-v2:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/watcher-ts
diff --git a/app/data/container-image-list.txt b/app/data/container-image-list.txt
index 01cbcbc0..58e5e054 100644
--- a/app/data/container-image-list.txt
+++ b/app/data/container-image-list.txt
@@ -18,7 +18,7 @@ cerc/watcher-erc20
 cerc/watcher-erc721
 cerc/watcher-uniswap-v3
 cerc/uniswap-v3-info
-cerc/watcher-v2-mobymask
+cerc/watcher-mobymask-v2
 cerc/react-peer
 cerc/mobymask-ui
 cerc/test-container
diff --git a/app/data/pod-list.txt b/app/data/pod-list.txt
index 458ca021..99974fa6 100644
--- a/app/data/pod-list.txt
+++ b/app/data/pod-list.txt
@@ -14,7 +14,7 @@ watcher-mobymask
 watcher-erc20
 watcher-erc721
 watcher-uniswap-v3
-watcher-v2-mobymask
+watcher-mobymask-v2
 test
 eth-probe
 keycloak
diff --git a/app/data/stacks/mobymask-v2-watcher/README.md b/app/data/stacks/mobymask-v2/README.md
similarity index 68%
rename from app/data/stacks/mobymask-v2-watcher/README.md
rename to app/data/stacks/mobymask-v2/README.md
index b5e51eb7..f01a88f7 100644
--- a/app/data/stacks/mobymask-v2-watcher/README.md
+++ b/app/data/stacks/mobymask-v2/README.md
@@ -1,19 +1,19 @@
 # MobyMask v2 watcher
 
-Instructions to deploy MobyMask v2 watcher stack using [laconic-stack-orchestrator](../../README.md#setup)
+Instructions to deploy MobyMask v2 watcher stack using [laconic-stack-orchestrator](/README.md#install)
 
 ## Setup
 
 Clone required repositories:
 
 ```bash
-laconic-so --stack mobymask-v2-watcher setup-repositories
+laconic-so --stack mobymask-v2 setup-repositories
 ```
 
 Build the container images:
 
 ```bash
-laconic-so --stack mobymask-v2-watcher build-containers
+laconic-so --stack mobymask-v2 build-containers
 ```
 
 This should create the required docker images in the local image registry.
@@ -21,7 +21,7 @@ This should create the required docker images in the local image registry.
 Deploy the stack:
 
 ```bash
-laconic-so --stack mobymask-v2-watcher deploy-system up
+laconic-so --stack mobymask-v2 deploy-system up
 ```
 
 ## Tests
@@ -43,5 +43,5 @@ docker exec -w /app/packages/peer $CONTAINER_ID yarn test
 To stop all the services running in background run:
 
 ```bash
-laconic-so --stack mobymask-v2-watcher deploy-system down
+laconic-so --stack mobymask-v2 deploy-system down
 ```
diff --git a/app/data/stacks/mobymask-v2-watcher/stack.yml b/app/data/stacks/mobymask-v2/stack.yml
similarity index 65%
rename from app/data/stacks/mobymask-v2-watcher/stack.yml
rename to app/data/stacks/mobymask-v2/stack.yml
index bc51812e..ed7b3372 100644
--- a/app/data/stacks/mobymask-v2-watcher/stack.yml
+++ b/app/data/stacks/mobymask-v2/stack.yml
@@ -1,12 +1,12 @@
 version: "1.0"
-name: mobymask-v2-watcher
+name: mobymask-v2
 repos:
   - cerc-io/watcher-ts
   - cerc-io/react-peer
   - cerc-io/mobymask-ui
 containers:
-  - cerc/watcher-v2-mobymask
+  - cerc/watcher-mobymask-v2
   - cerc/react-peer
   - cerc/mobymask-ui
 pods:
-  - watcher-v2-mobymask
+  - watcher-mobymask-v2