diff --git a/Makefile b/Makefile
index 5647aba07d..f4560ed3b4 100644
--- a/Makefile
+++ b/Makefile
@@ -38,10 +38,10 @@ default: docs
 
 test: docs-build
 	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 \
-		-v $(CURDIR):/docs/content/docker-hub/ \
+		-v $(CURDIR):/docs/content/docker-trusted-registry/ \
 		-e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" \
 		hugo server \
-			--log --watch --buildDrafts=true \
+			--log=true --watch=true --buildDrafts=true \
 			--port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
 
 docs: docs-build
diff --git a/adminguide.md b/adminguide.md
index 90b98fed0a..b132fa5192 100644
--- a/adminguide.md
+++ b/adminguide.md
@@ -1,4 +1,4 @@
-<!--[metadata]>
+
 +++
 title = "Admin guide"
 description = "Documentation describing administration of Docker Trusted Registry"
@@ -7,7 +7,7 @@ keywords = ["docker, documentation, about, technology, hub, registry, enterprise
 parent="smn_dhe"
 weight=3
 +++
-<![end-metadata]-->
+
 
 
 # Docker Trusted Registry Administrator's Guide
diff --git a/configuration.md b/configuration.md
index 37e3df2181..d9eef42d87 100644
--- a/configuration.md
+++ b/configuration.md
@@ -1,4 +1,4 @@
-<!--[metadata]>
+
 +++
 title = "Configuration options"
 description = "Configuration instructions for Docker Trusted Registry"
@@ -7,7 +7,7 @@ keywords = ["docker, documentation, about, technology, understanding, enterprise
 parent="smn_dhe"
 weight=5
 +++
-<![end-metadata]-->
+
 
 
 # Configuring DTR
diff --git a/index.md b/index.md
index 201be7c45f..f6854b13dd 100644
--- a/index.md
+++ b/index.md
@@ -1,4 +1,4 @@
-<!--[metadata]>
+
 +++
 aliases = [ "/docker-hub-enterprise/" ]
 title = "Overview"
@@ -7,7 +7,7 @@ keywords = ["docker, documentation, about, technology, understanding, enterprise
 [menu.main]
 parent="smn_dhe"
 +++
-<![end-metadata]-->
+
 
 
 # Welcome to Docker Trusted Registry
diff --git a/install.md b/install.md
index 3532f4e387..814175740d 100644
--- a/install.md
+++ b/install.md
@@ -1,4 +1,4 @@
-<!--[metadata]>
+
 +++
 title = "Installation"
 description = "Installation instructions for Docker Trusted Registry"
@@ -7,7 +7,7 @@ keywords = ["docker, documentation, about, technology, understanding, enterprise
 parent="smn_dhe"
 weight=4
 +++
-<![end-metadata]-->
+
 
 
 # Install Docker Trusted Registry
diff --git a/prior-release-notes.md b/prior-release-notes.md
index 0ade85b852..2e7b728080 100644
--- a/prior-release-notes.md
+++ b/prior-release-notes.md
@@ -1,4 +1,4 @@
-<!--[metadata]>
+
 +++
 title = "Prior release notes archive"
 description = "Archived Release notes for Docker Trusted Registry"
@@ -7,7 +7,7 @@ keywords = ["docker, documentation, about, technology, understanding, enterprise
 parent="smn_dhe"
 weight=101
 +++
-<![end-metadata]-->
+
 
 
 # Release Notes
diff --git a/quick-start.md b/quick-start.md
index d80c6338b8..c9290b87bc 100644
--- a/quick-start.md
+++ b/quick-start.md
@@ -1,4 +1,4 @@
-<!--[metadata]>
+
 +++
 title = "Quick-start: Basic Workflow"
 description = "Brief tutorial on the basics of Docker Trusted Registry user workflow"
@@ -7,7 +7,7 @@ keywords = ["docker, documentation, about, technology, understanding, enterprise
 parent="smn_dhe"
 weight=1
 +++
-<![end-metadata]-->
+
 
 
 
diff --git a/release-notes.md b/release-notes.md
index bbfaa6b436..656a6368f6 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,4 +1,4 @@
-<!--[metadata]>
+
 +++
 title = "Release notes"
 description = "Release notes for Docker Trusted Registry"
@@ -7,7 +7,7 @@ keywords = ["docker, documentation, about, technology, understanding, enterprise
 parent="smn_dhe"
 weight=100
 +++
-<![end-metadata]-->
+
 
 
 # Docker Trusted Registry: Release Notes
diff --git a/support.md b/support.md
index 6300124350..af107f186e 100644
--- a/support.md
+++ b/support.md
@@ -1,4 +1,4 @@
-<!--[metadata]>
+
 +++
 title = "Support"
 description = "Commercial Support"
@@ -7,7 +7,7 @@ keywords = ["docker, documentation, about, technology, understanding, enterprise
 parent="smn_dhe"
 weight=99
 +++
-<![end-metadata]-->
+
 
 
 # Commercial Support Options
diff --git a/userguide.md b/userguide.md
index f64d7c3bcc..ce5b9cf1de 100644
--- a/userguide.md
+++ b/userguide.md
@@ -1,4 +1,4 @@
-<!--[metadata]>
+
 +++
 title = "User guide"
 description = "Documentation describing basic use of Docker Trusted Registry"
@@ -7,7 +7,7 @@ keywords = ["docker, documentation, about, technology, hub,  enterprise"]
 parent="smn_dhe"
 weight=2
 +++
-<![end-metadata]-->
+