diff --git a/cmd/http-server/Dockerfile b/Dockerfile
similarity index 64%
rename from cmd/http-server/Dockerfile
rename to Dockerfile
index 5cf1d13..68aebde 100644
--- a/cmd/http-server/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,11 @@
+FROM golang:1.14
+WORKDIR /go/src/dehub
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /usr/bin/dehub ./cmd/dehub
+
+WORKDIR /go/src/dehub/cmd/git-http-server
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /usr/bin/git-http-server .
+
 FROM debian:jessie
 
 # Setup Container
@@ -21,15 +29,18 @@ RUN sed -i 's/FCGI_USER="www-data"/FCGI_USER="git"/g' /etc/init.d/fcgiwrap && \
     sed -i 's/FCGI_SOCKET_OWNER="www-data"/FCGI_SOCKET_OWNER="git"/g' /etc/init.d/fcgiwrap && \
     sed -i 's/FCGI_SOCKET_GROUP="www-data"/FCGI_SOCKET_GROUP="git"/g' /etc/init.d/fcgiwrap
 
+# Copy binaries
+COPY --from=0 /usr/bin/dehub /usr/bin/dehub
+COPY --from=0 /usr/bin/git-http-server /usr/bin/git-http-server
+
 # Create config files for container startup and nginx
-COPY nginx.conf /etc/nginx/nginx.conf
+COPY cmd/http-server/nginx.conf /etc/nginx/nginx.conf
 
 # Create pre-receive
-COPY dehub /usr/bin/dehub
-COPY "pre-receive" /pre-receive
+COPY cmd/http-server/pre-receive /pre-receive
 
 # Create start.sh
-COPY start.sh /start.sh
+COPY cmd/http-server/start.sh /start.sh
 RUN chmod +x /start.sh
 
 ENTRYPOINT ["/start.sh"]
diff --git a/cmd/http-server/.gitignore b/cmd/http-server/.gitignore
deleted file mode 100644
index bb70765..0000000
--- a/cmd/http-server/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-dehub