diff --git a/docs/Dockerfile b/docs/Dockerfile
index a1b9a14a..ce0f89b0 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,4 +1,4 @@
-FROM docs/base:latest
+FROM docs/base:hugo-github-linking
 MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 
 ENV PROJECT=registry
@@ -7,17 +7,3 @@ ENV PROJECT=registry
 COPY . /src
 
 COPY . /docs/content/$PROJECT/
-
-# Processing GitHub Markdown
-# 1 Remove <!--[metadata]> and <![end-metadata]-->
-# 2 Remove any leading combination of dots and slashes (./, ../, ../../, etc)
-# 3 Prepend /$PROJECT to all links, remove any trailing .md, only for non http:// links and non internal anchors
-
-RUN find /docs/content/$PROJECT -type f -name "*.md" -not -name "*.compare.md" -exec sed -i.old \
-    -e '/^<!\(--\)\{0,1\}\[\(end-\)\{0,1\}metadata\]\(--\)\{0,1\}>/g' \
-    -e 's/\(\][(]\)\(\.*\/\)*/\1/g' \
-    -e 's/\(\][(]\)\([A-Za-z0-9_/-]\{1,\}\)\(\.md\)\{0,1\}\(#\{0,1\}\(#[A-Za-z0-9_-]*\)\{0,1\}\)[)]/\1\/'$PROJECT'\/\2\4)/g' \
-        {} \;
-
-# Prepare the compare file and expect an empty diff against test.md
-RUN sed -i.old -e 's/\/placeholder\//\/'$PROJECT'\//g' /docs/content/$PROJECT/test.compare.md && diff -u /docs/content/$PROJECT/test.md /docs/content/$PROJECT/test.compare.md
diff --git a/docs/configuration.md b/docs/configuration.md
index 865a9654..500656e3 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1985,7 +1985,7 @@ The TCP address to connect to, including a port number.
       username: [username]
       password: [password]
 
-Proxy enables a registry to be configured as a pull through cache to the official Docker Hub.  See [mirror.md](mirror.md) for more information. Pushing to a registry configured as a pull through cache is currently unsupported.
+Proxy enables a registry to be configured as a pull through cache to the official Docker Hub.  See [mirror](mirror.md) for more information. Pushing to a registry configured as a pull through cache is currently unsupported.
 
 <table>
   <tr>
diff --git a/docs/mirror.md b/docs/mirror.md
index 34a3d813..feb2630c 100644
--- a/docs/mirror.md
+++ b/docs/mirror.md
@@ -8,11 +8,11 @@ keywords = ["registry, on-prem, images, tags, repository, distribution, mirror,
 
 # Registry as a pull through cache
 
-## Use-case
+## Use-case
 
 If you have multiple instances of Docker running in your environment (e.g., multiple physical or virtual machines, all running the Docker daemon), each time one of them requires an image that it doesn’t have it will go out to the internet and fetch it from the public Docker registry. By running a local registry mirror, you can keep most of the redundant image fetch traffic on your local network.
 
-### Alternatives
+### Alternatives
 
 Alternatively, if the set of images you are using is well delimited, you can simply pull them manually and push them to a simple, local, private registry.
 
diff --git a/docs/test.compare.md b/docs/test.compare.md
deleted file mode 100644
index 86087a15..00000000
--- a/docs/test.compare.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-WHATEVER
-
-
-WHATEVER AGAIN
-
-
-[display11](/placeholder/link-1) [display12](/placeholder/link_2) [display13](/placeholder/link/3)
-[display21](/placeholder/link-1) [display22](/placeholder/link_2) [display23](/placeholder/link/3)
-[display31.md](/placeholder/link-1) [display32.md](/placeholder/link_2) [display33.md](/placeholder/link/3)
-[display41](/placeholder/link-1) [display42](/placeholder/link_2) [display43](/placeholder/link/3)
-[display51](/placeholder/link-1) [display52](/placeholder/link_2) [display53](/placeholder/link/3)
-[display61](/placeholder/link-1) [display62](/placeholder/link_2) [display63](/placeholder/link/3)
-[display71](/placeholder/link-1#something-else) [display62](/placeholder/link_2#else) [display63](#else)
-
-[dont-touch](https://somewhere/foo.md#dont) [dont-touch](https://somewhere/foo.md#dont)
diff --git a/docs/test.md b/docs/test.md
deleted file mode 100644
index 3c139cb3..00000000
--- a/docs/test.md
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--[metadata]>
-WHATEVER
-<![end-metadata]-->
-<!--[metadata]>
-WHATEVER AGAIN
-<![end-metadata]-->
-
-[display11](/link-1) [display12](/link_2) [display13](/link/3)
-[display21](link-1.md) [display22](link_2.md) [display23](link/3.md)
-[display31.md](link-1.md) [display32.md](link_2.md) [display33.md](link/3.md)
-[display41](./link-1.md) [display42](./link_2.md) [display43](./link/3.md)
-[display51](../link-1.md) [display52](../link_2.md) [display53](../link/3.md)
-[display61](../../link-1.md) [display62](../../link_2.md) [display63](../../link/3.md)
-[display71](link-1.md#something-else) [display62](link_2#else) [display63](#else)
-
-[dont-touch](https://somewhere/foo.md#dont) [dont-touch](https://somewhere/foo.md#dont)