diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 8999d6b9..ecfb88b1 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,5 +3,5 @@ Please always provide the [GitHub issue(s)](../issues) your PR is for, as well a
 Fix #<gh-issue-id>
 
 Test URLs:
-- Before: https://main--{repo}--{owner}.hlx.page/
-- After: https://<branch>--{repo}--{owner}.hlx.page/
+- Before: https://main--famous-smoke-cigaradvisor--hlxsites.hlx.page/cigaradvisor/
+- After: https://<branch>--famous-smoke-cigaradvisor--hlxsites.hlx.page/cigaradvisor/
diff --git a/cigaradvisor/blocks/footer/footer.js b/cigaradvisor/blocks/footer/footer.js
index e1dbe938..bf75a916 100644
--- a/cigaradvisor/blocks/footer/footer.js
+++ b/cigaradvisor/blocks/footer/footer.js
@@ -10,7 +10,7 @@ export default async function decorate(block) {
   block.textContent = '';
 
   // load footer fragment
-  const footerPath = footerMeta.footer || '/footer';
+  const footerPath = footerMeta.footer || '/cigaradvisor/footer';
   const fragment = await loadFragment(footerPath);
 
   // decorate footer DOM
diff --git a/cigaradvisor/blocks/header/header.js b/cigaradvisor/blocks/header/header.js
index 6b240361..775c5138 100644
--- a/cigaradvisor/blocks/header/header.js
+++ b/cigaradvisor/blocks/header/header.js
@@ -93,7 +93,7 @@ function toggleMenu(nav, navSections, forceExpanded = null) {
 export default async function decorate(block) {
   // load nav as fragment
   const navMeta = getMetadata('nav');
-  const navPath = navMeta ? new URL(navMeta).pathname : '/nav';
+  const navPath = navMeta ? new URL(navMeta).pathname : '/cigaradvisor/nav';
   const fragment = await loadFragment(navPath);
 
   // decorate nav DOM