diff --git a/config.toml b/config.toml
index 52d283b487..082deed127 100644
--- a/config.toml
+++ b/config.toml
@@ -1,4 +1,7 @@
 baseURL = "/"
+#baseURL = "https://docs.armory.io/"
+
+#canonifyURLs = true
 
 enableRobotsTXT = true
 enableInlineShortcodes = true
diff --git a/layouts/_default/list.rss.xml b/layouts/_default/list.rss.xml
new file mode 100644
index 0000000000..b74bc35794
--- /dev/null
+++ b/layouts/_default/list.rss.xml
@@ -0,0 +1,43 @@
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ .Site.Title }} – {{ .Title }}</title>
+    <link>{{ .Permalink }}</link>
+    <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
+    <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
+    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
+    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
+    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
+    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
+    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    {{ with .OutputFormats.Get "RSS" }}
+	  {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
+    {{ end }}
+    {{ if not $.Section }}
+      {{ $sections := .Site.Params.rss_sections | default (slice "blog") }}
+      {{ .Scratch.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" "in" $sections )) }}
+    {{ else }}
+      {{ if $.Parent.IsHome }}
+        {{ .Scratch.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" $.Section )) }}
+      {{ else }}
+        {{ .Scratch.Set "rss_pages" (first 50 $.Pages) }}
+      {{ end }}
+    {{ end }}
+    {{ range (.Scratch.Get "rss_pages")  }}
+    <item>
+      <title>{{ .Section | title }}: {{ .Title }}</title>
+      <link>{{ .Permalink }}</link>
+      <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
+      {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+      <guid>{{ .Permalink }}</guid>
+      <description>
+        {{ $img := (.Resources.ByType "image").GetMatch "*featured*" }}
+        {{ with $img }}
+        {{ $img := .Resize "640x" }}
+        {{ printf "<![CDATA[<img src=\"%s\" width=\"%d\" height=\"%d\"/>]]>" $img.Permalink $img.Width $img.Height | safeHTML }}
+        {{ end }}
+        {{ .Content | html }}
+      </description>
+    </item>
+    {{ end }}
+  </channel>
+</rss>
diff --git a/layouts/partials/list-recent-release-notes.html b/layouts/partials/list-recent-release-notes.html
index 0b8ee9f269..e0cb9b7452 100644
--- a/layouts/partials/list-recent-release-notes.html
+++ b/layouts/partials/list-recent-release-notes.html
@@ -1,7 +1,7 @@
 <div class="section-index">
 
 <div>
-  <h3><a class="fas fa-rss" target="_blank" href="https://docs.armory.io/armory-enterprise/release-notes/rn-armory-spinnaker/index.xml"></a></h3>
+  <h3><a class="fas fa-rss" target="_blank" href="{{ .Permalink }}/index.xml"></a></h3>
 </div>
   {{ $pages := (where .Site.Pages "Section" .Section).ByParam "version" }}
   {{ $pagesReverse := $pages.Reverse }}
diff --git a/netlify.toml b/netlify.toml
index 2c5c946ecc..b6f676bb58 100755
--- a/netlify.toml
+++ b/netlify.toml
@@ -8,7 +8,7 @@
 
 # "production" environment specific build settings
 [build.environment]
-  HUGO_VERSION = "0.71.1"
+  HUGO_VERSION = "0.108.0"
   HUGO_THEME = "docsy"
   HUGO_ENV = "production"