diff --git a/.github/workflows/ux-pages.yml b/.github/workflows/ux-pages.yml
new file mode 100644
index 000000000..8dcbb2c43
--- /dev/null
+++ b/.github/workflows/ux-pages.yml
@@ -0,0 +1,55 @@
+name: Deploy UX to GitHub Pages
+on:
+  # TODO: Restore the push trigger after prod. Runs on pushes targeting the default branch
+  #push:
+  # branches: ["features/ux"]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
+permissions:
+    contents: read
+    pages: write
+    id-token: write
+  
+
+# Allow one concurrent deployment
+concurrency:
+    group: 'pages'
+    cancel-in-progress: true
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
+      - name: Install dependencies
+        run: npm ci
+        working-directory: ./src/web
+      - name: Clean and Build
+        run: |
+          rm -rf ./dist || true
+          NODE_ENV=production npm run build
+        working-directory: ./src/web
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: List build output
+        run: ls -la ./src/web/dist
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload dist folder
+          path: './src/web/dist'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
\ No newline at end of file
diff --git a/src/web/components/Showcase/ShowcaseBackground.png b/src/web/components/Showcase/ShowcaseBackground.png
new file mode 100644
index 000000000..fef18c474
Binary files /dev/null and b/src/web/components/Showcase/ShowcaseBackground.png differ
diff --git a/src/web/components/__tests__/SideBar.test.tsx b/src/web/components/__tests__/SideBar.test.tsx
index 4fd145a62..f9a80b4c5 100644
--- a/src/web/components/__tests__/SideBar.test.tsx
+++ b/src/web/components/__tests__/SideBar.test.tsx
@@ -1,3 +1,4 @@
+import '@testing-library/jest-dom';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { BrowserRouter } from 'react-router-dom';
 import SideBar from '../SideBar/SideBar';
diff --git a/src/web/pages/App.tsx b/src/web/pages/App.tsx
index 6fbf38f5b..231ca2ba4 100644
--- a/src/web/pages/App.tsx
+++ b/src/web/pages/App.tsx
@@ -18,7 +18,7 @@ import {HomePage} from '../pages/HomePage';
 function App() {
   return (
     <FluentUIProvider>
-      <Router>
+    <Router basename={window.location.hostname === 'localhost' ? '/' : '/finops-toolkit'}>
         <Routes>
           <Route path="/" element={<HomePage />} />
           <Route path="/bicep-registry" element={<BicepRegistryModulesPage />} />
diff --git a/src/web/tsconfig.app.tsbuildinfo b/src/web/tsconfig.app.tsbuildinfo
new file mode 100644
index 000000000..1d9419fd2
--- /dev/null
+++ b/src/web/tsconfig.app.tsbuildinfo
@@ -0,0 +1 @@
+{"root":["./pages/App.tsx","./pages/AzureOptimizationEnginePage.tsx","./pages/BicepRegistryModulesPage.tsx","./pages/CostOptimizationWorkbookPage.tsx","./pages/FinOpsHubsPage.tsx","./pages/FinOpsWorkbooksPage.tsx","./pages/GovernanceWorkbookPage.tsx","./pages/HomePage.tsx","./pages/OpenDataPage.tsx","./pages/PowerBIReportsPage.tsx","./pages/PowerShellModulePage.tsx","./pages/ToolsLandingPage.tsx","./pages/main.tsx","./pages/__tests__/App.test.tsx","./pages/__tests__/HomePage.test.tsx","./components/__tests__/SideBar.test.tsx"],"version":"5.7.2"}
\ No newline at end of file
diff --git a/src/web/tsconfig.node.tsbuildinfo b/src/web/tsconfig.node.tsbuildinfo
new file mode 100644
index 000000000..1e7ed2791
--- /dev/null
+++ b/src/web/tsconfig.node.tsbuildinfo
@@ -0,0 +1 @@
+{"root":["./vite.config.ts"],"version":"5.7.2"}
\ No newline at end of file
diff --git a/src/web/vite.config.ts b/src/web/vite.config.ts
index 5a33944a9..6942afcab 100644
--- a/src/web/vite.config.ts
+++ b/src/web/vite.config.ts
@@ -3,5 +3,6 @@ import react from '@vitejs/plugin-react'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [react()],
+    plugins: [react()],
+    base: process.env.NODE_ENV === 'production' ? '/finops-toolkit/' : '/'
 })