diff --git a/src/site/_data/meta.js b/src/site/_data/meta.js
index 4d51778..9feb10c 100644
--- a/src/site/_data/meta.js
+++ b/src/site/_data/meta.js
@@ -22,12 +22,17 @@ module.exports = async() => {
         const res = await axios.get(themeUrl);
         themeStyle = `<style>${res.data}</style>`;
     }
+    let baseUrl = process.env.SITE_BASE_URL || "";
+    if(baseUrl && !baseUrl.startsWith("http")){
+        baseUrl = "https://" + baseUrl;
+    }
     const meta ={
         env: process.env.ELEVENTY_ENV,
         theme: process.env.THEME,
         themeStyle: themeStyle,
         baseTheme: process.env.BASE_THEME || "dark",
         siteName: process.env.SITE_NAME_HEADER || "Digital Garden",
+        siteBaseUrl: baseUrl,
     };
 
     return meta;
diff --git a/src/site/lunr.njk b/src/site/lunr.njk
index c0a88c5..e7a7962 100644
--- a/src/site/lunr.njk
+++ b/src/site/lunr.njk
@@ -1,6 +1,7 @@
 ---
 permalink: netlify/functions/search/data.json
 permalinkBypassOutputDir: true
+eleventyExcludeFromCollections: true
 ---
 [{% for post in collections.note %}
 {
diff --git a/src/site/sitemap.njk b/src/site/sitemap.njk
index 010d763..949bc06 100644
--- a/src/site/sitemap.njk
+++ b/src/site/sitemap.njk
@@ -5,11 +5,9 @@ eleventyExcludeFromCollections: true
 <?xml version="1.0" encoding="utf-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     {% for page in collections.all %}
-        {%if page.url !== '/netlify/functions/search/data.json'%}
         <url>
-            <loc>{{ site.url }}{{ page.url | url }}</loc>
+            <loc>{{ meta.siteBaseUrl }}{{ page.url | url }}</loc>
             <lastmod>{{ page.date.toISOString() }}</lastmod>
         </url>
-        {%endif%}
     {% endfor %}
 </urlset>
\ No newline at end of file