diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index 18f43a7..8389661 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -14,13 +14,21 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
           cache: 'pip'
-      - run: pip install -r docs/requirements.txt
-      - name: Deploy Documentation
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r docs/requirements.txt
+      - name: Configure Git
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          mkdocs gh-deploy --force 
\ No newline at end of file
+      - name: Build and Deploy
+        run: |
+          mkdocs build --strict
+          mkdocs gh-deploy --force --clean 
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 6c94bf6..28324d1 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,11 +1,23 @@
-site_name: Project Documentation
+site_name: MCP Server for Home Assistant
 site_url: https://jango-blockchained.github.io/advanced-homeassistant-mcp
 repo_url: https://github.com/jango-blockchained/advanced-homeassistant-mcp
+site_description: Home Assistant MCP Server Documentation
+# Add this to handle GitHub Pages serving from a subdirectory
+site_dir: site/advanced-homeassistant-mcp
 
 theme:
   name: material
   logo: assets/images/logo.png
   favicon: assets/images/favicon.ico
+  features:
+    - navigation.instant
+    - navigation.tracking
+    - navigation.sections
+    - navigation.expand
+    - navigation.top
+    - search.suggest
+    - search.highlight
+    - content.code.copy
   palette:
     - scheme: default
       primary: indigo
@@ -19,18 +31,6 @@ theme:
       toggle:
         icon: material/brightness-4
         name: Switch to light mode
-  features:
-    - navigation.instant
-    - navigation.tracking
-    - navigation.sections
-    - navigation.expand
-    - navigation.top
-    - search.suggest
-    - search.highlight
-    - content.code.copy
-    - content.tabs.link
-    - content.tooltips
-    - toc.integrate
 
 markdown_extensions:
   - pymdownx.highlight:
@@ -61,8 +61,10 @@ plugins:
 
 nav:
   - Home: index.md
-  - Getting Started: getting-started.md
-  - API Reference: api.md
+  - Getting Started:
+    - Installation: getting-started/installation.md
+    - Quick Start: getting-started/quickstart.md
+  - API Reference: api/index.md
   - Usage: usage.md
   - Configuration:
     - Claude Desktop Config: claude_desktop_config.md