diff --git a/Dockerfile b/docker/production/Dockerfile
similarity index 88%
rename from Dockerfile
rename to docker/production/Dockerfile
index c1a2d3cfc62..19db258d32a 100644
--- a/Dockerfile
+++ b/docker/production/Dockerfile
@@ -10,6 +10,7 @@ ADD tmp/ /opt/grafana/
 EXPOSE 3000
 
 VOLUME ["/opt/grafana/data"]
+VOLUME ["/opt/grafana/conf"]
 
 WORKDIR /opt/grafana/
 ENTRYPOINT ["./grafana", "web"]
diff --git a/docker/production/build.sh b/docker/production/build.sh
new file mode 100755
index 00000000000..4179d8e032e
--- /dev/null
+++ b/docker/production/build.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+cp Dockerfile ../../
+cd ../../
+
+go run build.go build
+
+npm grunt release
+
+docker build --tag "grafana/grafana:develop" .
+
+rm Dockerfile
+cd docker/production
+
+