diff --git a/xml-pages.go b/xml-pages.go
index 00dcb2e..b102bdd 100644
--- a/xml-pages.go
+++ b/xml-pages.go
@@ -18,7 +18,7 @@ type SitemapPage struct {
 	ModifiedAt string
 
 	// for the profile sitemap
-	Npub string
+	Metadata Metadata
 
 	// for the relay sitemap
 	RelayHostname string
@@ -46,7 +46,6 @@ type RSSPage struct {
 	Title      string
 
 	// for the profile RSS
-	Npub     string
 	Metadata Metadata
 
 	// for the relay RSS
diff --git a/xml/rss.xml b/xml/rss.xml
index 7bafe40..0d305c4 100644
--- a/xml/rss.xml
+++ b/xml/rss.xml
@@ -1,13 +1,13 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
   <updated>{{.ModifiedAt}}</updated>
   <generator>https://{{.Host}}</generator>
-{{if not (eq "" .Npub)}}
+{{if not (eq "" .Metadata.Npub)}}
   <title>Nostr notes by {{.Metadata.Name}}</title>
   <author>
     <name>{{.Metadata.Name}}</name>
   </author>
-  <link href="https://{{.Host}}/{{.Npub}}" />
-  <id>{{.Npub}}</id>
+  <link href="https://{{.Host}}/{{.Metadata.Npub}}" />
+  <id>{{.Metadata.Npub}}</id>
   <icon>{{.Metadata.Picture}}</icon>
   <logo>{{.Metadata.Picture}}</logo>
 {{end}}
diff --git a/xml/sitemap.xml b/xml/sitemap.xml
index 29b7e06..c276413 100644
--- a/xml/sitemap.xml
+++ b/xml/sitemap.xml
@@ -1,7 +1,7 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{{if not (eq "" .Npub)}}
+{{if not (eq "" .Metadata.Npub)}}
 	<url>
-		<loc>https://{{.Host}}/{{.Npub}}</loc>
+		<loc>https://{{.Host}}/{{.Metadata.Npub}}</loc>
 		<lastmod>{{.ModifiedAt}}</lastmod>
 		<changefreq>daily</changefreq>
 		<priority>0.8</priority>