diff --git a/docs/llama-stack-spec.html b/docs/llama-stack-spec.html
index d3f6f593b..a7ab57343 100644
--- a/docs/llama-stack-spec.html
+++ b/docs/llama-stack-spec.html
@@ -21,7 +21,7 @@
     "info": {
         "title": "[DRAFT] Llama Stack Specification",
         "version": "0.0.1",
-        "description": "This is the specification of the llama stack that provides\n                a set of endpoints and their corresponding interfaces that are tailored to\n                best leverage Llama Models. The specification is still in draft and subject to change.\n                Generated at 2024-09-17 12:55:45.538053"
+        "description": "This is the specification of the llama stack that provides\n                a set of endpoints and their corresponding interfaces that are tailored to\n                best leverage Llama Models. The specification is still in draft and subject to change.\n                Generated at 2024-09-18 19:27:39.955190"
     },
     "servers": [
         {
@@ -2587,6 +2587,9 @@
                         "type": "string",
                         "const": "brave_search"
                     },
+                    "api_key": {
+                        "type": "string"
+                    },
                     "engine": {
                         "type": "string",
                         "enum": [
@@ -2601,6 +2604,7 @@
                 "additionalProperties": false,
                 "required": [
                     "type",
+                    "api_key",
                     "engine"
                 ]
             },
@@ -2663,13 +2667,17 @@
                         "type": "string",
                         "const": "wolfram_alpha"
                     },
+                    "api_key": {
+                        "type": "string"
+                    },
                     "remote_execution": {
                         "$ref": "#/components/schemas/RestAPIExecutionConfig"
                     }
                 },
                 "additionalProperties": false,
                 "required": [
-                    "type"
+                    "type",
+                    "api_key"
                 ]
             },
             "CreateAgentRequest": {
@@ -5141,25 +5149,7 @@
     ],
     "tags": [
         {
-            "name": "Agents"
-        },
-        {
-            "name": "Safety"
-        },
-        {
-            "name": "SyntheticDataGeneration"
-        },
-        {
-            "name": "Telemetry"
-        },
-        {
-            "name": "Datasets"
-        },
-        {
-            "name": "RewardScoring"
-        },
-        {
-            "name": "Evaluations"
+            "name": "BatchInference"
         },
         {
             "name": "PostTraining"
@@ -5168,11 +5158,29 @@
             "name": "Inference"
         },
         {
-            "name": "BatchInference"
+            "name": "Safety"
+        },
+        {
+            "name": "RewardScoring"
+        },
+        {
+            "name": "Telemetry"
+        },
+        {
+            "name": "Evaluations"
+        },
+        {
+            "name": "SyntheticDataGeneration"
         },
         {
             "name": "Memory"
         },
+        {
+            "name": "Agents"
+        },
+        {
+            "name": "Datasets"
+        },
         {
             "name": "BuiltinTool",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/BuiltinTool\" />"
diff --git a/docs/llama-stack-spec.yaml b/docs/llama-stack-spec.yaml
index e96142b00..33d7d9a3a 100644
--- a/docs/llama-stack-spec.yaml
+++ b/docs/llama-stack-spec.yaml
@@ -1651,6 +1651,8 @@ components:
     SearchToolDefinition:
       additionalProperties: false
       properties:
+        api_key:
+          type: string
         engine:
           enum:
           - bing
@@ -1671,6 +1673,7 @@ components:
           type: string
       required:
       - type
+      - api_key
       - engine
       type: object
     Session:
@@ -2336,6 +2339,8 @@ components:
     WolframAlphaToolDefinition:
       additionalProperties: false
       properties:
+        api_key:
+          type: string
         input_shields:
           items:
             $ref: '#/components/schemas/ShieldDefinition'
@@ -2351,12 +2356,13 @@ components:
           type: string
       required:
       - type
+      - api_key
       type: object
 info:
   description: "This is the specification of the llama stack that provides\n     \
     \           a set of endpoints and their corresponding interfaces that are tailored\
     \ to\n                best leverage Llama Models. The specification is still in\
-    \ draft and subject to change.\n                Generated at 2024-09-17 12:55:45.538053"
+    \ draft and subject to change.\n                Generated at 2024-09-18 19:27:39.955190"
   title: '[DRAFT] Llama Stack Specification'
   version: 0.0.1
 jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema
@@ -3144,17 +3150,17 @@ security:
 servers:
 - url: http://any-hosted-llama-stack.com
 tags:
-- name: Agents
-- name: Safety
-- name: SyntheticDataGeneration
-- name: Telemetry
-- name: Datasets
-- name: RewardScoring
-- name: Evaluations
+- name: BatchInference
 - name: PostTraining
 - name: Inference
-- name: BatchInference
+- name: Safety
+- name: RewardScoring
+- name: Telemetry
+- name: Evaluations
+- name: SyntheticDataGeneration
 - name: Memory
+- name: Agents
+- name: Datasets
 - description: <SchemaDefinition schemaRef="#/components/schemas/BuiltinTool" />
   name: BuiltinTool
 - description: <SchemaDefinition schemaRef="#/components/schemas/CompletionMessage"
diff --git a/docs/openapi_generator/run_openapi_generator.sh b/docs/openapi_generator/run_openapi_generator.sh
index 1b2f979cc..ec95948d7 100755
--- a/docs/openapi_generator/run_openapi_generator.sh
+++ b/docs/openapi_generator/run_openapi_generator.sh
@@ -28,4 +28,4 @@ if [ ${#missing_packages[@]} -ne 0 ]; then
     exit 1
 fi
 
-PYTHONPATH=$PYTHONPATH:../.. python -m rfcs.openapi_generator.generate $*
+PYTHONPATH=$PYTHONPATH:../.. python -m docs.openapi_generator.generate $*