diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..faf757d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.png filter=lfs diff=lfs merge=lfs -text
+*.ico filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml
index bca479b..7ae49fc 100644
--- a/.github/workflows/pages.yaml
+++ b/.github/workflows/pages.yaml
@@ -7,19 +7,36 @@ on:
   pull_request:
     branches:
       - main
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - closed
   workflow_dispatch:
 
 permissions:
   contents: write # to write the built page to the branch
+  pull-requests: write # to leave a comment with the preview URL
 
 concurrency:
-  group: pages
+  # set separate concurrency groups for main and PR branches
+  group: ${{ github.event_name == 'pull_request' && format('pages-preview-{0}', github.event.pull_request.number) || 'pages-main' }}
   cancel-in-progress: false
 
 jobs:
 
+  delete-preview:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: rossjrw/pr-preview-action@v1
+        with:
+          action: remove
+
   build:
     runs-on: ubuntu-latest
+    # only build on main or if the PR is open
+    if: github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
@@ -29,16 +46,21 @@ jobs:
           node-version: 22
           cache: npm
 
-      - uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
+      - id: configure
+        uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
 
       - run: npm ci
       - run: npm run build
+        env:
+          PAGES_BASE: ${{ github.event_name == 'pull_request' && format('pr-preview/pr-{0}', github.event.pull_request.number) || '/' }}
 
+      # deploy the PR to a preview URL
       - uses: rossjrw/pr-preview-action@9f77b1d057b494e662c50b8ca40ecc63f21e0887 # v1
         if: ${{ github.event_name == 'pull_request' }}
         with:
           source-dir: .vitepress/dist
 
+      # deploy the build to GitHub Pages
       - uses: JamesIves/github-pages-deploy-action@6c2d9db40f9296374acc17b90404b6e8864128c8 # v4
         if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' }}
         with:
