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 efabb8b..55595b6 100644
--- a/stacks/stack-orchestrator/compose/docker-compose-watcher-sushiswap-v3.yml
+++ b/stacks/stack-orchestrator/compose/docker-compose-watcher-sushiswap-v3.yml
@@ -26,7 +26,7 @@ services:
     depends_on:
       sushiswap-v3-watcher-db:
         condition: service_healthy
-    image: cerc/watcher-sushiswap-v3:local
+    image: cerc/watcher-sushiswap:local
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
@@ -52,7 +52,7 @@ services:
         condition: service_healthy
       sushiswap-v3-watcher-job-runner:
         condition: service_healthy
-    image: cerc/watcher-sushiswap-v3:local
+    image: cerc/watcher-sushiswap:local
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS}
diff --git a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap-v3/build.sh b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap-v3/build.sh
deleted file mode 100755
index 812b78e..0000000
--- a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap-v3/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/watcher-sushiswap-v3
-
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/watcher-sushiswap-v3:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/sushiswap-watcher-ts
\ No newline at end of file
diff --git a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap-v3/.dockerignore b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/.dockerignore
similarity index 100%
rename from stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap-v3/.dockerignore
rename to stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/.dockerignore
diff --git a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap-v3/Dockerfile b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/Dockerfile
similarity index 82%
rename from stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap-v3/Dockerfile
rename to stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/Dockerfile
index 71aba48..62e580a 100644
--- a/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap-v3/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 sv3-watcher-ts" && \
+RUN echo "Installing dependencies and building sushiswap-v3-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
new file mode 100755
index 0000000..cff4cd9
--- /dev/null
+++ b/stacks/stack-orchestrator/container-build/cerc-watcher-sushiswap/build.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Build cerc/watcher-sushiswap
+
+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
diff --git a/stacks/stack-orchestrator/stacks/sushiswap-v3/stack.yml b/stacks/stack-orchestrator/stacks/sushiswap-v3/stack.yml
index ad5c73d..4b09c7a 100644
--- a/stacks/stack-orchestrator/stacks/sushiswap-v3/stack.yml
+++ b/stacks/stack-orchestrator/stacks/sushiswap-v3/stack.yml
@@ -3,6 +3,6 @@ name: sushiswap-v3
 description: "SushiSwap v3 watcher stack"
 repos:
 containers:
-  - cerc/watcher-sushiswap-v3
+  - cerc/watcher-sushiswap
 pods:
   - watcher-sushiswap-v3