diff --git a/docker/cartographer-handler/Dockerfile b/docker/cartographer-handler/Dockerfile
index a797bbdf..d6db99da 100644
--- a/docker/cartographer-handler/Dockerfile
+++ b/docker/cartographer-handler/Dockerfile
@@ -26,6 +26,7 @@ COPY packages/adapters/subgraph/package.json /tmp/build/packages/adapters/subgra
 COPY packages/adapters/web3signer/package.json /tmp/build/packages/adapters/web3signer/
 COPY packages/adapters/relayer/package.json /tmp/build/packages/adapters/relayer/
 COPY packages/adapters/database/package.json /tmp/build/packages/adapters/database/
+COPY packages/adapters/mqclient/package.json /tmp/build/packages/adapters/mqclient/
 COPY packages/agents/cartographer/core/package.json /tmp/build/packages/agents/cartographer/core/
 COPY packages/agents/cartographer/poller/package.json /tmp/build/packages/agents/cartographer/poller/
 COPY packages/agents/cartographer/handler/package.json /tmp/build/packages/agents/cartographer/handler/
@@ -45,6 +46,7 @@ COPY packages/agents/cartographer/handler /tmp/build/packages/agents/cartographe
 COPY packages/agents/cartographer/core /tmp/build/packages/agents/cartographer/core
 COPY packages/adapters/subgraph /tmp/build/packages/adapters/subgraph
 COPY packages/adapters/database /tmp/build/packages/adapters/database
+COPY packages/adapters/mqclient /tmp/build/packages/adapters/mqclient
 COPY packages/adapters/chainservice /tmp/build/packages/adapters/chainservice
 COPY packages/utils /tmp/build/packages/utils
 COPY packages/contracts /tmp/build/packages/contracts
diff --git a/docker/lighthouse-handler/Dockerfile b/docker/lighthouse-handler/Dockerfile
index b808060f..dad5c82a 100644
--- a/docker/lighthouse-handler/Dockerfile
+++ b/docker/lighthouse-handler/Dockerfile
@@ -34,6 +34,7 @@ RUN yarn install
 COPY config config/
 COPY packages/agents/lighthouse /tmp/build/packages/agents/lighthouse
 COPY packages/adapters/mqclient /tmp/build/packages/adapters/mqclient
+COPY packages/adapters/cache /tmp/build/packages/adapters/cache
 COPY packages/adapters/database /tmp/build/packages/adapters/database
 COPY packages/adapters/chainservice /tmp/build/packages/adapters/chainservice
 COPY packages/adapters/web3signer /tmp/build/packages/adapters/web3signer
diff --git a/docker/lighthouse/Dockerfile b/docker/lighthouse/Dockerfile
index a3605349..7fb28ba2 100644
--- a/docker/lighthouse/Dockerfile
+++ b/docker/lighthouse/Dockerfile
@@ -37,6 +37,7 @@ COPY packages/adapters/relayer/package.json /tmp/build/packages/adapters/relayer
 COPY packages/adapters/subgraph/package.json /tmp/build/packages/adapters/subgraph/
 COPY packages/adapters/web3signer/package.json /tmp/build/packages/adapters/web3signer/
 COPY packages/adapters/chainservice/package.json /tmp/build/packages/adapters/chainservice/
+COPY packages/adapters/mqclient/package.json /tmp/build/packages/adapters/mqclient/
 COPY packages/contracts/package.json /tmp/build/packages/contracts/
 COPY packages/utils/package.json /tmp/build/packages/utils/
 COPY yarn.lock /tmp/build/
@@ -55,6 +56,7 @@ COPY packages/adapters/relayer /tmp/build/packages/adapters/relayer
 COPY packages/adapters/subgraph /tmp/build/packages/adapters/subgraph
 COPY packages/adapters/web3signer /tmp/build/packages/adapters/web3signer
 COPY packages/adapters/chainservice /tmp/build/packages/adapters/chainservice
+COPY packages/adapters/mqclient /tmp/build/packages/adapters/mqclient
 COPY packages/contracts /tmp/build/packages/contracts/
 COPY packages/utils /tmp/build/packages/utils
 COPY .eslintignore /tmp/build/
diff --git a/packages/adapters/relayer/package.json b/packages/adapters/relayer/package.json
index 453430a8..9c66d7a5 100644
--- a/packages/adapters/relayer/package.json
+++ b/packages/adapters/relayer/package.json
@@ -26,7 +26,6 @@
   "license": "ISC",
   "dependencies": {
     "@chimera-monorepo/chainservice": "workspace:*",
-    "@chimera-monorepo/relayer": "workspace:*",
     "@chimera-monorepo/utils": "workspace:*",
     "@gelatocloud/gasless": "0.0.7",
     "interval-promise": "1.4.0"
diff --git a/packages/adapters/relayer/tsconfig.build.json b/packages/adapters/relayer/tsconfig.build.json
index 7cb503be..10b79940 100644
--- a/packages/adapters/relayer/tsconfig.build.json
+++ b/packages/adapters/relayer/tsconfig.build.json
@@ -11,9 +11,6 @@
   "references": [
     {
       "path": "../../utils/tsconfig.build.json"
-    },
-    {
-      "path": "../../agents/relayer/tsconfig.build.json"
     }
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index c79ef9fc..bcf13786 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -981,7 +981,6 @@ __metadata:
   resolution: "@chimera-monorepo/adapters-relayer@workspace:packages/adapters/relayer"
   dependencies:
     "@chimera-monorepo/chainservice": "workspace:*"
-    "@chimera-monorepo/relayer": "workspace:*"
     "@chimera-monorepo/utils": "workspace:*"
     "@gelatocloud/gasless": 0.0.7
     "@types/mocha": 10.0.1
@@ -1248,7 +1247,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@chimera-monorepo/relayer@workspace:*, @chimera-monorepo/relayer@workspace:packages/agents/relayer":
+"@chimera-monorepo/relayer@workspace:packages/agents/relayer":
   version: 0.0.0-use.local
   resolution: "@chimera-monorepo/relayer@workspace:packages/agents/relayer"
   dependencies: