diff --git a/Dockerfile.agent b/Dockerfile.agent
new file mode 100644
index 000000000..1ca8dfa4e
--- /dev/null
+++ b/Dockerfile.agent
@@ -0,0 +1,16 @@
+# builder
+FROM            golang:1.14-alpine as builder
+RUN             apk --no-cache --update add nodejs-npm make gcc g++ musl-dev openssl-dev git perl-utils
+RUN            	go get github.com/gobuffalo/packr/v2/packr2
+ENV             GO111MODULE=on GOPROXY=https://proxy.golang.org,direct
+COPY            go.mod go.sum /go/src/pathwar.land/
+WORKDIR         /go/src/pathwar.land
+RUN             go mod download
+COPY            . .
+WORKDIR         /go/src/pathwar.land/go
+RUN             make packr
+RUN             make install
+
+# FROM devago/docker-compose
+COPY --from=builder /bin/pathwar /bin/
+ENTRYPOINT ["/bin/pathwar"]
diff --git a/tool/docker-agent/Dockerfile b/tool/docker-agent/Dockerfile
deleted file mode 100644
index fedb80945..000000000
--- a/tool/docker-agent/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM pathwar/pathwar:latest as pathwar
-FROM devago/docker-compose
-COPY --from=pathwar /bin/pathwar /bin/
-ENTRYPOINT ["/bin/pathwar"]