diff --git a/content/community/faq.md b/content/community/faq.md
new file mode 100644
index 0000000..8507e86
--- /dev/null
+++ b/content/community/faq.md
@@ -0,0 +1,234 @@
+---
+title: "Frequently Asked Questions"
+description: "Common questions about Bacalhau distributed computing framework, installation, usage, and enterprise support"
+keywords: [bacalhau faq, distributed computing questions, edge computing help, bacalhau support]
+---
+
+# Frequently Asked Questions
+
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "FAQPage",
+  "mainEntity": [
+    {
+      "@type": "Question",
+      "name": "What is Bacalhau?",
+      "acceptedAnswer": {
+        "@type": "Answer",
+        "text": "Bacalhau is an open-source distributed compute orchestration framework designed to bring compute to the data, reducing latency and resource overhead by executing jobs close to data locations."
+      }
+    },
+    {
+      "@type": "Question", 
+      "name": "Who builds and maintains Bacalhau?",
+      "acceptedAnswer": {
+        "@type": "Answer",
+        "text": "Bacalhau is built and maintained by Expanso, the enterprise edge computing platform. While Bacalhau is open-source, Expanso provides commercial support, enterprise features, and managed infrastructure."
+      }
+    },
+    {
+      "@type": "Question",
+      "name": "Is Bacalhau free to use?",
+      "acceptedAnswer": {
+        "@type": "Answer", 
+        "text": "Yes, Bacalhau is completely free and open-source under the Apache 2.0 license. For enterprise users requiring additional support, SLAs, or managed infrastructure, Expanso offers commercial plans."
+      }
+    },
+    {
+      "@type": "Question",
+      "name": "How do I get started with Bacalhau?",
+      "acceptedAnswer": {
+        "@type": "Answer",
+        "text": "The fastest way to get started is with our Quick Start guide. Simply install the Bacalhau binary, start a local node with 'bacalhau serve', and submit your first job. The entire process takes just a few minutes."
+      }
+    },
+    {
+      "@type": "Question",
+      "name": "Can I run Bacalhau in production?",
+      "acceptedAnswer": {
+        "@type": "Answer",
+        "text": "Yes, Bacalhau is production-ready. For production deployments, we recommend using Expanso's enterprise platform which provides managed infrastructure, enhanced security, monitoring, and professional support with SLAs."
+      }
+    }
+  ]
+}
+</script>
+
+## General Questions
+
+### What is Bacalhau?
+
+Bacalhau is an open-source distributed compute orchestration framework designed to bring compute to the data. Instead of moving large datasets around networks, Bacalhau executes jobs close to where the data lives, dramatically reducing latency and bandwidth costs.
+
+### Who builds and maintains Bacalhau?
+
+Bacalhau is built and maintained by [**Expanso**](https://expanso.io), the enterprise edge computing platform. While Bacalhau itself is completely open-source, Expanso provides commercial support, enterprise features, managed infrastructure, and professional services for organizations running Bacalhau at scale.
+
+### Is Bacalhau free to use?
+
+Yes! Bacalhau is completely free and open-source under the Apache 2.0 license. You can use it for any purpose, including commercial applications, without licensing fees.
+
+For enterprise users who need additional support, SLAs, enhanced security features, or managed infrastructure, [Expanso offers commercial plans](https://expanso.io/contact) with enterprise-grade capabilities.
+
+### How is Bacalhau different from other compute orchestration tools?
+
+Bacalhau focuses on **bringing compute to data** rather than moving data to compute. Key differentiators:
+
+- **Data locality**: Jobs run where data already exists
+- **Single binary**: No complex multi-service deployments  
+- **Resilient**: Nodes work even with intermittent connectivity
+- **Multi-cloud**: Spans regions, clouds, and on-premises seamlessly
+- **Container-native**: Works with existing Docker workflows
+
+## Getting Started
+
+### How do I get started with Bacalhau?
+
+The fastest way is our [**Quick Start guide**](../getting-started/quick-start):
+
+1. Install: `curl -sL https://get.bacalhau.org/install.sh | bash`
+2. Start a node: `bacalhau serve --orchestrator --compute`  
+3. Submit a job: `bacalhau docker run <your-container>`
+4. Get results: `bacalhau job get <job-id>`
+
+The entire process takes just a few minutes!
+
+### What are the system requirements?
+
+**Minimum requirements:**
+- Linux, macOS, or Windows
+- 2GB RAM, 1 CPU core
+- Docker (for container execution)
+- Network connectivity (can be intermittent)
+
+**Recommended for production:**
+- 4GB+ RAM, 2+ CPU cores
+- SSD storage for better I/O performance
+- Stable network connection
+
+### Can I run multiple nodes?
+
+Yes! Bacalhau is designed for distributed networks. You can:
+
+- Add compute nodes: `bacalhau serve --compute --orchestrator <orchestrator-address>`
+- Create multi-region networks
+- Scale nodes up and down dynamically
+
+See our [**Network Setup guide**](../getting-started/network-setup) for details.
+
+## Usage & Development
+
+### What types of jobs can I run?
+
+Bacalhau supports multiple job types:
+
+- **Batch**: One-time data processing tasks
+- **Daemon**: Long-running background services  
+- **Service**: HTTP/gRPC services with load balancing
+- **Ops**: Interactive debugging and maintenance
+
+### Can I use my existing Docker containers?
+
+Yes! Bacalhau works with any Docker container. You can:
+
+- Use public images from Docker Hub
+- Deploy your own private containers
+- Run multi-container applications
+- Access GPU resources (where available)
+
+### How do I handle sensitive data?
+
+Bacalhau provides several security features:
+
+- **Local execution**: Data never leaves your infrastructure boundaries
+- **Input validation**: Cryptographic verification of data sources
+- **Network isolation**: Containers run in isolated environments
+- **Access controls**: Job submission and node access controls
+
+For enhanced enterprise security, [Expanso](https://expanso.io) provides additional features like RBAC, audit logging, and compliance certifications.
+
+### What programming languages are supported?
+
+Bacalhau is container-based, so it supports **any language** that can run in Docker:
+
+- Python, Go, Java, Node.js, R, Julia
+- Machine learning frameworks (TensorFlow, PyTorch, etc.)
+- Data processing tools (Spark, DuckDB, etc.)
+- Custom applications and scripts
+
+## Production & Enterprise
+
+### Can I run Bacalhau in production?
+
+Absolutely! Bacalhau is production-ready and used by organizations worldwide. For production deployments, consider:
+
+- **High availability**: Multi-node orchestrator setups
+- **Monitoring**: Comprehensive logging and metrics
+- **Security**: Authentication, authorization, and encryption
+- **Backup**: Job state and configuration backup strategies
+
+### What enterprise support is available?
+
+[**Expanso**](https://expanso.io) provides comprehensive enterprise support:
+
+- 🏢 **Managed Infrastructure**: Fully hosted Bacalhau clusters with 99.9% uptime SLAs
+- 🔒 **Enhanced Security**: RBAC, SSO integration, audit logging, compliance certifications  
+- 📊 **Monitoring & Dashboards**: Real-time visibility into cluster health and job performance
+- 🎯 **Professional Services**: Migration assistance, custom integrations, and training
+- 📞 **24/7 Support**: Dedicated customer success teams and technical support
+
+[**Contact Expanso**](https://expanso.io/contact) to discuss enterprise requirements.
+
+### How do I migrate from other orchestration platforms?
+
+Bacalhau's container-native approach makes migration straightforward:
+
+1. **Containerize workloads** (if not already containerized)
+2. **Convert job definitions** to Bacalhau YAML format
+3. **Test with pilot workloads** on a small cluster
+4. **Gradually migrate** production workloads
+
+Our team provides migration assistance and consulting. [Contact us](https://expanso.io/contact) for a migration assessment.
+
+## Troubleshooting
+
+### My job isn't starting. What should I check?
+
+Common issues and solutions:
+
+1. **Check node status**: `bacalhau node list`
+2. **Verify Docker**: `docker version` (must be running)  
+3. **Check logs**: `bacalhau job logs <job-id>`
+4. **Network connectivity**: Ensure nodes can reach each other
+5. **Resource availability**: Verify nodes have sufficient CPU/RAM
+
+### Where can I get help?
+
+Multiple support channels are available:
+
+- 💬 [**Slack Community**](https://bit.ly/bacalhau-project-slack) - Join #bacalhau for community help
+- 📖 [**Documentation**](/) - Comprehensive guides and references  
+- 🐛 [**GitHub Issues**](https://github.com/bacalhau-project/bacalhau/issues) - Report bugs and feature requests
+- 🏢 [**Enterprise Support**](https://expanso.io/contact) - Professional support with SLAs
+
+### How do I report bugs or request features?
+
+We welcome community contributions!
+
+- **Bug reports**: [GitHub Issues](https://github.com/bacalhau-project/bacalhau/issues)
+- **Feature requests**: [GitHub Discussions](https://github.com/bacalhau-project/bacalhau/discussions)  
+- **Code contributions**: [Contributing Guide](./ways-to-contribute)
+- **Documentation**: Help improve these docs via pull requests
+
+## Still have questions?
+
+Can't find what you're looking for? We're here to help:
+
+- 💬 **Join our [Slack community](https://bit.ly/bacalhau-project-slack)** for real-time discussions
+- 📧 **Enterprise inquiries**: [Contact Expanso](https://expanso.io/contact)  
+- 🐛 **Technical issues**: [Open a GitHub issue](https://github.com/bacalhau-project/bacalhau/issues)
+
+---
+
+*For enterprise support, managed infrastructure, and production deployments, [**contact the Expanso team →**](https://expanso.io/contact)*
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
index 4ff8de2..f4dfb0b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,7 +2,9 @@
 
 Bacalhau is an open-source distributed compute orchestration framework designed to bring compute to the data. Instead of moving large datasets around networks, Bacalhau makes it easy to execute jobs close to the data's location, drastically reducing latency and resource overhead.
 
-### Why It Matters
+**Bacalhau is built and maintained by [Expanso](https://expanso.io)**, the enterprise edge computing platform that provides production-ready infrastructure, commercial support, and enterprise features for organizations running distributed compute at scale.
+
+## Why It Matters
 
 * **Highly Distributed Architecture**: Deploy compute networks that span regions, cloud providers, and on-premises datacenters—all working together as a unified system.
 * **Resilient Operation**: Compute nodes operate effectively even with intermittent connectivity to orchestrators, maintaining service availability during network partitioning or isolation.
@@ -12,7 +14,7 @@ Bacalhau is an open-source distributed compute orchestration framework designed
 * **High Scalability**: As your data and processing needs grow, simply add more compute nodes on demand—whether on-premises or in the cloud.
 * **Ease of Integration**: Bacalhau works with existing container images (Docker, etc.), meaning you can leverage your current workflows without major rewrites.
 
-### Key Features
+## Key Features
 
 1. **Single Binary Simplicity**: Bacalhau is a single self-contained binary that functions as a client, orchestrator, and compute node—making it incredibly easy to set up and scale your distributed compute network.
 2. **Modular Architecture**: Bacalhau's design supports multiple execution engines (Docker, WebAssembly) and storage providers through clean interfaces, allowing for easy extension.
@@ -22,7 +24,7 @@ Bacalhau is an open-source distributed compute orchestration framework designed
 6. **Declarative & Imperative Submissions**: Define jobs in a YAML spec (declarative) or pass all arguments via CLI (imperative).
 7. **Publisher Support**: Output results to local volumes, S3, or other storage backends—so your artifacts are readily accessible.
 
-### Use Cases
+## Use Cases
 
 Bacalhau's distributed compute framework enables a wide range of applications across different industries:
 
@@ -37,6 +39,8 @@ Process logs efficiently at scale by running distributed jobs directly at the so
 * **Batch Jobs**: Execute on-demand in-depth analysis of historical log data
 * **Ops Jobs**: Enable real-time querying of live logs for urgent investigations
 
+📖 Learn more: [Log Processing Use Case](/use-cases/log-processing)
+
 </details>
 
 <details>
@@ -50,6 +54,8 @@ Query and analyze data across multiple regions by deploying compute tasks direct
 * Seamless scalability with dynamic node addition
 * Compliance with data regulations through region-specific processing
 
+📖 Learn more: [Distributed Data Warehousing Use Case](/use-cases/distributed-data-warehousing)
+
 </details>
 
 <details>
@@ -64,6 +70,8 @@ Efficiently manage distributed nodes across multiple environments with capabilit
 * Targeted job execution based on node attributes
 * Rapid incident response and automated recovery
 
+📖 Learn more: [Fleet Management Use Case](/use-cases/fleet-management)
+
 </details>
 
 <details>
@@ -77,6 +85,8 @@ Train and deploy ML models across a distributed compute fleet, optimizing perfor
 * Deploy inference jobs near users for low-latency predictions
 * Support federated learning for privacy-sensitive applications
 
+📖 Learn more: [Distributed Machine Learning Use Case](/use-cases/distributed-machine-learning)
+
 </details>
 
 <details>
@@ -90,11 +100,11 @@ Run compute tasks closer to the data source for applications requiring low laten
 * Distribute tasks across available edge resources dynamically
 * Ensure data privacy by keeping computations near the source
 
-</details>
-
+📖 Learn more: [Edge Computing Use Case](/use-cases/edge-computing)
 
+</details>
 
-### How It Works
+## How It Works
 
 Bacalhau's architecture enables you to create compute networks that bridge traditional infrastructure boundaries. When you submit a job, Bacalhau intelligently determines which compute nodes are best positioned to process the data based on locality, availability, and your defined constraints—without requiring data movement or constant connectivity.
 
@@ -105,9 +115,38 @@ This approach is particularly valuable for:
 * Scenarios where multiple parties need to collaborate on analysis without sharing raw data
 * Edge computing environments with intermittent connectivity
 
-### Community
+📖 **Learn more:** [Architecture Overview](/overview/architecture) | [Getting Started Guide](/getting-started/quick-start)
+
+## Enterprise & Production Support
+
+For organizations running Bacalhau in production environments, [**Expanso**](https://expanso.io) provides:
+
+* 🏢 **Enterprise Support**: Professional support, SLAs, and consulting services
+* 🔒 **Enhanced Security**: Advanced authentication, authorization, and audit capabilities  
+* 📊 **Management Tools**: Web-based dashboards, monitoring, and operational tooling
+* ☁️ **Cloud Integration**: Seamless integration with major cloud providers and enterprise systems
+* 🎯 **Custom Solutions**: Tailored implementations for specific industry requirements
+
+[**Contact Expanso →**](https://expanso.io/contact) for enterprise solutions and production support.
+
+## Community
 
 Bacalhau has a very friendly community and we are always happy to help you get started:
 
-* [Join the Slack Community](https://bit.ly/bacalhau-project-slack) Go to **#bacalhau** channel – it is the easiest way to engage with other members in the community and get help.
-* [Contributing](/community/ways-to-contribute) – learn how to contribute to the Bacalhau project.
+* 💬 [**Join the Slack Community**](https://bit.ly/bacalhau-project-slack) - Go to **#bacalhau** channel – it is the easiest way to engage with other members in the community and get help.
+* 🤝 [**Contributing**](/community/ways-to-contribute) – learn how to contribute to the Bacalhau project.
+* 🐛 [**Report Issues**](https://github.com/bacalhau-project/bacalhau/issues) – help us improve by reporting bugs and feature requests.
+* 📖 [**Documentation**](/) – comprehensive guides and API references.
+
+## Next Steps
+
+Ready to get started? Here are some great places to begin:
+
+1. 🚀 [**Quick Start Guide**](/getting-started/quick-start) - Get Bacalhau running in minutes
+2. 📚 [**Architecture Overview**](/overview/architecture) - Understand how Bacalhau works
+3. 🛠️ [**CLI Reference**](/cli) - Complete command-line interface documentation  
+4. 💡 [**Use Cases**](/use-cases/log-processing) - See real-world applications and examples
+
+---
+
+*Bacalhau is an open-source project maintained by [Expanso](https://expanso.io). For enterprise support and production deployments, [contact our team](https://expanso.io/contact).*
\ No newline at end of file
diff --git a/docs/getting-started/quick-start.mdx b/docs/getting-started/quick-start.mdx
index 27cc694..af1a91e 100644
--- a/docs/getting-started/quick-start.mdx
+++ b/docs/getting-started/quick-start.mdx
@@ -1,5 +1,7 @@
 ---
 sidebar_position: 10
+description: Get started with Bacalhau in minutes - install, run your first distributed compute job, and see results
+keywords: [bacalhau quickstart, distributed computing, edge computing, docker, getting started]
 ---
 import Tabs from '@theme/Tabs'
 import TabItem from '@theme/TabItem'
@@ -8,10 +10,21 @@ import TabItem from '@theme/TabItem'
 
 This Quick Start guide shows how to run your first Bacalhau job with minimal setup. Bacalhau's design as a single self-contained binary makes it incredibly easy to set up your own distributed compute network in minutes.
 
+By the end of this guide, you'll have:
+- ✅ Installed Bacalhau locally
+- ✅ Started your own compute network
+- ✅ Submitted and run a data processing job
+- ✅ Retrieved and viewed the results
+
 ## Prerequisites
 
-- Docker installed on any machine that runs a compute node
-- Bacalhau CLI installed (see below)
+- **Docker** installed on any machine that runs a compute node
+- **Bacalhau CLI** installed (see below)
+- **Basic terminal knowledge** for running commands
+
+:::tip Production Deployment
+For production environments, enterprise support, and advanced features, [**Expanso**](https://expanso.io) provides managed Bacalhau infrastructure with enterprise-grade security, monitoring, and support. [Contact our team](https://expanso.io/contact) to learn more.
+:::
 
 ## 1. Installation
 
@@ -27,6 +40,8 @@ curl -sL https://get.bacalhau.org/install.sh | bash
 bacalhau version
 ```
 
+You should see output showing the Bacalhau version and build information.
+
 ## 2. Start a Hybrid Node
 
 Open a terminal and run:
@@ -35,15 +50,22 @@ Open a terminal and run:
 bacalhau serve --orchestrator --compute
 ```
 
-- This command launches both an orchestrator and a compute node in one process
-- Keep it running; you'll see logs indicating it's ready
+**What this does:**
+- Launches both an orchestrator and a compute node in one process
+- Creates a complete Bacalhau network on your local machine
+- Starts listening for jobs to process
+
+Keep this terminal open and running. You'll see logs indicating the node is ready to accept jobs.
 
 ## 3. Submit a Data Analysis Job
 
-Bacalhau supports two primary methods of job submission: Imperative (CLI) and Declarative (YAML). We'll demonstrate a word count job on the classic novel Moby Dick.
+Bacalhau supports two primary methods of job submission: **Imperative (CLI)** and **Declarative (YAML)**. We'll demonstrate a word count analysis job on the classic novel Moby Dick.
 
 <Tabs groupId="job-submission">
 <TabItem value="Imperative (CLI)" label="Imperative (CLI)">
+
+Run this single command to submit your job:
+
 ```bash
 bacalhau docker run \
   --input https://www.gutenberg.org/files/2701/2701-0.txt:/data/moby-dick.txt \
@@ -51,9 +73,16 @@ bacalhau docker run \
   --publisher local \
   ghcr.io/bacalhau-project/word-count:latest -- --output-file /outputs/moby-dick-counts.txt /data/moby-dick.txt
 ```
+
+**What this does:**
+- Downloads Moby Dick text from Project Gutenberg
+- Runs a word count analysis using a containerized tool
+- Saves results to a local directory
+
 </TabItem>
 
 <TabItem value="Declarative (YAML)" label="Declarative (YAML)">
+
 Create a `word-count.yaml` file:
 
 ```yaml
@@ -89,43 +118,111 @@ Then run the job using:
 bacalhau job run word-count.yaml
 ```
 
+**Benefits of YAML approach:**
+- Version controllable job definitions
+- Easier to share and reproduce
+- Better for complex job configurations
+
 </TabItem>
 </Tabs>
 
-- The job downloads a sample dataset and processes it locally
-- Bacalhau will display job progress until completion
-- You'll receive a Job ID once the job is submitted
+After submission, Bacalhau will:
+1. Display job progress as it processes
+2. Print a **Job ID** (save this for the next steps)
+3. Show completion status
 
-## 4. Inspect the Job
+## 4. Monitor the Job
+
+Check your job's status and details:
 
 ```bash
+# Get detailed job information
 bacalhau job describe <jobID>
+
+# View execution logs
+bacalhau job logs <jobID>
+
+# List all your jobs
+bacalhau job list
 ```
 
-- Replace `<jobID>` with the actual ID printed in step 2
-- You can run `bacalhau job logs <job-id>` to just get the execution logs
+Replace `<jobID>` with the actual ID printed in step 3.
 
 ## 5. Retrieve Results
 
-Download and view your job results:
+Download and examine your job results:
 
 ```bash
-# Download the results
+# Download the results to your local machine
 bacalhau job get <jobID>
 
-# View the analysis output
+# View the word frequency analysis
 head job-*/outputs/moby-dick-counts.txt
 ```
 
-:::note
-You should see a word frequency analysis of the Moby Dick text file!
+:::success Congratulations! 
+You should see a word frequency analysis showing the most common words from Moby Dick, like:
+
+```
+the: 14620
+of: 6732
+and: 6502
+a: 4799
+to: 4707
+```
 :::
 
-## 🎉 Success!
+## What Just Happened?
 
-You've just:
+You've successfully:
+
+1. ✅ **Started a local Bacalhau network** - Your machine became both an orchestrator and compute node
+2. ✅ **Submitted a distributed job** - The word count analysis ran in an isolated Docker container
+3. ✅ **Processed remote data** - Bacalhau downloaded and processed the text file automatically
+4. ✅ **Retrieved structured results** - The output was saved and made available for download
+
+## Next Steps
+
+Now that you have Bacalhau working, explore these advanced topics:
+
+### 🚀 **Scale Your Network**
+- [**Add more compute nodes**](/getting-started/network-setup) to create a true distributed system
+- [**Connect remote nodes**](/getting-started/network-setup) across different machines or regions
+
+### 📚 **Learn Core Concepts**
+- [**Architecture Overview**](/overview/architecture) - Understand how Bacalhau orchestrates compute
+- [**Job Types & Execution**](/guides/) - Explore batch, daemon, service, and ops jobs
+
+### 🛠️ **Advanced Usage**
+- [**CLI Reference**](/cli/) - Complete command documentation
+- [**API Documentation**](/api/) - Programmatic job submission
+- [**Use Cases**](/use-cases/log-processing) - Real-world applications and patterns
+
+### 🏢 **Production Deployment**
+
+For production environments, [**Expanso**](https://expanso.io) provides:
+
+- **Managed Infrastructure**: Fully managed Bacalhau clusters with high availability
+- **Enterprise Security**: Advanced authentication, RBAC, and audit logging
+- **Professional Support**: SLAs, consulting, and dedicated customer success
+- **Cloud Integration**: Seamless deployment across AWS, Azure, GCP, and on-premises
+
+[**Schedule a demo →**](https://expanso.io/contact) or [**learn more about enterprise features →**](https://expanso.io)
+
+## Troubleshooting
+
+**Job not starting?**
+- Ensure Docker is running: `docker version`
+- Check node status: `bacalhau node list`
+
+**Network issues?**
+- Verify firewall settings allow Bacalhau communication
+- Check the [network setup guide](/getting-started/network-setup)
+
+**Need help?** 
+- Join our [Slack community](https://bit.ly/bacalhau-project-slack)  
+- [Report issues](https://github.com/bacalhau-project/bacalhau/issues) on GitHub
+
+---
 
-1. Started a local Bacalhau network
-2. Submitted a job using both imperative and declarative methods
-3. Tracked job progress with detailed descriptions
-4. Retrieved and viewed job results
+*Ready for production? [**Contact Expanso**](https://expanso.io/contact) for enterprise support, managed infrastructure, and professional services.*
\ No newline at end of file
diff --git a/docusaurus.config.ts b/docusaurus.config.ts
index 9215d07..011576f 100644
--- a/docusaurus.config.ts
+++ b/docusaurus.config.ts
@@ -1,20 +1,21 @@
 import { themes as prismThemes } from 'prism-react-renderer'
 import type { Config } from '@docusaurus/types'
 import type * as Preset from '@docusaurus/preset-classic'
-import { redirects, createRedirects } from './redirects' // Add this line
+import { redirects, createRedirects } from './redirects'
 
 const config: Config = {
-  title: 'Bacalhau',
-  tagline: 'Distributed Compute Over Data',
+  title: 'Bacalhau Documentation',
+  tagline: 'Distributed compute orchestration - bringing compute to the data',
   favicon: 'img/favicon.png',
 
+  // Correct URL where docs are actually hosted
   url: 'https://bacalhau.org',
-  baseUrl: '/',
+  baseUrl: '/docs/',
   trailingSlash: false,
 
   // GitHub pages deployment config.
-  organizationName: 'bacalhau-project', // Usually your GitHub org/user name.
-  projectName: 'docs', // Usually your repo name.
+  organizationName: 'bacalhau-project',
+  projectName: 'docs',
 
   onBrokenLinks: 'throw',
   onBrokenMarkdownLinks: 'throw',
@@ -41,7 +42,7 @@ const config: Config = {
       {
         id: 'useCases',
         path: 'content/use-cases',
-        routeBasePath: '/',
+        routeBasePath: '/use-cases',
         sidebarPath: require.resolve('./sidebarsUseCases.ts'),
       },
     ],
@@ -54,6 +55,15 @@ const config: Config = {
         sidebarPath: require.resolve('./sidebarsCommunity.ts'),
       },
     ],
+    [
+      '@docusaurus/plugin-sitemap',
+      {
+        changefreq: 'weekly',
+        priority: 0.5,
+        ignorePatterns: ['/docs/tags/**'],
+        filename: 'sitemap.xml',
+      },
+    ],
   ],
 
   presets: [
@@ -62,10 +72,13 @@ const config: Config = {
       {
         docs: {
           path: 'docs',
-          routeBasePath: 'docs',
+          routeBasePath: '/',
           sidebarPath: require.resolve('./sidebarsDocs.ts'),
           editUrl: 'https://github.com/bacalhau-project/docs/tree/main/',
           showLastUpdateTime: true,
+          // Add schema markup for articles
+          remarkPlugins: [],
+          rehypePlugins: [],
         },
         theme: {
           customCss: './src/css/custom.css',
@@ -73,6 +86,13 @@ const config: Config = {
         googleTagManager: {
           containerId: 'GTM-M4ZC5QX7',
         },
+        // Ensure sitemap generation
+        sitemap: {
+          changefreq: 'weekly',
+          priority: 0.5,
+          ignorePatterns: ['/tags/**'],
+          filename: 'sitemap.xml',
+        },
       } satisfies Preset.Options,
     ],
   ],
@@ -100,6 +120,31 @@ const config: Config = {
         href: 'https://fonts.googleapis.com/css2?family=Nunito:wght@400;500;600;700;800;900&family=Nunito+Sans:wght@400;500;600;700;800;900&display=swap',
       },
     },
+    // Add JSON-LD structured data for organization
+    {
+      tagName: 'script',
+      attributes: {
+        type: 'application/ld+json',
+      },
+      innerHTML: JSON.stringify({
+        '@context': 'https://schema.org',
+        '@type': 'Organization',
+        name: 'Bacalhau Project',
+        url: 'https://bacalhau.org',
+        logo: 'https://bacalhau.org/img/logos/logo.svg',
+        description: 'Open-source distributed compute orchestration framework',
+        founder: {
+          '@type': 'Organization',
+          name: 'Expanso',
+          url: 'https://expanso.io'
+        },
+        parentOrganization: {
+          '@type': 'Organization',
+          name: 'Expanso',
+          url: 'https://expanso.io'
+        }
+      }),
+    },
   ],
 
   themeConfig: {
@@ -108,7 +153,6 @@ const config: Config = {
       disableSwitch: true,
       respectPrefersColorScheme: false,
     },
-    // Replace with your project's social card
     image: 'img/bacalhau-social.png',
     algolia: {
       appId: 'K2MK84JXCM',
@@ -116,7 +160,7 @@ const config: Config = {
       indexName: 'bacalhau',
       searchPagePath: 'search',
       insights: true,
-      placeholder: 'Search Bacalhau...'
+      placeholder: 'Search Bacalhau Docs...'
     },
     navbar: {
       title: 'Bacalhau',
@@ -164,7 +208,7 @@ const config: Config = {
           position: 'right',
         },
         {
-          href: 'https://expanso.io/?_gl=1*sdzh2w*_gcl_au*ODM0MTE4NTkyLjE3NDIyOTQ5MDQ.*_ga*ODgxNjg0Mjg3LjE3NDIyOTQ5MDQ.*_ga_X1RJ0QGN3Z*czE3NDY1OTkyNDkkbzI5JGcxJHQxNzQ2NjAzMzIxJGoxMCRsMCRoMA..',
+          href: 'https://expanso.io',
           label: 'Enterprise',
           position: 'right',
         },
@@ -183,15 +227,15 @@ const config: Config = {
           items: [
             {
               label: 'What is Bacalhau?',
-              to: '/docs/',
+              to: '/',
             },
             {
               label: 'Architecture',
-              to: '/docs/overview/architecture',
+              to: '/overview/architecture',
             },
             {
               label: 'Quick Start',
-              to: '/docs/getting-started/quick-start',
+              to: '/getting-started/quick-start',
             },
           ],
         },
@@ -200,24 +244,23 @@ const config: Config = {
           items: [
             {
               label: 'Log Processing',
-              to: 'use-cases/log-processing',
+              to: '/use-cases/log-processing',
             },
             {
               label: 'Distributed Data Warehousing',
-              to: 'use-cases/distributed-data-warehousing',
+              to: '/use-cases/distributed-data-warehousing',
             },
-
             {
               label: 'Distributed Machine Learning',
-              to: 'use-cases/distributed-machine-learning',
+              to: '/use-cases/distributed-machine-learning',
             },
             {
               label: 'Edge Computing',
-              to: 'use-cases/edge-computing',
+              to: '/use-cases/edge-computing',
             },
             {
               label: 'Fleet Management',
-              to: 'use-cases/fleet-management',
+              to: '/use-cases/fleet-management',
             },
           ],
         },
@@ -253,16 +296,28 @@ const config: Config = {
               label: 'Enterprise Support',
               href: 'https://expanso.io/contact',
             },
+            {
+              label: 'About Expanso',
+              href: 'https://expanso.io/about',
+            },
           ],
         },
       ],
-      copyright: `Copyright © ${new Date().getFullYear()} Bacalhau Project.`,
+      copyright: `
+        <div style="margin-top: 1rem;">
+          <p>Copyright © ${new Date().getFullYear()} Bacalhau Project.</p>
+          <p style="margin-top: 0.5rem; font-size: 0.875em; opacity: 0.8;">
+            Bacalhau is built and maintained by <a href="https://expanso.io" target="_blank" rel="noopener noreferrer" style="color: #4f46e5; text-decoration: none;">Expanso</a>, 
+            the enterprise edge computing platform.
+          </p>
+        </div>
+      `,
     },
 
     prism: {
-      additionalLanguages: ['bash'],
+      additionalLanguages: ['bash', 'yaml', 'json', 'python', 'go'],
     },
   } satisfies Preset.ThemeConfig,
 }
 
-export default config
+export default config
\ No newline at end of file
diff --git a/static/robots.txt b/static/robots.txt
index d49aac3..553b8df 100644
--- a/static/robots.txt
+++ b/static/robots.txt
@@ -1,11 +1,20 @@
 # Bacalhau Documentation
-# https://bacalhau.org
+# https://bacalhau.org/docs
 
 User-agent: *
 Allow: /
 
+# Crawl delay for respectful bot behavior
+Crawl-delay: 1
+
 # LLM-friendly content for AI systems
 # See https://llmstxt.org/ for specification
-LLMs-Txt: https://bacalhau.org/llms.txt
+LLMs-Txt: https://bacalhau.org/docs/llms.txt
+
+# Main sitemap (includes all docs, use cases, community pages)
+Sitemap: https://bacalhau.org/docs/sitemap.xml
 
-Sitemap: https://bacalhau.org/sitemap.xml
+# Block old URL patterns if they exist
+Disallow: /docs/v*
+Disallow: /*/_*
+Disallow: /search*
\ No newline at end of file