diff --git a/deploy/addons/layouts/gvisor/single.html b/deploy/addons/layouts/gvisor/single.html
new file mode 100644
index 000000000000..620f9d82b608
--- /dev/null
+++ b/deploy/addons/layouts/gvisor/single.html
@@ -0,0 +1,5 @@
+{{ define "main" }}
+   <div style="padding-top:20px">
+      {{ .Render "content" }}
+   </div>
+{{ end }}
\ No newline at end of file
diff --git a/deploy/addons/layouts/helm-tiller/single.html b/deploy/addons/layouts/helm-tiller/single.html
new file mode 100644
index 000000000000..620f9d82b608
--- /dev/null
+++ b/deploy/addons/layouts/helm-tiller/single.html
@@ -0,0 +1,5 @@
+{{ define "main" }}
+   <div style="padding-top:20px">
+      {{ .Render "content" }}
+   </div>
+{{ end }}
\ No newline at end of file
diff --git a/deploy/addons/layouts/ingress-dns/single.html b/deploy/addons/layouts/ingress-dns/single.html
new file mode 100644
index 000000000000..27fcd101d0d6
--- /dev/null
+++ b/deploy/addons/layouts/ingress-dns/single.html
@@ -0,0 +1,5 @@
+{{ define "main" }}
+   <div style="padding-top:60px">
+      {{ .Render "content" }}
+   </div>
+{{ end }}
\ No newline at end of file
diff --git a/deploy/addons/layouts/storage-provisioner-gluster/single.html b/deploy/addons/layouts/storage-provisioner-gluster/single.html
new file mode 100644
index 000000000000..620f9d82b608
--- /dev/null
+++ b/deploy/addons/layouts/storage-provisioner-gluster/single.html
@@ -0,0 +1,5 @@
+{{ define "main" }}
+   <div style="padding-top:20px">
+      {{ .Render "content" }}
+   </div>
+{{ end }}
\ No newline at end of file
diff --git a/netlify.toml b/netlify.toml
index 6084cd18c02d..d335d812befb 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -4,7 +4,7 @@ publish = "site/public/"
 command = "pwd && cd themes/docsy && git submodule update -f --init && cd ../.. && hugo"
 
 [build.environment]
-HUGO_VERSION = "0.55.6"
+HUGO_VERSION = "0.59.0"
 
 [context.production.environment]
 HUGO_ENV = "production"
diff --git a/site/config.toml b/site/config.toml
index 0e5dd3cba3a4..bdebbf905173 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -9,7 +9,7 @@ theme = ["docsy"]
 enableGitInfo = true
 
 # Language settings
-contentDir = "content/en" 
+contentDir = "content/en"
 defaultContentLanguage = "en"
 defaultContentLanguageInSubdir = false
 # Useful when translating.
@@ -33,6 +33,30 @@ pygmentsStyle = "tango"
 [permalinks]
 blog = "/:section/:year/:month/:day/:slug/"
 
+[module]
+  [[module.mounts]]
+    source = "../deploy/addons/gvisor/"
+    target = "content/gvisor/"
+  [[module.mounts]]
+    source = "../deploy/addons/helm-tiller/"
+    target = "content/helm-tiller/"
+  [[module.mounts]]
+    source = "../deploy/addons/ingress-dns/"
+    target = "content/ingress-dns/"
+  [[module.mounts]]
+    source = "../deploy/addons/storage-provisioner-gluster/"
+    target = "content/storage-provisioner-gluster/"
+  [[module.mounts]]
+    source = "../deploy/addons/layouts/"
+    target = "layouts"
+
+  [[module.mounts]]
+    source = "content/en"
+    target = "content"
+  [[module.mounts]]
+    source = "layouts"
+    target = "layouts"
+
 ## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday
 [blackfriday]
 plainIDAnchors = true
diff --git a/site/content/en/docs/Tasks/addons.md b/site/content/en/docs/Tasks/addons.md
index c454360cbcc0..b29499a8fbac 100644
--- a/site/content/en/docs/Tasks/addons.md
+++ b/site/content/en/docs/Tasks/addons.md
@@ -20,10 +20,10 @@ minikube has a set of built-in addons that, when enabled, can be used within Kub
 * [nvidia-driver-installer](https://github.com/GoogleCloudPlatform/container-engine-accelerators/tree/master/nvidia-driver-installer/minikube)
 * [nvidia-gpu-device-plugin](https://github.com/GoogleCloudPlatform/container-engine-accelerators/tree/master/cmd/nvidia_gpu)
 * [logviewer](https://github.com/ivans3/minikube-log-viewer)
-* [gvisor](../deploy/addons/gvisor/README.md)
-* [storage-provisioner-gluster](../deploy/addons/storage-provisioner-gluster/README.md)
-* [helm-tiller](../deploy/addons/helm-tiller/README.md)
-* [ingress-dns](../deploy/addons/ingress-dns/README.md)
+* [gvisor](../../../gvisor/readme/)
+* [storage-provisioner-gluster](../../../storage-provisioner-gluster/readme)
+* [helm-tiller](../../../helm-tiller/readme)
+* [ingress-dns](../../../ingress-dns/readme)
 
 ## Listing available addons