diff --git a/docs/website/layouts/shortcodes/current_docker_version.html b/docs/website/layouts/shortcodes/current_docker_version.html
index 9a9e7113a6..06c1df15c5 100644
--- a/docs/website/layouts/shortcodes/current_docker_version.html
+++ b/docs/website/layouts/shortcodes/current_docker_version.html
@@ -1,6 +1,8 @@
 {{- $version := index (split $.Page.File.Path "/") 1 -}}
-{{- if or (eq $version "edge") (eq $version "latest") -}}
-{{ $version }}
+{{- if eq $version "latest" -}}
+{{- strings.TrimPrefix "v" (index site.Data.releases 1) -}}
+{{- else if eq $version "edge" -}}
+edge
 {{- else -}}
 {{- strings.TrimPrefix "v" $version -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/docs/website/layouts/shortcodes/current_version.html b/docs/website/layouts/shortcodes/current_version.html
index 26bf2e2524..372607b677 100644
--- a/docs/website/layouts/shortcodes/current_version.html
+++ b/docs/website/layouts/shortcodes/current_version.html
@@ -1 +1,6 @@
-{{ index (split $.Page.File.Path "/") 1 }}
\ No newline at end of file
+{{- $version := index (split $.Page.File.Path "/") 1 -}}
+{{- if (eq $version "latest") -}}
+{{- index site.Data.releases 1 -}}
+{{- else -}}
+{{- $version -}}
+{{- end -}}
\ No newline at end of file