diff --git a/web/astro.config.mjs b/web/astro.config.mjs
index 605c074..8f60213 100644
--- a/web/astro.config.mjs
+++ b/web/astro.config.mjs
@@ -5,5 +5,6 @@ import lit from "@astrojs/lit";
 // https://astro.build/config
 export default defineConfig({
   integrations: [lit()],
-  base: process.env.BASE_URL || '/',
+  site: process.env.SITE,
+  base: process.env.BASE_URL,
 });
diff --git a/web/src/components/Intro.astro b/web/src/components/Intro.astro
index 2d548e0..9ffd358 100644
--- a/web/src/components/Intro.astro
+++ b/web/src/components/Intro.astro
@@ -1,4 +1,3 @@
-
 <section>
   <h2>About</h2>
   <p>
diff --git a/web/src/components/Nav.astro b/web/src/components/Nav.astro
index 14f7873..a1f2599 100644
--- a/web/src/components/Nav.astro
+++ b/web/src/components/Nav.astro
@@ -1,9 +1,10 @@
 ---
 import './Icon';
+const baseUrl = import.meta.env.BASE_URL;
 ---
 
 <nav>
-  <a class="site-name" href="/">
+  <a class="site-name" href={baseUrl}>
     <icon-component iconName="email" iconWidth="2rem" iconHeight="1.8rem" />
     <span class="site-name">Email Comparison</span>
   </a>
diff --git a/web/src/components/ProviderLinks.astro b/web/src/components/ProviderLinks.astro
index aa712a2..c343873 100644
--- a/web/src/components/ProviderLinks.astro
+++ b/web/src/components/ProviderLinks.astro
@@ -3,6 +3,8 @@ import type { TransformedMailProvider } from '../types/MailServices';
 import { transformMailProviders } from '../utils/transform-data';
 const { mailProviders, title } = Astro.props;
 
+const baseUrl = import.meta.env.BASE_URL;
+
 const getPositives = (service: TransformedMailProvider) => {
   return service.attributes.filter((attribute) => attribute.level === 1).map((attribute) => attribute.title);
 }
@@ -29,7 +31,7 @@ const services = sortServicesByPositives(transformMailProviders(mailProviders));
   <h2>{title || 'Reports'}</h2>
   <div class="links">
     {services.map((service: TransformedMailProvider) => (
-      <a href={`/email/${service.key}`}>
+      <a href={`${baseUrl}email/${service.key}`}>
         <article title={makeSellingPointsString(service)}>
           <div class="top">
             <img width="64" src={service.icon} alt={service.name} />