diff --git a/Dockerfile b/Dockerfile
index 453cf103bb..c2af67896d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,11 @@
-FROM starefossen/ruby-node
+FROM starefossen/ruby-node:2-4
 
-RUN mkdir -p /docs
-VOLUME /docs
+RUN git clone https://www.github.com/docker/docker.github.io docs
+
+RUN gem install --no-document github-pages jekyll-github-metadata
 
 EXPOSE 4000
 
-WORKDIR /docs
+EXPOSE 4000
 
-RUN gem install github-pages
-
-CMD jekyll clean && jekyll serve -H 0.0.0.0 -P 4000
+CMD jekyll serve --source docs -d docs/_site -H 0.0.0.0 -P 4000
diff --git a/_config.yml b/_config.yml
index 6832d82bee..65d1b11183 100644
--- a/_config.yml
+++ b/_config.yml
@@ -5,7 +5,6 @@ kramdown:
   html_to_native: true
   hard_wrap: false
   syntax_highlighter: rouge
-baseurl: /
 incremental: true
 permalink: pretty
 safe: false