From e19247e0e9772761979eaa71079345a3ce16693e Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Wed, 3 Jun 2026 23:25:22 +0530
Subject: [PATCH 01/11] fix: resolve 404 page asset loading on nested routes

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 layouts/404.html               |  1 -
 layouts/partials/favicon.html  |  8 ++++----
 layouts/partials/head-css.html |  4 +---
 layouts/partials/navbar.html   | 20 ++++++++++----------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/layouts/404.html b/layouts/404.html
index 410580771b7..7549b8132ff 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -31,7 +31,6 @@ <h1>Not found</h1>
       </div>
       {{ partial "footer.html" . }}
     </div>
-    {{ partial "scripts.html" . }}
   </body>
 </html>
 
diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html
index 5252ddc753e..bbb90eacce4 100644
--- a/layouts/partials/favicon.html
+++ b/layouts/partials/favicon.html
@@ -1,9 +1,9 @@
 <link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href="/favicons/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="16x16" href="/favicons/favicon-16x16.png">
-<link rel="manifest" href="/favicons/site.webmanifest">
+<link rel="icon" type="image/png" sizes="32x32" href='{{ "favicons/favicon-32x32.png" | absURL }}'>
+<link rel="icon" type="image/png" sizes="16x16" href='{{ "favicons/favicon-16x16.png" | absURL }}'>
+<link rel="manifest" href='{{ "/favicons/site.webmanifest"  | absURL}}'>
 <link rel="mask-icon" href="/favicons/safari-pinned-tab.svg">
-<link rel="shortcut icon" href="/favicons/favicon.ico">
+<link rel="shortcut icon" href='{{ "favicons/favicon.ico" | absURL }}'>
 <meta name="msapplication-TileColor" content="#da532c">
 <meta name="msapplication-config" content="/favicons/browserconfig.xml">
 <meta name="theme-color" content="#ffffff">
\ No newline at end of file
diff --git a/layouts/partials/head-css.html b/layouts/partials/head-css.html
index b2d8a058879..522fe1ad26f 100644
--- a/layouts/partials/head-css.html
+++ b/layouts/partials/head-css.html
@@ -20,9 +20,7 @@
 {{ end -}}
 
 {{ with $css -}}
-  <link href="{{ .RelPermalink }}" rel="stylesheet"
-  {{- with .Data.Integrity }} integrity="{{ . }}" crossorigin="anonymous"{{ end -}}
-  >
+  <link href="{{ .RelPermalink | absURL }}" rel="stylesheet">
 {{ else -}}
   {{ errorf "Resource not found or error building CSS: %s" $scssMain -}}
 {{ end -}}
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index a7bdc93a78b..8ab1ff96ebb 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -9,7 +9,7 @@
       <a class="navbar-brand" href="/" aria-label="Home">
         <span class="navbar-brand__logo navbar-logo">
           {{ $svg := resources.Get "icons/logo.svg" }}
-          <img class="footer-logo" src="/images/logo.svg" alt="logo" data-modal="false" />
+          <img class="footer-logo" src='{{ "images/logo.svg" | absURL }}' alt="logo" data-modal="false" />
         </span>
         <span class="navbar-brand__name"></span
       ></a>
@@ -48,7 +48,7 @@
                           >
                             <div class="logo-container">
                               <img
-                                src="/images/academy-icon.svg"
+                                src='{{ "/images/academy-icon.svg" | absURL }}'
                                 alt="Meshery Logo"
                               />
                             </div>
@@ -62,7 +62,7 @@
                           >
                             <div class="logo-container">
                               <img
-                                src="/images/video-play.svg"
+                                src='{{ "/images/video-play.svg" | absURL }}'
                                 alt="Meshery Logo"
                               />
                             </div>
@@ -91,7 +91,7 @@
             data-toggle="dropdown"
             style="padding-top:6px"
             >
-            <img width="28px" src="/images/grid-icon.svg" alt="Products" class="grid-icon" data-modal="false" />
+            <img width="28px" src='{{ "/images/grid-icon.svg" | absURL }}' alt="Products" class="grid-icon" data-modal="false" />
 
           </div>
           <div class="dropdown-menu" aria-labelledby="productsDropdown" style="margin-left:-4.5rem;visibility:hidden;">