diff --git a/.vitepress/config.mts b/.vitepress/config.mts
index 0a9be00..e7ba318 100644
--- a/.vitepress/config.mts
+++ b/.vitepress/config.mts
@@ -4,7 +4,11 @@ import { fileURLToPath, URL } from 'node:url'
 // https://vitepress.dev/reference/site-config
 export default withMermaid({
   title: "Platform Mesh",
+  head: [
+    ['link', { rel: 'icon', href: '/favicon.ico' }]
+  ],
 
+  base: process.env.PAGES_BASE ? '/' + process.env.PAGES_BASE : '/',
 
   description: "Platform Mesh - Building upon the Kubernetes API & Resource Model",
 
@@ -14,13 +18,13 @@ export default withMermaid({
         {
           find: /^.*\/VPFooter\.vue$/,
           replacement: fileURLToPath(
-              new URL('./theme/components/VPFooter.vue', import.meta.url)
+              new URL('theme/components/VPFooter.vue', import.meta.url)
           )
         },
         {
           find: /^.*\/VPFeature\.vue$/,
           replacement: fileURLToPath(
-              new URL('./theme/components/VPFeature.vue', import.meta.url)
+              new URL('theme/components/VPFeature.vue', import.meta.url)
           )
         },
       ]
@@ -32,16 +36,15 @@ export default withMermaid({
     // https://vitepress.dev/reference/default-theme-config
     nav: [
       { text: 'Home', link: '/' },
-      {text: 'Overview', link: '/overview'},
+      { text: 'Overview', link: '/overview' },
       { text: 'Scenarios', link: '/scenarios' }
     ],
 
     logo: {
-      src: './assets/pm_logo.svg',
+      src: 'pm_logo.svg',
       width: 24,
       height: 24
     },
-  
 
     outline: [2, 3, 4, 5],
 
@@ -63,7 +66,7 @@ export default withMermaid({
             ]
         }
       ],
-      
+
         '/scenarios': {
             test: 'Scenarios',
             items:  [
@@ -72,13 +75,12 @@ export default withMermaid({
             ],
         },
 
-
     },
-  
 
     socialLinks: [
       { icon: 'github', link: 'https://github.com/platform-mesh' }
     ]
+
   },
- 
+
 })
diff --git a/.vitepress/theme/assets/eu-support.png b/.vitepress/theme/assets/eu-support.png
deleted file mode 100644
index ab642e3..0000000
Binary files a/.vitepress/theme/assets/eu-support.png and /dev/null differ
diff --git a/.vitepress/theme/assets/pm_logo.png b/.vitepress/theme/assets/pm_logo.png
deleted file mode 100644
index cc4fb6d..0000000
Binary files a/.vitepress/theme/assets/pm_logo.png and /dev/null differ
diff --git a/.vitepress/theme/components/VPFooter.vue b/.vitepress/theme/components/VPFooter.vue
index 4867e2a..e263f2d 100644
--- a/.vitepress/theme/components/VPFooter.vue
+++ b/.vitepress/theme/components/VPFooter.vue
@@ -29,8 +29,6 @@ Copied and adapted from: https://github.com/vuejs/vitepress/blob/828000099843c98
 <script setup lang="ts">
 import { useSidebar } from 'vitepress/theme';
 import { withBase, useData } from "vitepress";
-import euSupportImg from '../assets/eu-support.png'
-import neonephosLogo from '../assets/neonephos_logo.svg'
 
 const { hasSidebar } = useSidebar()
 const { isDark, title } = useData()
@@ -45,7 +43,7 @@ const projectName = title || 'PlatformMesh'
         <div class="funding-image">
           <div class="funding-image-container">
             <div class="funding-image-bg"></div>
-            <img :src="euSupportImg" alt="EU and German government funding logos" class="funding-image-src">
+            <img src="/eu-support.png" alt="EU and German government funding logos" class="funding-image-src">
           </div>
         </div>
         <div class="funding-text">
@@ -68,16 +66,16 @@ const projectName = title || 'PlatformMesh'
         </div>
 
       </div>
-      
+
       <!-- Neonephos Logo Section -->
       <div class="neonephos-logos">
         <a href="https://neonephos.org/" target="_blank" rel="noopener noreferrer" class="neonephos-link">
-          <img 
-            :src="neonephosLogo" 
-            alt="Neonephos Logo" 
+          <img
+            src="/neonephos_logo.svg"
+            alt="Neonephos Logo"
             class="neonephos-logo"
           >
-         
+
         </a>
       </div>
 
@@ -265,9 +263,9 @@ const projectName = title || 'PlatformMesh'
   .footer-columns {
     justify-content: flex-start;
   }
-  
+
   .neonephos-logo {
     max-height: 50px;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/assets/pm_logo.png b/assets/pm_logo.png
index cc4fb6d..b63cb11 100644
Binary files a/assets/pm_logo.png and b/assets/pm_logo.png differ
diff --git a/index.md b/index.md
index bc12f5a..9262199 100644
--- a/index.md
+++ b/index.md
@@ -7,7 +7,7 @@ hero:
   text:  "Building upon the Kubernetes API & Resource Model"
   tagline: "Discover, order, and orchestrate services across any provider through the beloved kubectl ❤️"
   image:
-    src: './assets/pm_logo.svg'
+    src: '/pm_logo.svg'
     alt: 'Platform Mesh'
   actions:
     - theme: brand
diff --git a/public/eu-support.png b/public/eu-support.png
new file mode 100644
index 0000000..08241e7
--- /dev/null
+++ b/public/eu-support.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e1e76dcf9e5ef3bda51555a9cab6f19119427e58768905bba3e1e213bb20592
+size 63318
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..9cc66af
--- /dev/null
+++ b/public/favicon.ico
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c99c57d2ac1e6686d7e42170794aa3482991124c1cfb7431e057ec45d56b008
+size 228428
diff --git a/.vitepress/theme/assets/neonephos_logo.svg b/public/neonephos_logo.svg
similarity index 100%
rename from .vitepress/theme/assets/neonephos_logo.svg
rename to public/neonephos_logo.svg
diff --git a/public/pm_logo.png b/public/pm_logo.png
new file mode 100644
index 0000000..b63cb11
--- /dev/null
+++ b/public/pm_logo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f3d32fb764f0de82bca822a76cd05973b51de4f35a4024675b47ae0f8cec34e
+size 970232
diff --git a/.vitepress/theme/assets/pm_logo.svg b/public/pm_logo.svg
similarity index 100%
rename from .vitepress/theme/assets/pm_logo.svg
rename to public/pm_logo.svg