diff --git a/site/content/404.md b/site/content/404.md
index de003f1490..14634b216e 100644
--- a/site/content/404.md
+++ b/site/content/404.md
@@ -4,7 +4,8 @@ layout: 404
 description: ""
 url: /404.html
 robots: noindex,follow
-sitemap_exclude: true
+sitemap:
+  exclude: true
 ---
 
 <div class="text-center py-5">
diff --git a/site/content/docs/5.3/_index.html b/site/content/docs/5.3/_index.html
index b04e391bc4..1e18006997 100644
--- a/site/content/docs/5.3/_index.html
+++ b/site/content/docs/5.3/_index.html
@@ -1,5 +1,6 @@
 ---
 layout: redirect
-sitemap_exclude: true
+sitemap:
+  exclude: true
 redirect: "/docs/5.3/getting-started/introduction/"
 ---
diff --git a/site/content/docs/5.3/docsref.md b/site/content/docs/5.3/docsref.md
index 6b811f47d1..3f36dd2783 100644
--- a/site/content/docs/5.3/docsref.md
+++ b/site/content/docs/5.3/docsref.md
@@ -5,7 +5,8 @@ description: Examples of Bootstrap's documentation-specific components and style
 aliases: "/docsref/"
 toc: true
 robots: noindex,follow
-sitemap_exclude: true
+sitemap:
+  exclude: true
 ---
 
 ## Buttons
diff --git a/site/content/docs/_index.html b/site/content/docs/_index.html
index b04e391bc4..1e18006997 100644
--- a/site/content/docs/_index.html
+++ b/site/content/docs/_index.html
@@ -1,5 +1,6 @@
 ---
 layout: redirect
-sitemap_exclude: true
+sitemap:
+  exclude: true
 redirect: "/docs/5.3/getting-started/introduction/"
 ---
diff --git a/site/layouts/sitemap.xml b/site/layouts/sitemap.xml
index 869f1cbe86..9c626df18a 100644
--- a/site/layouts/sitemap.xml
+++ b/site/layouts/sitemap.xml
@@ -1,12 +1,12 @@
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  {{- range .Data.Pages -}}{{ if and .Permalink (ne .Params.sitemap_exclude true) }}
+  {{- range where .Data.Pages "Params.sitemap.exclude" "ne" true -}}{{ if .Permalink }}
   <url>
     <loc>{{ .Permalink }}</loc>{{ if not .Lastmod.IsZero }}
     <lastmod>{{ safeHTML (.Lastmod.Format "2006-01-02T15:04:05-07:00") }}</lastmod>{{ end }}{{ with .Sitemap.ChangeFreq }}
     <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
     <priority>{{ .Sitemap.Priority }}</priority>{{ end }}{{ if .IsTranslated }}{{ range .Translations }}
-    <xhtml:link rel="alternate" hreflang="{{ .Language.Lang }}" href="{{ .Permalink }}"/>{{ end }}
-    <xhtml:link rel="alternate" hreflang="{{ .Language.Lang }}" href="{{ .Permalink }}"/>{{ end }}
+    <xhtml:link rel="alternate" hreflang="{{ .Language.LanguageCode }}" href="{{ .Permalink }}"/>{{ end }}
+    <xhtml:link rel="alternate" hreflang="{{ .Language.LanguageCode }}" href="{{ .Permalink }}"/>{{ end }}
   </url>{{ end }}{{ end }}
 </urlset>