diff --git a/Dockerfile b/Dockerfile
index b621ec90edbce589ae82b51946b1da2cf2a88086..d67e3bbb9e44ba116c8e6dd799779e9538957d9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,10 +26,14 @@ RUN cd /srv/src/code.vereign.com/code/$CI_PROJECT_NAME && \
 	export PKG=code.vereign.com/code/$CI_PROJECT_NAME && \
 	make && rm /tmp/store 
 
-#FROM debian:stretch 
-#RUN mkdir -p /srv/src/code.vereign.com/code/ 
-#COPY --from=0 /srv/src/code.vereign.com/code/data-storage-agent /srv/src/code.vereign.com/code/
-#RUN find /srv/src/code.vereign.com/code/
+FROM golang:1.10.3
+
+ARG CI_PROJECT_NAME
+ENV CI_PROJECT_NAME ${CI_PROJECT_NAME}
+
+RUN mkdir -p /srv/src/code.vereign.com/code/$CI_PROJECT_NAME/bin
+COPY --from=0 /srv/src/code.vereign.com/code/$CI_PROJECT_NAME/bin/server /srv/src/code.vereign.com/code/$CI_PROJECT_NAME/bin/server
+
 	
 ENTRYPOINT /srv/src/code.vereign.com/code/$CI_PROJECT_NAME/bin/server