diff --git a/apps/spotlight/src/components/Footer.astro b/apps/spotlight/src/components/Footer.astro
index 9800cad5..9213b964 100644
--- a/apps/spotlight/src/components/Footer.astro
+++ b/apps/spotlight/src/components/Footer.astro
@@ -1,6 +1,7 @@
 ---
 import { type GithubRepository, getBranchTreeUrl } from '../lib/github.js';
 import { Image } from 'astro:assets';
+import { getBaseUrl } from '../routes';
 
 type Props = {
   github: GithubRepository;
@@ -25,7 +26,7 @@ const { github } = Astro.props;
                   class="usa-identifier__logo GSAFooter__logo"
                 >
                   <Image
-                    src="/images/gsa-logo.svg"
+                    src=`${getBaseUrl()}images/gsa-logo.svg`
                     alt="GSA.gov home."
                     width="60"
                     height="60"
diff --git a/apps/spotlight/src/components/Header.astro b/apps/spotlight/src/components/Header.astro
index a9cf06b8..f62b26de 100644
--- a/apps/spotlight/src/components/Header.astro
+++ b/apps/spotlight/src/components/Header.astro
@@ -1,9 +1,8 @@
 ---
 import closeSvg from '@atj/design/static/uswds/img/usa-icons/close.svg';
-import logoSvg from '../../public/images/10x-logo.svg';
-
 import * as routes from '../routes';
 import { Image } from 'astro:assets';
+import { getBaseUrl } from '../routes';
 
 const getNavLinkClasses = (url: string) => {
   if (url === Astro.url.pathname) {
@@ -33,7 +32,7 @@ const showAboutContent = false;
       <em class="usa-logo__text">
         <a href={routes.getHomeUrl()} title="10x Forms Platform">
           <Image
-            src="/images/10x-logo.svg"
+            src=`${getBaseUrl()}images/10x-logo.svg`
             alt="10x Forms Platform home"
             width="72"
             height="34"
diff --git a/apps/spotlight/src/routes.ts b/apps/spotlight/src/routes.ts
index e2398088..0133623e 100644
--- a/apps/spotlight/src/routes.ts
+++ b/apps/spotlight/src/routes.ts
@@ -25,6 +25,11 @@ export const getStorybookUrl = () => {
   return `${context.baseUrl}design/index.html`;
 };
 
+export const getBaseUrl = () => {
+  const context = getAppContext();
+  return context.baseUrl;
+};
+
 export const getAboutUrl = () => {
   const context = getAppContext();
   return `${context.baseUrl}about/index.html`;