@@ -103,7 +103,7 @@
             >
               <div class="logo-container">
                 <img
-                  src="/images/logos/meshery-light-icon.svg"
+                  src='{{ "/images/logos/meshery-light-icon.svg" | absURL }}'
                   alt="Meshery Logo"
                 />
               </div>
@@ -118,7 +118,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src="/images/logos/kanvas-icon-color.svg"
+                    src='{{ "/images/logos/kanvas-icon-color.svg" | absURL }}'
                     alt="Layer5 Kanvas Logo"
                     style="height:40px; width:40px;"
                   />
@@ -135,7 +135,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src="/images/logos/catalog.svg"
+                    src='{{ "/images/logos/catalog.svg" | absURL }}'
                     alt="Layer5 Catalog Logo"
                   />
                 </div>
@@ -151,7 +151,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src="/images/logos/smp-light.png"
+                    src='{{ "/images/logos/smp-light.png"  | absURL }}'
                     alt="Layer5 Cloud Native Performance Logo"
                   />
                 </div>
@@ -167,7 +167,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src="/images/logos/nighthawk-logo.svg"
+                    src='{{ "/images/logos/nighthawk-logo.svg" | absURL }}'
                     alt="Layer5 Nighthawk Logo"
                   />
                 </div>
@@ -184,7 +184,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src="/images/logos/academy.svg"
+                    src='{{ "/images/logos/academy.svg"  | absURL }}'
                     alt="Layer5 Academy Logo"
                   />
                 </div>

From f0ded2d61a222e32c19e7d1e118e09261ae7e16b Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Wed, 3 Jun 2026 23:36:07 +0530
Subject: [PATCH 02/11] gemini suggestion

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 layouts/partials/head-css.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/head-css.html b/layouts/partials/head-css.html
index 522fe1ad26f..f5a3db4c79c 100644
--- a/layouts/partials/head-css.html
+++ b/layouts/partials/head-css.html
@@ -16,11 +16,13 @@
 
 {{ if hugo.IsProduction -}}
   {{ $css = $css | minify | fingerprint -}}
-  <link rel="preload" href="{{ $css.RelPermalink }}" as="style" integrity="{{ $css.Data.Integrity }}" crossorigin="anonymous">
+  <link rel="preload" href="{{ $css.Permalink }}" as="style" integrity="{{ $css.Data.Integrity }}" crossorigin="anonymous">
 {{ end -}}
 
 {{ with $css -}}
-  <link href="{{ .RelPermalink | absURL }}" rel="stylesheet">
+  <link href="{{ .Permalink }}" rel="stylesheet"
+  {{- with .Data.Integrity }} integrity="{{ . }}" crossorigin="anonymous"{{ end -}}
+  >
 {{ else -}}
   {{ errorf "Resource not found or error building CSS: %s" $scssMain -}}
 {{ end -}}

From 7eb636d2156815ff400cb3d44001fa29ed6b71eb Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Wed, 3 Jun 2026 23:49:36 +0530
Subject: [PATCH 03/11] working for preview

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 layouts/404.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/layouts/404.html b/layouts/404.html
index 7549b8132ff..f904884929c 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,8 +1,14 @@
 <!doctype html>
 <html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" dir="{{ .Site.Language.Direction }}" class="no-js">
   <head>
-    {{ partial "head.html" . }}
-  </head>
+  {{ if in .Site.BaseURL "/pr-preview/" }}
+    <base href="{{ .Site.BaseURL }}">
+  {{ else }}
+    <base href="/" />
+  {{ end }}
+
+  {{ partial "head.html" . }}
+</head>
   <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">
     <header>
       {{ partial "navbar.html" . }}

From fdac065c33ca7aae40d3a1aaf6b75da1ce39fc65 Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Thu, 4 Jun 2026 00:20:57 +0530
Subject: [PATCH 04/11] working for preview

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 layouts/404.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/layouts/404.html b/layouts/404.html
index f904884929c..c1f8624d836 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,14 +1,14 @@
 <!doctype html>
 <html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" dir="{{ .Site.Language.Direction }}" class="no-js">
   <head>
