diff --git a/docs/_static/css/my_theme.css b/docs/_static/css/my_theme.css
index be100190b..ccd7d2060 100644
--- a/docs/_static/css/my_theme.css
+++ b/docs/_static/css/my_theme.css
@@ -12,3 +12,7 @@
 .wy-side-nav-search {
     background-color: transparent !important;
 }
+
+.hide-title h1 {
+    display: none;
+}
diff --git a/docs/resources/llama-stack-spec.html b/docs/_static/llama-stack-spec.html
similarity index 100%
rename from docs/resources/llama-stack-spec.html
rename to docs/_static/llama-stack-spec.html
diff --git a/docs/resources/llama-stack-spec.yaml b/docs/_static/llama-stack-spec.yaml
similarity index 100%
rename from docs/resources/llama-stack-spec.yaml
rename to docs/_static/llama-stack-spec.yaml
diff --git a/docs/openapi_generator/run_openapi_generator.sh b/docs/openapi_generator/run_openapi_generator.sh
index cb64d103b..b9655bbbc 100755
--- a/docs/openapi_generator/run_openapi_generator.sh
+++ b/docs/openapi_generator/run_openapi_generator.sh
@@ -29,4 +29,5 @@ fi
 
 stack_dir=$(dirname $(dirname $THIS_DIR))
 models_dir=$(dirname $stack_dir)/llama-models
-PYTHONPATH=$PYTHONPATH:$stack_dir:$models_dir python -m docs.openapi_generator.generate $(dirname $THIS_DIR)/resources
+PYTHONPATH=$PYTHONPATH:$stack_dir:$models_dir \
+  python -m docs.openapi_generator.generate $(dirname $THIS_DIR)/_static
diff --git a/docs/source/concepts/index.md b/docs/source/concepts/index.md
index 834b7d7cd..1437ec623 100644
--- a/docs/source/concepts/index.md
+++ b/docs/source/concepts/index.md
@@ -62,10 +62,3 @@ While there is a lot of flexibility to mix-and-match providers, often users will
 
 
 **On-device Distro**: Finally, you may want to run Llama Stack directly on an edge device (mobile phone or a tablet.) We provide Distros for iOS and Android (coming soon.)
-
-```{toctree}
-:maxdepth: 1
-:hidden:
-
-distributions/index
-```
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 140c83270..193d661fd 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -68,6 +68,7 @@ myst_substitutions = {
     "docker_hub": "https://hub.docker.com/repository/docker/llamastack",
 }
 
+suppress_warnings = ['myst.header']
 
 # Copy button settings
 copybutton_prompt_text = "$ "  # for bash prompts
@@ -94,22 +95,6 @@ html_static_path = ["../_static"]
 # html_logo = "../_static/llama-stack-logo.png"
 html_style = "../_static/css/my_theme.css"
 
-redoc = [
-    {
-        "name": "Llama Stack API",
-        "page": "references/api_reference/index",
-        "spec": "../resources/llama-stack-spec.yaml",
-        "opts": {
-            "suppress-warnings": True,
-            # "expand-responses": ["200", "201"],
-        },
-        "embed": True,
-    },
-]
-
-redoc_uri = "https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"
-
-
 def setup(app):
     def dockerhub_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
         url = f"https://hub.docker.com/r/llamastack/{text}"
diff --git a/docs/source/distributions/selection.md b/docs/source/distributions/selection.md
index aaaf246ee..353da21d4 100644
--- a/docs/source/distributions/selection.md
+++ b/docs/source/distributions/selection.md
@@ -43,7 +43,6 @@ self_hosted_distro/nvidia
 self_hosted_distro/ollama
 self_hosted_distro/together
 self_hosted_distro/fireworks
-ondevice_distro/index
 ```
 
 ### On-Device Distributions
diff --git a/docs/source/index.md b/docs/source/index.md
index 1a9ac1adf..095f50885 100644
--- a/docs/source/index.md
+++ b/docs/source/index.md
@@ -1,3 +1,4 @@
+
 ```{admonition} News
 :class: tip
 
diff --git a/docs/source/references/api_reference/index.md b/docs/source/references/api_reference/index.md
index 679bc8e5e..f93c73ea3 100644
--- a/docs/source/references/api_reference/index.md
+++ b/docs/source/references/api_reference/index.md
@@ -1,7 +1,6 @@
+{.hide-title}
 # API Reference
 
-```{eval-rst}
-.. sphinxcontrib-redoc:: ../resources/llama-stack-spec.yaml
-   :page-title: API Reference
-   :expand-responses: all
+```{raw} html
+   :file: ../../../_static/llama-stack-spec.html
 ```
diff --git a/docs/source/references/evals_reference/index.md b/docs/source/references/evals_reference/index.md
index 896518856..86f66208a 100644
--- a/docs/source/references/evals_reference/index.md
+++ b/docs/source/references/evals_reference/index.md
@@ -12,7 +12,7 @@ This guide goes over the sets of APIs and developer experience flow of using Lla
 
 ## Evaluation Concepts
 
-The Evaluation APIs are associated with a set of Resources as shown in the following diagram. Please visit the Resources section in our [Core Concepts](../concepts/index.md) guide for better high-level understanding.
+The Evaluation APIs are associated with a set of Resources as shown in the following diagram. Please visit the Resources section in our [Core Concepts](../../concepts/index.md) guide for better high-level understanding.
 
 ![Eval Concepts](./resources/eval-concept.png)