diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..2562db6
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,21 @@
+FROM golang:1.14-buster as builder
+
+WORKDIR /go
+
+ENV GOPATH ""
+
+COPY . ./
+RUN cd cmd/analyticproxy && go build; cd -; \
+    cd cmd/medifor && go build; cd -
+
+FROM ubuntu:18.04
+
+ENV PATH ${PATH}:/app/bin
+RUN mkdir -p /app/bin
+
+COPY --from=builder /go/cmd/analyticproxy/analyticproxy /app/bin/
+COPY --from=builder /go/cmd/medifor/medifor /app/bin/
+
+EXPOSE 50051
+
+CMD ["analyticproxy", "--help"]
diff --git a/cmd/analyticproxy/.gitignore b/cmd/analyticproxy/.gitignore
new file mode 100644
index 0000000..f49a215
--- /dev/null
+++ b/cmd/analyticproxy/.gitignore
@@ -0,0 +1 @@
+analyticproxy
diff --git a/cmd/analyticproxy/analyticproxy.REMOVED.git-id b/cmd/analyticproxy/analyticproxy.REMOVED.git-id
deleted file mode 100644
index 126e4fe..0000000
--- a/cmd/analyticproxy/analyticproxy.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-5eeb33c720a4d3683417c703571a0c85520e5365
\ No newline at end of file
diff --git a/cmd/medifor/.gitignore b/cmd/medifor/.gitignore
new file mode 100644
index 0000000..268b6eb
--- /dev/null
+++ b/cmd/medifor/.gitignore
@@ -0,0 +1 @@
+medifor