diff --git a/docs/_static/llama-stack-spec.html b/docs/_static/llama-stack-spec.html
index 151ac1451..84e20f360 100644
--- a/docs/_static/llama-stack-spec.html
+++ b/docs/_static/llama-stack-spec.html
@@ -728,7 +728,7 @@
                 ]
             }
         },
-        "/v1/eval-tasks/{eval_task_id}": {
+        "/v1/eval/tasks/{task_id}": {
             "get": {
                 "responses": {
                     "200": {
@@ -756,7 +756,7 @@
                 "parameters": [
                     {
                         "name": "eval_task_id",
-                        "in": "path",
+                        "in": "query",
                         "required": true,
                         "schema": {
                             "type": "string"
@@ -1503,7 +1503,7 @@
                 }
             }
         },
-        "/v1/eval-tasks": {
+        "/v1/eval/tasks/": {
             "get": {
                 "responses": {
                     "200": {
@@ -1522,28 +1522,6 @@
                 ],
                 "description": "",
                 "parameters": []
-            },
-            "post": {
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "tags": [
-                    "EvalTasks"
-                ],
-                "description": "",
-                "parameters": [],
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/RegisterEvalTaskRequest"
-                            }
-                        }
-                    },
-                    "required": true
-                }
             }
         },
         "/v1/models": {
@@ -2121,6 +2099,30 @@
                 ]
             }
         },
+        "/v1/eval/tasks": {
+            "post": {
+                "responses": {
+                    "200": {
+                        "description": "OK"
+                    }
+                },
+                "tags": [
+                    "EvalTasks"
+                ],
+                "description": "",
+                "parameters": [],
+                "requestBody": {
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/RegisterEvalTaskRequest"
+                            }
+                        }
+                    },
+                    "required": true
+                }
+            }
+        },
         "/v1/eval/tasks/{task_id}/jobs": {
             "post": {
                 "responses": {
diff --git a/docs/_static/llama-stack-spec.yaml b/docs/_static/llama-stack-spec.yaml
index 37fba4541..700a3071c 100644
--- a/docs/_static/llama-stack-spec.yaml
+++ b/docs/_static/llama-stack-spec.yaml
@@ -440,7 +440,7 @@ paths:
           required: true
           schema:
             type: string
-  /v1/eval-tasks/{eval_task_id}:
+  /v1/eval/tasks/{task_id}:
     get:
       responses:
         '200':
@@ -456,7 +456,7 @@ paths:
       description: ''
       parameters:
         - name: eval_task_id
-          in: path
+          in: query
           required: true
           schema:
             type: string
@@ -895,7 +895,7 @@ paths:
             schema:
               $ref: '#/components/schemas/RegisterDatasetRequest'
         required: true
-  /v1/eval-tasks:
+  /v1/eval/tasks/:
     get:
       responses:
         '200':
@@ -908,20 +908,6 @@ paths:
         - EvalTasks
       description: ''
       parameters: []
-    post:
-      responses:
-        '200':
-          description: OK
-      tags:
-        - EvalTasks
-      description: ''
-      parameters: []
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterEvalTaskRequest'
-        required: true
   /v1/models:
     get:
       responses:
@@ -1278,6 +1264,21 @@ paths:
             type: array
             items:
               type: string
+  /v1/eval/tasks:
+    post:
+      responses:
+        '200':
+          description: OK
+      tags:
+        - EvalTasks
+      description: ''
+      parameters: []
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterEvalTaskRequest'
+        required: true
   /v1/eval/tasks/{task_id}/jobs:
     post:
       responses:
diff --git a/llama_stack/apis/eval_tasks/eval_tasks.py b/llama_stack/apis/eval_tasks/eval_tasks.py
index a0a533055..3600589d1 100644
--- a/llama_stack/apis/eval_tasks/eval_tasks.py
+++ b/llama_stack/apis/eval_tasks/eval_tasks.py
@@ -45,16 +45,16 @@ class ListEvalTasksResponse(BaseModel):
 
 @runtime_checkable
 class EvalTasks(Protocol):
-    @webmethod(route="/eval-tasks", method="GET")
+    @webmethod(route="/eval/tasks/", method="GET")
     async def list_eval_tasks(self) -> ListEvalTasksResponse: ...
 
-    @webmethod(route="/eval-tasks/{eval_task_id}", method="GET")
+    @webmethod(route="/eval/tasks/{task_id}", method="GET")
     async def get_eval_task(
         self,
         eval_task_id: str,
     ) -> Optional[EvalTask]: ...
 
-    @webmethod(route="/eval-tasks", method="POST")
+    @webmethod(route="/eval/tasks", method="POST")
     async def register_eval_task(
         self,
         eval_task_id: str,