diff --git a/Dockerfile.client b/Dockerfile.client
new file mode 100644
index 0000000..bb4c111
--- /dev/null
+++ b/Dockerfile.client
@@ -0,0 +1,21 @@
+FROM golang:alpine AS build-env
+
+WORKDIR /src
+ADD . /src
+RUN apk add --no-cache git make
+RUN make doh-client/doh-client
+
+FROM alpine:latest
+
+COPY --from=build-env /src/doh-client/doh-client /doh-client
+
+ADD doh-client/doh-client.conf /doh-client.conf
+
+RUN sed -i '$!N;s/"127.0.0.1:53",.*"127.0.0.1:5380",/":53",/;P;D' /doh-client.conf
+RUN sed -i '$!N;s/"\[::1\]:53",.*"\[::1\]:5380",/":5380",/;P;D' /doh-client.conf
+
+EXPOSE 53
+EXPOSE 5380
+
+ENTRYPOINT ["/doh-client"]
+CMD ["-conf", "/doh-client.conf"]
diff --git a/Dockerfile.server b/Dockerfile.server
new file mode 100644
index 0000000..4d750ef
--- /dev/null
+++ b/Dockerfile.server
@@ -0,0 +1,19 @@
+FROM golang:alpine AS build-env
+
+WORKDIR /src
+ADD . /src
+RUN apk add --no-cache git make
+RUN make doh-server/doh-server
+
+FROM alpine:latest
+
+COPY --from=build-env /src/doh-server/doh-server /doh-server
+
+ADD doh-server/doh-server.conf /doh-server.conf
+
+RUN sed -i '$!N;s/"127.0.0.1:8053",\s*"\[::1\]:8053",/":8053",/;P;D' /doh-server.conf
+
+EXPOSE 8053
+
+ENTRYPOINT ["/doh-server"]
+CMD ["-conf", "/doh-server.conf"]