diff --git a/Makefile b/Makefile
index 8e27d0895634a..4bb08c0c18635 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 DOCKER       = docker
-HUGO_VERSION = 0.53
+HUGO_VERSION = 0.58.3
 DOCKER_IMAGE = kubernetes-hugo
 DOCKER_RUN   = $(DOCKER) run --rm --interactive --tty --volume $(CURDIR):/src
 NODE_BIN     = node_modules/.bin
diff --git a/layouts/shortcodes/code.html b/layouts/shortcodes/code.html
index 3b321f37af31e..8275c99bc5afe 100644
--- a/layouts/shortcodes/code.html
+++ b/layouts/shortcodes/code.html
@@ -3,7 +3,7 @@
 {{ $codelang := .Get "language" | default (path.Ext $file | strings.TrimPrefix ".") }} 
 {{ $fileDir := path.Split $file }}
 {{ $bundlePath := path.Join .Page.File.Dir $fileDir.Dir }}
-{{ $filename := path.Join $p.File.Dir $file }}
+{{ $filename := printf "/content/%s/%s/%s" .Page.Lang $p.File.Dir $file | safeURL }}
 {{ $ghlink := printf "https://%s/blob/master/content/%s/%s" site.Params.githubwebsiterepo .Page.Lang $filename | safeURL }}
 {{/* First assume this is a bundle and the file is inside it. */}}
 {{ $resource := $p.Resources.GetMatch (printf "%s*" $file ) }}
diff --git a/netlify.toml b/netlify.toml
index b0fee252cae5a..c5674eabd899c 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -7,7 +7,10 @@ functions = "functions"
 command = "make non-production-build"
 
 [build.environment]
-HUGO_VERSION = "0.53"
+# https://gitmemory.com/kubernetes/website
+# https://www.gitmemory.com/zacharysarah
+# https://github.com/kubernetes/website/pull/16151/files
+HUGO_VERSION = "0.58.3"
 
 [context.production.environment]
 HUGO_BASEURL = "https://kubernetes.io/"