diff --git a/stacks/stack-orchestrator/compose/docker-compose-watcher-sushiswap-v3.yml b/stacks/stack-orchestrator/compose/docker-compose-watcher-sushiswap-v3.yml
index 0bcece5..b1f99bf 100644
--- a/stacks/stack-orchestrator/compose/docker-compose-watcher-sushiswap-v3.yml
+++ b/stacks/stack-orchestrator/compose/docker-compose-watcher-sushiswap-v3.yml
@@ -33,7 +33,7 @@ services:
     working_dir: /app/packages/v3-watcher
     command: ["bash", "./start-job-runner.sh"]
     volumes:
-      - ../config/watcher-sushiswap-v3/watcher-config-template.toml:/app/environments/watcher-config-template.toml
+      - ../config/watcher-sushiswap-v3/watcher-config-template.toml:/app/packages/v3-watcher/environments/watcher-config-template.toml
       - ../config/watcher-sushiswap-v3/start-job-runner.sh:/app/packages/v3-watcher/start-job-runner.sh
     ports:
       - "9000:9000"
@@ -60,9 +60,9 @@ services:
     working_dir: /app/packages/v3-watcher
     command: ["bash", "./start-server.sh"]
     volumes:
-      - ../config/watcher-sushiswap-v3/watcher-config-template.toml:/app/environments/watcher-config-template.toml
+      - ../config/watcher-sushiswap-v3/watcher-config-template.toml:/app/packages/v3-watcher/environments/watcher-config-template.toml
       - ../config/watcher-sushiswap-v3/start-server.sh:/app/packages/v3-watcher/start-server.sh
-      - sushiswap_v3_watcher_gql_logs_data:/app/gql-logs
+      - sushiswap_v3_watcher_gql_logs_data:/app/packages/v3-watcher/gql-logs
     ports:
       - "3008"
       - "9001"
diff --git a/stacks/stack-orchestrator/config/watcher-sushiswap-v3/watcher-config-template.toml b/stacks/stack-orchestrator/config/watcher-sushiswap-v3/watcher-config-template.toml
index 817d532..a69d858 100644
--- a/stacks/stack-orchestrator/config/watcher-sushiswap-v3/watcher-config-template.toml
+++ b/stacks/stack-orchestrator/config/watcher-sushiswap-v3/watcher-config-template.toml
@@ -26,7 +26,7 @@
 
   # Server GQL config
   [server.gql]
-    path = "/"
+    path = "/graphql"
 
     # Max block range for which to return events in eventsInRange GQL query.
     # Use -1 for skipping check on block range.
diff --git a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/.dockerignore b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/.dockerignore
index 59da4af..6013216 100644
--- a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/.dockerignore
+++ b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/.dockerignore
@@ -1 +1 @@
-stacks
\ No newline at end of file
+stacks
diff --git a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/Dockerfile b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/Dockerfile
index 62e580a..6c16543 100644
--- a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/Dockerfile
+++ b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/Dockerfile
@@ -11,5 +11,5 @@ RUN COMMIT_HASH=$(git rev-parse HEAD) && \
   jq --arg commitHash "$COMMIT_HASH" '.commitHash = $commitHash' package.json > tmp.json && \
   mv tmp.json package.json
 
-RUN echo "Installing dependencies and building sushiswap-v3-watcher-ts" && \
+RUN echo "Installing dependencies and building sushiswap-watcher-ts" && \
   yarn && yarn build
diff --git a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/build.sh b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/build.sh
index cff4cd9..2bdc814 100755
--- a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/build.sh
+++ b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/build.sh
@@ -4,4 +4,4 @@
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-docker build -t cerc/watcher-sushiswap:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/sushiswap-watcher-ts
\ No newline at end of file
+docker build -t cerc/watcher-sushiswap:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/sushiswap-watcher-ts
diff --git a/stacks/stack-orchestrator/stacks/sushiswap-v3/README.md b/stacks/stack-orchestrator/stacks/sushiswap-v3/README.md
index a21eaaa..e27e95f 100644
--- a/stacks/stack-orchestrator/stacks/sushiswap-v3/README.md
+++ b/stacks/stack-orchestrator/stacks/sushiswap-v3/README.md
@@ -3,19 +3,19 @@
 ## Clone the stack repo
 
 ```bash
-laconic-so fetch-stack ~/cerc/sushiswap-watcher-ts/stack-orchestrator/stacks/sushiswap-v3
+laconic-so fetch-stack git.vdb.to/cerc-io/sushiswap-watcher-ts
 ```
 
 ## Build the container image
 
 ```bash
-laconic-so --stack sushiswap-v3 build-containers
+laconic-so --stack ~/cerc/sushiswap-watcher-ts/stacks/stack-orchestrator/stacks/sushiswap-v3 build-containers
 ```
 
 ## Create a spec file for the deployment
 
 ```bash
-laconic-so --stack sushiswap-v3 deploy init --output sushiswap-v3-spec.yml
+laconic-so --stack ~/cerc/sushiswap-watcher-ts/stacks/stack-orchestrator/stacks/sushiswap-v3 deploy init --output sushiswap-v3-spec.yml
 ```
 
 ### Ports
@@ -38,7 +38,7 @@ network:
 ## Create a deployment from the spec file
 
 ```bash
-laconic-so --stack sushiswap-v3 deploy create --spec-file sushiswap-v3-spec.yml --deployment-dir sushiswap-v3-deployment
+laconic-so --stack ~/cerc/sushiswap-watcher-ts/stacks/stack-orchestrator/stacks/sushiswap-v3 deploy create --spec-file sushiswap-v3-spec.yml --deployment-dir sushiswap-v3-deployment
 ```
 
 ### Configuration
@@ -101,4 +101,4 @@ laconic-so deployment --dir sushiswap-v3-deployment stop --delete-volumes
 
 # Remove deployment directory (deployment will have to be recreated for a re-run)
 rm -r sushiswap-v3-deployment
-```
\ No newline at end of file
+```