diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index b64752bb..38086bca 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -1,6 +1,7 @@
 {{- /* Generate RSS v2 with full page content. */ -}}
 {{- /* Upstream Hugo bug - RSS dates can be in future: https://github.com/gohugoio/hugo/issues/3918 */ -}}
-{{- $pages := .Data.Pages -}}
+{{- $page_context := cond .IsHome site . -}}
+{{- $pages := $page_context.RegularPages -}}
 {{- $limit := site.Config.Services.RSS.Limit -}}
 {{- if ge $limit 1 -}}
   {{- $pages = $pages | first $limit -}}
diff --git a/netlify.toml b/netlify.toml
index 682ae78f..0626c811 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -5,7 +5,7 @@
 
 [build.environment]
   HUGO_THEME = "repo"
-  HUGO_VERSION = "0.58.1"
+  HUGO_VERSION = "0.58.3"
   HUGO_ENABLEGITINFO = "true"
 
 [context.production.environment]