diff --git a/debug.Dockerfile b/debug.Dockerfile
index d0dc3102b..c894d2f27 100644
--- a/debug.Dockerfile
+++ b/debug.Dockerfile
@@ -19,12 +19,15 @@ WORKDIR /app/api-build
 
 COPY api/go.mod api/go.sum ./
 COPY shared/go.mod shared/go.mod ../shared/
+COPY tap/go.mod tap/go.mod ../tap/
+
 RUN go mod download
 # cheap trick to make the build faster (As long as go.mod wasn't changes)
 RUN go list -f '{{.Path}}@{{.Version}}' -m all | sed 1d | grep -e 'go-cache' -e 'sqlite' | xargs go get
 
 # Copy and build api code
 COPY shared ../shared
+COPY tap ../tap
 COPY api .
 RUN go build -gcflags="all=-N -l" -o mizuagent .
 
@@ -41,4 +44,5 @@ COPY --from=site-build ["/app/ui-build/build", "site"]
 # install remote debugging tool
 RUN go get github.com/go-delve/delve/cmd/dlv
 
-CMD ["sh", "-c", "dlv --headless=true --listen=:2345 --log --api-version=2 --accept-multiclient exec ./mizuagent -- --aggregator"]
+ENTRYPOINT "/app/mizuagent"
+#CMD ["sh", "-c", "dlv --headless=true --listen=:2345 --log --api-version=2 --accept-multiclient exec ./mizuagent -- --aggregator"]