diff --git a/compose/docker-compose-watcher-mobymask.yml b/compose/docker-compose-watcher-mobymask.yml
new file mode 100644
index 00000000..89892b33
--- /dev/null
+++ b/compose/docker-compose-watcher-mobymask.yml
@@ -0,0 +1,63 @@
+version: '3.2'
+
+services:
+
+  watcher-db:
+    restart: unless-stopped
+    image: postgres:14-alpine
+    environment:
+      - POSTGRES_USER=vdbm
+      - POSTGRES_MULTIPLE_DATABASES=mobymask-watcher,mobymask-watcher-job-queue
+      - POSTGRES_EXTENSION=mobymask-watcher-job-queue:pgcrypto
+      - POSTGRES_PASSWORD=password
+    volumes:
+      - ../common/initdb.d/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
+      - watcher_db_data:/var/lib/postgresql/data
+    ports:
+      - "0.0.0.0:15432:5432"
+    healthcheck:
+      test: ["CMD", "nc", "-v", "localhost", "5432"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 10s
+
+  mobymask-watcher-server:
+    restart: unless-stopped
+    depends_on:
+      watcher-db:
+        condition: service_healthy
+    build:
+      context: ../common/watcher-ts
+    command: ["sh", "-c", "yarn server"]
+    volumes:
+      - ../common/watcher-ts/mobymask-watcher.toml:/app/packages/mobymask-watcher/environments/local.toml
+    ports:
+      - "0.0.0.0:3001:3001"
+      - "0.0.0.0:9001:9001"
+    healthcheck:
+      test: ["CMD", "nc", "-v", "localhost", "3001"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+
+  mobymask-watcher-job-runner:
+    restart: unless-stopped
+    depends_on:
+      mobymask-watcher-server:
+        condition: service_healthy
+      watcher-db:
+        condition: service_healthy
+    build:
+      context: ../common/watcher-ts
+    command: ["sh", "-c", "yarn job-runner"]
+    volumes:
+      - ../common/watcher-ts/mobymask-watcher.toml:/app/packages/mobymask-watcher/environments/local.toml
+    ports:
+      - "0.0.0.0:9000:9000"
+
+volumes:
+  indexer_db_data:
+  watcher_db_data:
+  
\ No newline at end of file
diff --git a/repository-list.txt b/repository-list.txt
index 01e178ac..97dfb413 100644
--- a/repository-list.txt
+++ b/repository-list.txt
@@ -9,3 +9,4 @@ vulcanize/ipld-eth-beacon-indexer
 vulcanize/ipld-eth-beacon-db
 cerc-io/laconicd
 cerc-io/laconic-cns-cli
+cerc-io/mobymask-watcher
diff --git a/stacks/mobymask/stack.yml b/stacks/mobymask/stack.yml
new file mode 100644
index 00000000..3dd4e798
--- /dev/null
+++ b/stacks/mobymask/stack.yml
@@ -0,0 +1,7 @@
+name: mobymask-watcher
+repos:
+  - cerc-io/mobymask-watcher
+containers:
+  - cerc/watcher-mobymask
+pods:
+  - watcher-mobymask
\ No newline at end of file