diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6cee833..f291cd4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Added ability to pass `InlineScript` as a simple string ([#605](https://github.com/opensearch-project/opensearch-api-specification/pull/605))
 - Added `config_id` and `config_id_list` to `/_plugins/_notifications/configs` query parameters ([#594](https://github.com/opensearch-project/opensearch-api-specification/pull/594))
 - Added a release workflow triggered on a tag ([#635](https://github.com/opensearch-project/opensearch-api-specification/pull/635))
+- Added API spec for query insights plugin ([#625](https://github.com/opensearch-project/opensearch-api-specification/pull/625))
 
 ### Changed
 
diff --git a/spec/namespaces/insights.yaml b/spec/namespaces/insights.yaml
index 7787d105..a9b75f3c 100644
--- a/spec/namespaces/insights.yaml
+++ b/spec/namespaces/insights.yaml
@@ -6,20 +6,19 @@ info:
 paths:
   /_insights/top_queries:
     get:
-      operationId: insights.getTopQueries
-      x-operation-group: insights
+      operationId: insights.top_queries.0
+      x-operation-group: insights.top_queries
+      x-version-added: '1.0'
       description: Retrieves the top queries based on the given metric type (latency, CPU, or memory).
       parameters:
-        - $ref: '#/components/parameters/type'
+        - $ref: '#/components/parameters/insights.top_queries::query.type'
       responses:
         '200':
-          content:
-            application/json:
-              schema:
-                $ref: '../schemas/query_insights._common.yaml#/components/schemas/TopQueriesResponse'
+          $ref: '#/components/responses/insights.top_queries@200'
+          
 components:
   parameters:
-    type:
+    insights.top_queries::query.type:
       name: type
       in: query
       required: true
@@ -27,3 +26,9 @@ components:
       schema:
         type: string
         enum: [cpu, latency, memory]
+  responses:
+    insights.top_queries@200:
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/insights._common.yaml#/components/schemas/TopQueriesResponse'
diff --git a/spec/schemas/insights._common.yaml b/spec/schemas/insights._common.yaml
index f80bd84a..13e319dc 100644
--- a/spec/schemas/insights._common.yaml
+++ b/spec/schemas/insights._common.yaml
@@ -13,206 +13,212 @@ components:
           type: array
           items:
             type: object
-            properties:
-              timestamp:
-                type: integer
-                description: The timestamp of the query execution.
-              total_shards:
-                type: integer
-                description: The total number of shards involved in the query.
-              task_resource_usages:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    action:
-                      type: string
-                      description: The action type of the task.
-                    taskId:
-                      type: integer
-                      description: The task ID.
-                    parentTaskId:
-                      type: integer
-                      description: The parent task ID.
-                    nodeId:
-                      type: string
-                      description: The node ID where the task was executed.
-                    taskResourceUsage:
-                      type: object
-                      properties:
-                        cpu_time_in_nanos:
-                          type: integer
-                          description: The CPU time used in nanoseconds.
-                        memory_in_bytes:
-                          type: integer
-                          description: The memory usage in bytes.
-              labels:
-                type: object
-                description: Additional labels for the query.
-              search_type:
-                type: string
-                description: The search query type (e.g., query_then_fetch).
-              source:
-                type: object
-                properties:
-                  aggregations:
-                    description: Defines the aggregations that are run as part of the search request.
-                    type: object
-                  collapse:
-                    $ref: '_core.search.yaml#/components/schemas/FieldCollapse'
-                  explain:
-                    description: If true, returns detailed information about score computation as part of a hit.
-                    type: boolean
-                  ext:
-                    description: Configuration of search extensions defined by OpenSearch plugins.
-                    type: object
-                    additionalProperties:
-                      type: object
-                  from:
-                    description: |-
-                      Starting document offset.
-                      Needs to be non-negative.
-                      By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters.
-                      To page through more hits, use the `search_after` parameter.
-                    type: number
-                  highlight:
-                    $ref: '_core.search.yaml#/components/schemas/Highlight'
-                  track_total_hits:
-                    $ref: '_core.search.yaml#/components/schemas/TrackHits'
-                  indices_boost:
-                    description: Boosts the _score of documents from specified indices.
-                    type: array
-                    items:
-                      type: object
-                      additionalProperties:
-                        type: number
-                  docvalue_fields:
-                    description: |-
-                      Array of wildcard (`*`) patterns.
-                      The request returns doc values for field names matching these patterns in the `hits.fields` property of the response.
-                    type: array
-                    items:
-                      $ref: '_common.query_dsl.yaml#/components/schemas/FieldAndFormat'
-                  min_score:
-                    description: |-
-                      Minimum `_score` for matching documents.
-                      Documents with a lower `_score` are not included in the search results.
-                    type: number
-                  post_filter:
-                    $ref: '_common.query_dsl.yaml#/components/schemas/QueryContainer'
-                  profile:
-                    description: |-
-                      Set to `true` to return detailed timing information about the execution of individual components in a search request.
-                      NOTE: This is a debugging tool and adds significant overhead to search execution.
-                    type: boolean
-                  query:
-                    $ref: '_common.query_dsl.yaml#/components/schemas/QueryContainer'
-                  script_fields:
-                    description: Retrieve a script evaluation (based on different fields) for each hit.
-                    type: object
-                    additionalProperties:
-                      $ref: '_common.yaml#/components/schemas/ScriptField'
-                  search_after:
-                    $ref: '_common.yaml#/components/schemas/SortResults'
-                  size:
-                    description: |-
-                      The number of hits to return.
-                      By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters.
-                      To page through more hits, use the `search_after` parameter.
-                    type: number
-                  slice:
-                    $ref: '_common.yaml#/components/schemas/SlicedScroll'
-                  sort:
-                    $ref: '_common.yaml#/components/schemas/Sort'
-                  _source:
-                    $ref: '_core.search.yaml#/components/schemas/SourceConfig'
-                  fields:
-                    description: |-
-                      Array of wildcard (`*`) patterns.
-                      The request returns values for field names matching these patterns in the `hits.fields` property of the response.
-                    type: array
-                    items:
-                      $ref: '_common.query_dsl.yaml#/components/schemas/FieldAndFormat'
-                  suggest:
-                    $ref: '_core.search.yaml#/components/schemas/Suggester'
-                  terminate_after:
-                    description: |-
-                      Maximum number of documents to collect for each shard.
-                      If a query reaches this limit, OpenSearch terminates the query early.
-                      OpenSearch collects documents before sorting.
-                      Use with caution.
-                      OpenSearch applies this parameter to each shard handling the request.
-                      When possible, let OpenSearch perform early termination automatically.
-                      Avoid specifying this parameter for requests that target data streams with backing indices across multiple data tiers.
-                      If set to `0` (default), the query does not terminate early.
-                    type: integer
-                    format: int32
-                  timeout:
-                    description: |-
-                      Specifies the period of time to wait for a response from each shard.
-                      If no response is received before the timeout expires, the request fails and returns an error.
-                      Defaults to no timeout.
-                    type: string
-                  track_scores:
-                    description: If true, calculate and return document scores, even if the scores are not used for sorting.
-                    type: boolean
-                  version:
-                    description: If true, returns document version as part of a hit.
-                    type: boolean
-                  seq_no_primary_term:
-                    description: If `true`, returns sequence number and primary term of the last modification of each hit.
-                    type: boolean
-                  stored_fields:
-                    $ref: '_common.yaml#/components/schemas/Fields'
-                  pit:
-                    $ref: '_core.search.yaml#/components/schemas/PointInTimeReference'
-                  stats:
-                    description: |-
-                      Stats groups to associate with the search.
-                      Each group maintains a statistics aggregation for its associated searches.
-                      You can retrieve these stats using the indices stats API.
-                    type: array
-                    items:
-                      type: string
-              node_id:
-                type: string
-                description: The node ID associated with the query.
-              indices:
-                type: array
-                items:
-                  type: string
-                description: The indices involved in the query.
-              phase_latency_map:
-                type: object
-              measurements:
-                type: object
-                properties:
-                  latency:
-                    type: object
-                    properties:
-                      number:
-                        type: integer
-                      count:
-                        type: integer
-                      aggregationType:
-                        type: string
-                  cpu:
-                    type: object
-                    properties:
-                      number:
-                        type: integer
-                      count:
-                        type: integer
-                      aggregationType:
-                        type: string
-                  memory:
-                    type: object
-                    properties:
-                      number:
-                        type: integer
-                      count:
-                        type: integer
-                      aggregationType:
-                        type: string
+            $ref: '#/components/schemas/TopQuery'
       required:
         - top_queries
+    TopQuery:
+      type: object
+      properties:
+        timestamp:
+          type: integer
+          description: The timestamp of the query execution.
+        total_shards:
+          type: integer
+          description: The total number of shards involved in the query.
+        task_resource_usages:
+          type: array
+          items:
+            type: object
+            $ref: '#/components/schemas/TaskResourceUsages'
+        labels:
+          type: object
+          description: Additional labels for the query.
+        search_type:
+          type: string
+          description: The search query type (e.g., query_then_fetch).
+        source:
+          type: object
+          $ref: '#/components/schemas/Source'
+        node_id:
+          type: string
+          description: The node ID associated with the query.
+        indices:
+          type: array
+          items:
+            type: string
+          description: The indices involved in the query.
+        phase_latency_map:
+          type: object
+        measurements:
+          type: object
+          $ref: '#/components/schemas/Measurements'
+    TaskResourceUsages:
+      type: object
+      properties:
+        action:
+          type: string
+          description: The action type of the task.
+        taskId:
+          type: integer
+          description: The task ID.
+        parentTaskId:
+          type: integer
+          description: The parent task ID.
+        nodeId:
+          type: string
+          description: The node ID where the task was executed.
+        taskResourceUsage:
+          type: object
+          $ref: '#/components/schemas/TaskResourceUsage'
+    TaskResourceUsage:
+      type: object
+      properties:
+        cpu_time_in_nanos:
+          type: integer
+          description: The CPU time used in nanoseconds.
+        memory_in_bytes:
+          type: integer
+          description: The memory usage in bytes.
+    Source:
+      type: object
+      properties:
+        aggregations:
+          description: Defines the aggregations that are run as part of the search request.
+          type: object
+        collapse:
+          $ref: '_core.search.yaml#/components/schemas/FieldCollapse'
+        explain:
+          description: If true, returns detailed information about score computation as part of a hit.
+          type: boolean
+        ext:
+          description: Configuration of search extensions defined by OpenSearch plugins.
+          type: object
+          additionalProperties:
+            type: object
+        from:
+          description: |-
+            Starting document offset.
+            Needs to be non-negative.
+            By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters.
+            To page through more hits, use the `search_after` parameter.
+          type: number
+        highlight:
+          $ref: '_core.search.yaml#/components/schemas/Highlight'
+        track_total_hits:
+          $ref: '_core.search.yaml#/components/schemas/TrackHits'
+        indices_boost:
+          description: Boosts the _score of documents from specified indices.
+          type: array
+          items:
+            type: object
+            additionalProperties:
+              type: number
+        docvalue_fields:
+          description: |-
+            Array of wildcard (`*`) patterns.
+            The request returns doc values for field names matching these patterns in the `hits.fields` property of the response.
+          type: array
+          items:
+            $ref: '_common.query_dsl.yaml#/components/schemas/FieldAndFormat'
+        min_score:
+          description: |-
+            Minimum `_score` for matching documents.
+            Documents with a lower `_score` are not included in the search results.
+          type: number
+        post_filter:
+          $ref: '_common.query_dsl.yaml#/components/schemas/QueryContainer'
+        profile:
+          description: |-
+            Set to `true` to return detailed timing information about the execution of individual components in a search request.
+            NOTE: This is a debugging tool and adds significant overhead to search execution.
+          type: boolean
+        query:
+          $ref: '_common.query_dsl.yaml#/components/schemas/QueryContainer'
+        script_fields:
+          description: Retrieve a script evaluation (based on different fields) for each hit.
+          type: object
+          additionalProperties:
+            $ref: '_common.yaml#/components/schemas/ScriptField'
+        search_after:
+          $ref: '_common.yaml#/components/schemas/SortResults'
+        size:
+          description: |-
+            The number of hits to return.
+            By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters.
+            To page through more hits, use the `search_after` parameter.
+          type: number
+        slice:
+          $ref: '_common.yaml#/components/schemas/SlicedScroll'
+        sort:
+          $ref: '_common.yaml#/components/schemas/Sort'
+        _source:
+          $ref: '_core.search.yaml#/components/schemas/SourceConfig'
+        fields:
+          description: |-
+            Array of wildcard (`*`) patterns.
+            The request returns values for field names matching these patterns in the `hits.fields` property of the response.
+          type: array
+          items:
+            $ref: '_common.query_dsl.yaml#/components/schemas/FieldAndFormat'
+        suggest:
+          $ref: '_core.search.yaml#/components/schemas/Suggester'
+        terminate_after:
+          description: |-
+            Maximum number of documents to collect for each shard.
+            If a query reaches this limit, OpenSearch terminates the query early.
+            OpenSearch collects documents before sorting.
+            Use with caution.
+            OpenSearch applies this parameter to each shard handling the request.
+            When possible, let OpenSearch perform early termination automatically.
+            Avoid specifying this parameter for requests that target data streams with backing indices across multiple data tiers.
+            If set to `0` (default), the query does not terminate early.
+          type: integer
+          format: int32
+        timeout:
+          description: |-
+            Specifies the period of time to wait for a response from each shard.
+            If no response is received before the timeout expires, the request fails and returns an error.
+            Defaults to no timeout.
+          type: string
+        track_scores:
+          description: If true, calculate and return document scores, even if the scores are not used for sorting.
+          type: boolean
+        version:
+          description: If true, returns document version as part of a hit.
+          type: boolean
+        seq_no_primary_term:
+          description: If `true`, returns sequence number and primary term of the last modification of each hit.
+          type: boolean
+        stored_fields:
+          $ref: '_common.yaml#/components/schemas/Fields'
+        pit:
+          $ref: '_core.search.yaml#/components/schemas/PointInTimeReference'
+        stats:
+          description: |-
+            Stats groups to associate with the search.
+            Each group maintains a statistics aggregation for its associated searches.
+            You can retrieve these stats using the indices stats API.
+          type: array
+          items:
+            type: string
+    Measurement:
+      type: object
+      properties:
+        number:
+          type: integer
+        count:
+          type: integer
+        aggregationType:
+          type: string
+    Measurements:
+      type: object
+      properties:
+        latency:
+          type: object
+          $ref: '#/components/schemas/Measurement'
+        cpu:
+          type: object
+          $ref: '#/components/schemas/Measurement'
+        memory:
+          type: object
+          $ref: '#/components/schemas/Measurement'
\ No newline at end of file