-  {{ if in .Site.BaseURL "/pr-preview/" }}
-    <base href="{{ .Site.BaseURL }}">
+  {{ if in .Permalink "/pr-preview/" }}
+    <base href="{{ "/" | relURL }}">
   {{ else }}
     <base href="/" />
   {{ end }}
 
   {{ partial "head.html" . }}
-</head>
+  </head>
   <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">
     <header>
       {{ partial "navbar.html" . }}

From 0c145105ecbc9b8104de228f39d21f181b15414f Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Thu, 4 Jun 2026 00:29:30 +0530
Subject: [PATCH 05/11] working for preview

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 layouts/404.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/layouts/404.html b/layouts/404.html
index c1f8624d836..02582de83cc 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,12 +1,6 @@
 <!doctype html>
 <html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" dir="{{ .Site.Language.Direction }}" class="no-js">
   <head>
-  {{ if in .Permalink "/pr-preview/" }}
-    <base href="{{ "/" | relURL }}">
-  {{ else }}
-    <base href="/" />
-  {{ end }}
-
   {{ partial "head.html" . }}
   </head>
   <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">
@@ -37,6 +31,7 @@ <h1>Not found</h1>
       </div>
       {{ partial "footer.html" . }}
     </div>
+    {{ partial "scripts.html" . }}
   </body>
 </html>
 

From 998fca7ccad3d7b95cc3a2c92df98687932120c8 Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Thu, 4 Jun 2026 00:45:54 +0530
Subject: [PATCH 06/11] working for preview

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 layouts/404.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layouts/404.html b/layouts/404.html
index 02582de83cc..abaf9a12713 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,7 +1,8 @@
 <!doctype html>
 <html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" dir="{{ .Site.Language.Direction }}" class="no-js">
   <head>
-  {{ partial "head.html" . }}
+    <base href="{{ .Site.BaseURL }}">
+    {{ partial "head.html" . }}
   </head>
   <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">
     <header>

