diff --git a/app/data/compose/docker-compose-watcher-uniswap-v3.yml b/app/data/compose/docker-compose-watcher-uniswap-v3.yml
index b98f6a70..3befd38a 100644
--- a/app/data/compose/docker-compose-watcher-uniswap-v3.yml
+++ b/app/data/compose/docker-compose-watcher-uniswap-v3.yml
@@ -75,6 +75,8 @@ services:
   uni-watcher-server:
     restart: unless-stopped
     depends_on:
+      ipld-eth-server:
+        condition: service_healthy
       uniswap-watcher-db:
         condition: service_healthy
       uni-watcher-job-runner:
diff --git a/app/data/config/watcher-uniswap-v3/erc20-watcher.toml b/app/data/config/watcher-uniswap-v3/erc20-watcher.toml
index 3e258eeb..c5634831 100644
--- a/app/data/config/watcher-uniswap-v3/erc20-watcher.toml
+++ b/app/data/config/watcher-uniswap-v3/erc20-watcher.toml
@@ -23,8 +23,8 @@
 
 [upstream]
   [upstream.ethServer]
-    gqlApiEndpoint = "http://ipld-eth-server.example.com:8083/graphql"
-    rpcProviderEndpoint = "http://ipld-eth-server.example.com:8082"
+    gqlApiEndpoint = "http://ipld-eth-server:8083/graphql"
+    rpcProviderEndpoint = "http://ipld-eth-server:8082"
 
   [upstream.cache]
     name = "requests"
diff --git a/app/data/config/watcher-uniswap-v3/uni-info-watcher.toml b/app/data/config/watcher-uniswap-v3/uni-info-watcher.toml
index 2f092845..830791d2 100644
--- a/app/data/config/watcher-uniswap-v3/uni-info-watcher.toml
+++ b/app/data/config/watcher-uniswap-v3/uni-info-watcher.toml
@@ -63,8 +63,8 @@
 
 [upstream]
   [upstream.ethServer]
-    gqlApiEndpoint = "http://ipld-eth-server.example.com:8083/graphql"
-    rpcProviderEndpoint = "http://ipld-eth-server.example.com:8082"
+    gqlApiEndpoint = "http://ipld-eth-server:8083/graphql"
+    rpcProviderEndpoint = "http://ipld-eth-server:8082"
 
   [upstream.cache]
     name = "requests"
diff --git a/app/data/config/watcher-uniswap-v3/uni-watcher.toml b/app/data/config/watcher-uniswap-v3/uni-watcher.toml
index bc583e9b..6a42bcda 100644
--- a/app/data/config/watcher-uniswap-v3/uni-watcher.toml
+++ b/app/data/config/watcher-uniswap-v3/uni-watcher.toml
@@ -22,8 +22,8 @@
 
 [upstream]
   [upstream.ethServer]
-    gqlApiEndpoint = "http://ipld-eth-server.example.com:8083/graphql"
-    rpcProviderEndpoint = "http://ipld-eth-server.example.com:8082"
+    gqlApiEndpoint = "http://ipld-eth-server:8083/graphql"
+    rpcProviderEndpoint = "http://ipld-eth-server:8082"
 
   [upstream.cache]
     name = "requests"
diff --git a/app/data/stacks/uniswap-v3/README.md b/app/data/stacks/uniswap-v3/README.md
index 99f55050..fb012933 100644
--- a/app/data/stacks/uniswap-v3/README.md
+++ b/app/data/stacks/uniswap-v3/README.md
@@ -22,13 +22,13 @@ Instructions to deploy Uniswap v3 watcher stack (watcher + uniswap-v3-info front
 * Clone / pull required repositories:
 
   ```bash
-  $ laconic-so setup-repositories --include vulcanize/uniswap-watcher-ts,vulcanize/uniswap-v3-info --git-ssh --pull
+  $ laconic-so --stack uniswap-v3 setup-repositories
   ```
 
 * Build watcher and info app container images:
 
   ```bash
-  $ laconic-so build-containers --include cerc/watcher-uniswap-v3,cerc/uniswap-v3-info
+  $ laconic-so --stack uniswap-v3 build-containers
   ```
 
   This should create the required docker images in the local image registry.
diff --git a/app/data/stacks/uniswap-v3/stack.yml b/app/data/stacks/uniswap-v3/stack.yml
index 5073a765..5d1b1a8e 100644
--- a/app/data/stacks/uniswap-v3/stack.yml
+++ b/app/data/stacks/uniswap-v3/stack.yml
@@ -3,8 +3,14 @@ name: uniswap-v3
 repos:
   - github.com/vulcanize/uniswap-watcher-ts
   - github.com/vulcanize/uniswap-v3-info
+  - github.com/cerc-io/ipld-eth-db
+  - github.com/cerc-io/ipld-eth-server
 containers:
   - cerc/watcher-uniswap-v3
   - cerc/uniswap-v3-info
+  - cerc/ipld-eth-db
+    cerc/ipld-eth-server
 pods:
   - watcher-uniswap-v3
+  - ipld-eth-db
+  - ipld-eth-server