From bb72ce26ddd7ba4d1e734f2d22fde4d157a43e65 Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Thu, 4 Jun 2026 01:17:16 +0530
Subject: [PATCH 07/11] working for preview

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 layouts/404.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/layouts/404.html b/layouts/404.html
index abaf9a12713..b883569a50c 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -24,6 +24,7 @@
             {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
             {{ block "main" . }}
             <h1>Not found</h1>
+            <h1>BHumika</h1>
             <p>Oops! This page doesn't exist.</p>
             <p>Please let us know about <a href="https://github.com/layer5io/docs/issues/new/choose">this issue</a> and return to the <a href="{{ "" | relURL }}">home page</a>.</p>
             {{ end }}

From e81b4988ccbe7977d12ae8c277de3e1664cd98d7 Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Thu, 4 Jun 2026 01:47:34 +0530
Subject: [PATCH 08/11] working for preview

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 content/en/_index.md | 2 +-
 layouts/404.html     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/content/en/_index.md b/content/en/_index.md
index cf1084b862e..6a488dd2ce1 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -7,7 +7,7 @@ description: >
 {{< blocks/cover title="" image_anchor="top" height="full" >}}
 
 <div class="dash-sign-container">
-<h1 class="dashboard">Expect more from your infrastructure</h1>
+<h1 class="dashboard">Expect more from Bhyour infrastructure</h1>
 
 <a href="https://www.youtube.com/watch?v=034nVaQUyME&list=PL3A-A6hPO2IO_yzN83wSJJUNQActzCJvO&index=9" class="dash-sign">Design your path</a>
 
diff --git a/layouts/404.html b/layouts/404.html
index b883569a50c..cb1d8221dc7 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,7 +1,6 @@
 <!doctype html>
 <html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" dir="{{ .Site.Language.Direction }}" class="no-js">
   <head>
-    <base href="{{ .Site.BaseURL }}">
     {{ partial "head.html" . }}
   </head>
   <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">

From c8a2af0e9ec9c765395d690922dd9851c911ec02 Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Thu, 4 Jun 2026 02:15:10 +0530
Subject: [PATCH 09/11] refactor: limit 404 asset fix to 404 page

---
 layouts/404.html               |  1 +
 layouts/partials/head-css.html |  4 ++--
 layouts/partials/navbar.html   | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/layouts/404.html b/layouts/404.html
index cb1d8221dc7..b883569a50c 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" dir="{{ .Site.Language.Direction }}" class="no-js">
   <head>
+    <base href="{{ .Site.BaseURL }}">
     {{ partial "head.html" . }}
   </head>
   <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">
diff --git a/layouts/partials/head-css.html b/layouts/partials/head-css.html
index f5a3db4c79c..b2d8a058879 100644
--- a/layouts/partials/head-css.html
+++ b/layouts/partials/head-css.html
@@ -16,11 +16,11 @@
 
 {{ if hugo.IsProduction -}}
   {{ $css = $css | minify | fingerprint -}}
-  <link rel="preload" href="{{ $css.Permalink }}" as="style" integrity="{{ $css.Data.Integrity }}" crossorigin="anonymous">
+  <link rel="preload" href="{{ $css.RelPermalink }}" as="style" integrity="{{ $css.Data.Integrity }}" crossorigin="anonymous">
 {{ end -}}
 
 {{ with $css -}}
-  <link href="{{ .Permalink }}" rel="stylesheet"
+  <link href="{{ .RelPermalink }}" rel="stylesheet"
   {{- with .Data.Integrity }} integrity="{{ . }}" crossorigin="anonymous"{{ end -}}
   >
 {{ else -}}
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 8ab1ff96ebb..a7bdc93a78b 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -9,7 +9,7 @@
       <a class="navbar-brand" href="/" aria-label="Home">
         <span class="navbar-brand__logo navbar-logo">
           {{ $svg := resources.Get "icons/logo.svg" }}
-          <img class="footer-logo" src='{{ "images/logo.svg" | absURL }}' alt="logo" data-modal="false" />
+          <img class="footer-logo" src="/images/logo.svg" alt="logo" data-modal="false" />
         </span>
         <span class="navbar-brand__name"></span
       ></a>
@@ -48,7 +48,7 @@
                           >
                             <div class="logo-container">
                               <img
-                                src='{{ "/images/academy-icon.svg" | absURL }}'
+                                src="/images/academy-icon.svg"
                                 alt="Meshery Logo"
                               />
                             </div>
@@ -62,7 +62,7 @@
                           >
                             <div class="logo-container">
                               <img
-                                src='{{ "/images/video-play.svg" | absURL }}'
+                                src="/images/video-play.svg"
                                 alt="Meshery Logo"
                               />
                             </div>
@@ -91,7 +91,7 @@
             data-toggle="dropdown"
             style="padding-top:6px"
             >
-            <img width="28px" src='{{ "/images/grid-icon.svg" | absURL }}' alt="Products" class="grid-icon" data-modal="false" />
+            <img width="28px" src="/images/grid-icon.svg" alt="Products" class="grid-icon" data-modal="false" />
 
           </div>
           <div class="dropdown-menu" aria-labelledby="productsDropdown" style="margin-left:-4.5rem;visibility:hidden;">
@@ -103,7 +103,7 @@
             >
               <div class="logo-container">
                 <img
-                  src='{{ "/images/logos/meshery-light-icon.svg" | absURL }}'
+                  src="/images/logos/meshery-light-icon.svg"
                   alt="Meshery Logo"
                 />
               </div>
@@ -118,7 +118,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src='{{ "/images/logos/kanvas-icon-color.svg" | absURL }}'
+                    src="/images/logos/kanvas-icon-color.svg"
                     alt="Layer5 Kanvas Logo"
                     style="height:40px; width:40px;"
                   />
@@ -135,7 +135,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src='{{ "/images/logos/catalog.svg" | absURL }}'
+                    src="/images/logos/catalog.svg"
                     alt="Layer5 Catalog Logo"
                   />
                 </div>
@@ -151,7 +151,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src='{{ "/images/logos/smp-light.png"  | absURL }}'
+                    src="/images/logos/smp-light.png"
                     alt="Layer5 Cloud Native Performance Logo"
                   />
                 </div>
@@ -167,7 +167,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src='{{ "/images/logos/nighthawk-logo.svg" | absURL }}'
+                    src="/images/logos/nighthawk-logo.svg"
                     alt="Layer5 Nighthawk Logo"
                   />
                 </div>
@@ -184,7 +184,7 @@
               >
                 <div class="logo-container">
                   <img
-                    src='{{ "/images/logos/academy.svg"  | absURL }}'
+                    src="/images/logos/academy.svg"
                     alt="Layer5 Academy Logo"
                   />
                 </div>

From 84a835168c1ba79b58e6c7988a9db5b254b8e80c Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Thu, 4 Jun 2026 02:31:14 +0530
Subject: [PATCH 10/11] working for preview

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 layouts/partials/head-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/head-css.html b/layouts/partials/head-css.html
index b2d8a058879..6652502e5f8 100644
--- a/layouts/partials/head-css.html
+++ b/layouts/partials/head-css.html
@@ -15,7 +15,7 @@
 {{ end -}}
 
 {{ if hugo.IsProduction -}}
-  {{ $css = $css | minify | fingerprint -}}
+  {{ $css = $css | minify }}
   <link rel="preload" href="{{ $css.RelPermalink }}" as="style" integrity="{{ $css.Data.Integrity }}" crossorigin="anonymous">
 {{ end -}}
 

From 82868c38016780b57f3484dc375bbf942a84ce50 Mon Sep 17 00:00:00 2001
From: Bhumika Garg <bhumikatech2024@gmail.com>
Date: Thu, 4 Jun 2026 16:00:12 +0530
Subject: [PATCH 11/11] preview working

Signed-off-by: Bhumika Garg <bhumikatech2024@gmail.com>
---
 .github/workflows/build-and-preview-docs.yml |  3 ++-
 .github/workflows/hugo.yaml                  |  2 +-
 content/en/_index.md                         |  4 ++--
 layouts/404.html                             | 16 +++++++++++++---
 layouts/partials/favicon.html                | 10 +++++-----
 layouts/partials/head-css.html               |  2 +-
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-and-preview-docs.yml b/.github/workflows/build-and-preview-docs.yml
index 3ea042c285d..1b80fad60f8 100644
--- a/.github/workflows/build-and-preview-docs.yml
+++ b/.github/workflows/build-and-preview-docs.yml
@@ -72,6 +72,7 @@ jobs:
         if: github.event.action != 'closed'
         env:
           HUGO_PREVIEW: 'true'
+          HUGO_PREVIEW_BASE_URL: https://docs.layer5.io/pr-preview/pr-${{ github.event.pull_request.number }}/
         run: |
           npm run build:preview
           cat > public/robots.txt <<'EOF'
@@ -145,7 +146,7 @@ jobs:
         with:
           header: pr-preview
           message: |
-            🚀 Preview deployment: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/pr-preview/pr-${{ github.event.pull_request.number }}/
+            🚀 Preview deployment: https://docs.layer5.io/pr-preview/pr-${{ github.event.pull_request.number }}/
             > *Note: Preview may take a moment (GitHub Pages deployment in progress). Please wait and refresh. Track deployment [here](https://github.com/${{ github.repository }}/actions/workflows/pages/pages-build-deployment)*
 
       - name: Comment on pruned previews
diff --git a/.github/workflows/hugo.yaml b/.github/workflows/hugo.yaml
index 6e207e8ff7a..666df5e7c81 100644
--- a/.github/workflows/hugo.yaml
+++ b/.github/workflows/hugo.yaml
@@ -57,7 +57,7 @@ jobs:
           hugo \
             --gc \
             --minify \
-            --baseURL "/"
+            --baseURL "https://docs.layer5.io/"
           cp CNAME public/CNAME
           touch public/.nojekyll
       - name: Deploy to GitHub Pages
diff --git a/content/en/_index.md b/content/en/_index.md
index 6a488dd2ce1..13b744b3a6e 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -7,7 +7,7 @@ description: >
 {{< blocks/cover title="" image_anchor="top" height="full" >}}
 
 <div class="dash-sign-container">
-<h1 class="dashboard">Expect more from Bhyour infrastructure</h1>
+<h1 class="dashboard">Expect more from your infrastructure</h1>
 
 <a href="https://www.youtube.com/watch?v=034nVaQUyME&list=PL3A-A6hPO2IO_yzN83wSJJUNQActzCJvO&index=9" class="dash-sign">Design your path</a>
 
@@ -223,4 +223,4 @@ function restoreImage(imgId, originalSrc) {
       animate();
     }
   </script>
-  <!-- Wave Visualizer Script -->
\ No newline at end of file
+  <!-- Wave Visualizer Script -->
diff --git a/layouts/404.html b/layouts/404.html
index b883569a50c..346c6e65c86 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,7 +1,19 @@
 <!doctype html>
 <html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" dir="{{ .Site.Language.Direction }}" class="no-js">
   <head>
-    <base href="{{ .Site.BaseURL }}">
+    {{- $baseHref := .Site.BaseURL -}}
+    {{- with getenv "HUGO_PREVIEW_BASE_URL" -}}
+      {{- $baseHref = . -}}
+    {{- end }}
+    <script>
+      (function () {
+        var previewBase = window.location.pathname.match(/^\/pr-preview\/pr-\d+\//);
+        if (previewBase && window.location.pathname !== previewBase[0] + "404.html") {
+          window.location.replace(previewBase[0] + "404.html");
+        }
+      })();
+    </script>
+    <base href="{{ $baseHref }}">
     {{ partial "head.html" . }}
   </head>
   <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">
@@ -24,7 +36,6 @@
             {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
             {{ block "main" . }}
             <h1>Not found</h1>
-            <h1>BHumika</h1>
             <p>Oops! This page doesn't exist.</p>
             <p>Please let us know about <a href="https://github.com/layer5io/docs/issues/new/choose">this issue</a> and return to the <a href="{{ "" | relURL }}">home page</a>.</p>
             {{ end }}
@@ -36,4 +47,3 @@ <h1>BHumika</h1>
     {{ partial "scripts.html" . }}
   </body>
 </html>
-
diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html
index bbb90eacce4..2ed3555f6d3 100644
--- a/layouts/partials/favicon.html
+++ b/layouts/partials/favicon.html
@@ -1,9 +1,9 @@
 <link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href='{{ "favicons/favicon-32x32.png" | absURL }}'>
-<link rel="icon" type="image/png" sizes="16x16" href='{{ "favicons/favicon-16x16.png" | absURL }}'>
-<link rel="manifest" href='{{ "/favicons/site.webmanifest"  | absURL}}'>
+<link rel="icon" type="image/png" sizes="32x32" href="/favicons/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/favicons/favicon-16x16.png">
+<link rel="manifest" href="/favicons/site.webmanifest">
 <link rel="mask-icon" href="/favicons/safari-pinned-tab.svg">
-<link rel="shortcut icon" href='{{ "favicons/favicon.ico" | absURL }}'>
+<link rel="shortcut icon" href="/favicons/favicon.ico">
 <meta name="msapplication-TileColor" content="#da532c">
 <meta name="msapplication-config" content="/favicons/browserconfig.xml">
-<meta name="theme-color" content="#ffffff">
\ No newline at end of file
+<meta name="theme-color" content="#ffffff">
diff --git a/layouts/partials/head-css.html b/layouts/partials/head-css.html
index 6652502e5f8..b2d8a058879 100644
--- a/layouts/partials/head-css.html
+++ b/layouts/partials/head-css.html
@@ -15,7 +15,7 @@
 {{ end -}}
 
 {{ if hugo.IsProduction -}}
-  {{ $css = $css | minify }}
+  {{ $css = $css | minify | fingerprint -}}
   <link rel="preload" href="{{ $css.RelPermalink }}" as="style" integrity="{{ $css.Data.Integrity }}" crossorigin="anonymous">
 {{ end -}}