diff --git a/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/OrchestrationConfigsApi.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/OrchestrationConfigsApi.java
index 6cdd7c495..f546625fe 100644
--- a/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/OrchestrationConfigsApi.java
+++ b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/OrchestrationConfigsApi.java
@@ -498,6 +498,9 @@ public OrchestrationConfigPostResponse importOrchestrationConfig()
    *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>413</b> - Payload Too Large — result set exceeds maximum allowed rows; use $top and $skip
+   * to paginate
+   *
    * <p><b>0</b> - Common Error
    *
    * @param scenario (required) The value for the parameter scenario
@@ -509,6 +512,9 @@ public OrchestrationConfigPostResponse importOrchestrationConfig()
    * @param resolveTemplateRef (optional, default to false) DEPRECATED: Use resolveTemplateRef
    *     instead
    * @param resolveTemplateRef2 (optional) The value for the parameter resolveTemplateRef2
+   * @param $top (optional) Number of results to return (1–500). When omitted the full result set is
+   *     returned (up to the server limit).
+   * @param $skip (optional, default to 0) Number of results to skip before returning the page.
    * @return OrchestrationConfigListResponse
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
@@ -521,7 +527,9 @@ public OrchestrationConfigListResponse listOrchestrationConfigHistory(
       @Nullable final Boolean includeSpec,
       @Nullable final Boolean includeSpec2,
       @Nullable final Boolean resolveTemplateRef,
-      @Nullable final Boolean resolveTemplateRef2)
+      @Nullable final Boolean resolveTemplateRef2,
+      @Nullable final Integer $top,
+      @Nullable final Integer $skip)
       throws OpenApiRequestException {
 
     // verify the required parameter 'scenario' is set
@@ -569,6 +577,8 @@ public OrchestrationConfigListResponse listOrchestrationConfigHistory(
         ApiClient.parameterToPair("resolve_template_ref", resolveTemplateRef));
     localVarQueryParams.addAll(
         ApiClient.parameterToPair("resolveTemplateRef", resolveTemplateRef2));
+    localVarQueryParams.addAll(ApiClient.parameterToPair("$top", $top));
+    localVarQueryParams.addAll(ApiClient.parameterToPair("$skip", $skip));
     if (aiResourceGroup != null)
       localVarHeaderParams.put("AI-Resource-Group", ApiClient.parameterToString(aiResourceGroup));
 
@@ -604,6 +614,9 @@ public OrchestrationConfigListResponse listOrchestrationConfigHistory(
    *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>413</b> - Payload Too Large — result set exceeds maximum allowed rows; use $top and $skip
+   * to paginate
+   *
    * <p><b>0</b> - Common Error
    *
    * @param scenario The value for the parameter scenario
@@ -616,7 +629,8 @@ public OrchestrationConfigListResponse listOrchestrationConfigHistory(
   public OrchestrationConfigListResponse listOrchestrationConfigHistory(
       @Nonnull final String scenario, @Nonnull final String version, @Nonnull final String name)
       throws OpenApiRequestException {
-    return listOrchestrationConfigHistory(scenario, version, name, null, null, null, null, null);
+    return listOrchestrationConfigHistory(
+        scenario, version, name, null, null, null, null, null, null, null);
   }
 
   /**
@@ -628,6 +642,9 @@ public OrchestrationConfigListResponse listOrchestrationConfigHistory(
    *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>413</b> - Payload Too Large — result set exceeds maximum allowed rows; use $top and $skip
+   * to paginate
+   *
    * <p><b>0</b> - Common Error
    *
    * @param aiResourceGroup (optional) Specify a resource group id to use
@@ -640,6 +657,9 @@ public OrchestrationConfigListResponse listOrchestrationConfigHistory(
    * @param resolveTemplateRef (optional, default to false) DEPRECATED: Use resolveTemplateRef
    *     instead
    * @param resolveTemplateRef2 (optional) The value for the parameter resolveTemplateRef2
+   * @param $top (optional) Number of results to return (1–500). When omitted the full result set is
+   *     returned (up to the server limit).
+   * @param $skip (optional, default to 0) Number of results to skip before returning the page.
    * @return OrchestrationConfigListResponse
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
@@ -653,7 +673,9 @@ public OrchestrationConfigListResponse listOrchestrationConfigs(
       @Nullable final Boolean includeSpec,
       @Nullable final Boolean includeSpec2,
       @Nullable final Boolean resolveTemplateRef,
-      @Nullable final Boolean resolveTemplateRef2)
+      @Nullable final Boolean resolveTemplateRef2,
+      @Nullable final Integer $top,
+      @Nullable final Integer $skip)
       throws OpenApiRequestException {
 
     // create path and map variables
@@ -675,6 +697,8 @@ public OrchestrationConfigListResponse listOrchestrationConfigs(
         ApiClient.parameterToPair("resolve_template_ref", resolveTemplateRef));
     localVarQueryParams.addAll(
         ApiClient.parameterToPair("resolveTemplateRef", resolveTemplateRef2));
+    localVarQueryParams.addAll(ApiClient.parameterToPair("$top", $top));
+    localVarQueryParams.addAll(ApiClient.parameterToPair("$skip", $skip));
     if (aiResourceGroup != null)
       localVarHeaderParams.put("AI-Resource-Group", ApiClient.parameterToString(aiResourceGroup));
 
@@ -710,6 +734,9 @@ public OrchestrationConfigListResponse listOrchestrationConfigs(
    *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>413</b> - Payload Too Large — result set exceeds maximum allowed rows; use $top and $skip
+   * to paginate
+   *
    * <p><b>0</b> - Common Error
    *
    * @return OrchestrationConfigListResponse
@@ -717,6 +744,7 @@ public OrchestrationConfigListResponse listOrchestrationConfigs(
    */
   @Nonnull
   public OrchestrationConfigListResponse listOrchestrationConfigs() throws OpenApiRequestException {
-    return listOrchestrationConfigs(null, null, null, null, null, null, null, null, null);
+    return listOrchestrationConfigs(
+        null, null, null, null, null, null, null, null, null, null, null);
   }
 }
diff --git a/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/PromptTemplatesApi.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/PromptTemplatesApi.java
index 0c627f134..841aecbd5 100644
--- a/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/PromptTemplatesApi.java
+++ b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/client/PromptTemplatesApi.java
@@ -516,6 +516,9 @@ public PromptTemplatePostResponse importPromptTemplate() throws OpenApiRequestEx
    *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>413</b> - Payload Too Large — result set exceeds maximum allowed rows; use $top and $skip
+   * to paginate
+   *
    * <p><b>0</b> - Common Error
    *
    * @param scenario (required) The value for the parameter scenario
@@ -523,6 +526,9 @@ public PromptTemplatePostResponse importPromptTemplate() throws OpenApiRequestEx
    * @param name (required) The value for the parameter name
    * @param aiResourceGroup (optional) Specify a resource group id to use
    * @param aiResourceGroupScope (optional) Specify whether the resource group scope is to be used
+   * @param $top (optional) Number of results to return (1–500). When omitted the full result set is
+   *     returned (up to the server limit).
+   * @param $skip (optional, default to 0) Number of results to skip before returning the page.
    * @return PromptTemplateListResponse
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
@@ -532,7 +538,9 @@ public PromptTemplateListResponse listPromptTemplateHistory(
       @Nonnull final String version,
       @Nonnull final String name,
       @Nullable final String aiResourceGroup,
-      @Nullable final String aiResourceGroupScope)
+      @Nullable final String aiResourceGroupScope,
+      @Nullable final Integer $top,
+      @Nullable final Integer $skip)
       throws OpenApiRequestException {
 
     // verify the required parameter 'scenario' is set
@@ -574,6 +582,8 @@ public PromptTemplateListResponse listPromptTemplateHistory(
     final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
     final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
+    localVarQueryParams.addAll(ApiClient.parameterToPair("$top", $top));
+    localVarQueryParams.addAll(ApiClient.parameterToPair("$skip", $skip));
     if (aiResourceGroup != null)
       localVarHeaderParams.put("AI-Resource-Group", ApiClient.parameterToString(aiResourceGroup));
     if (aiResourceGroupScope != null)
@@ -612,6 +622,9 @@ public PromptTemplateListResponse listPromptTemplateHistory(
    *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>413</b> - Payload Too Large — result set exceeds maximum allowed rows; use $top and $skip
+   * to paginate
+   *
    * <p><b>0</b> - Common Error
    *
    * @param scenario The value for the parameter scenario
@@ -624,7 +637,7 @@ public PromptTemplateListResponse listPromptTemplateHistory(
   public PromptTemplateListResponse listPromptTemplateHistory(
       @Nonnull final String scenario, @Nonnull final String version, @Nonnull final String name)
       throws OpenApiRequestException {
-    return listPromptTemplateHistory(scenario, version, name, null, null);
+    return listPromptTemplateHistory(scenario, version, name, null, null, null, null);
   }
 
   /**
@@ -636,6 +649,9 @@ public PromptTemplateListResponse listPromptTemplateHistory(
    *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>413</b> - Payload Too Large — result set exceeds maximum allowed rows; use $top and $skip
+   * to paginate
+   *
    * <p><b>0</b> - Common Error
    *
    * @param aiResourceGroup (optional) Specify a resource group id to use
@@ -645,6 +661,9 @@ public PromptTemplateListResponse listPromptTemplateHistory(
    * @param version (optional) The value for the parameter version
    * @param retrieve (optional, default to both) The value for the parameter retrieve
    * @param includeSpec (optional, default to false) The value for the parameter includeSpec
+   * @param $top (optional) Number of results to return (1–500). When omitted the full result set is
+   *     returned (up to the server limit).
+   * @param $skip (optional, default to 0) Number of results to skip before returning the page.
    * @return PromptTemplateListResponse
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
@@ -656,7 +675,9 @@ public PromptTemplateListResponse listPromptTemplates(
       @Nullable final String name,
       @Nullable final String version,
       @Nullable final String retrieve,
-      @Nullable final Boolean includeSpec)
+      @Nullable final Boolean includeSpec,
+      @Nullable final Integer $top,
+      @Nullable final Integer $skip)
       throws OpenApiRequestException {
 
     // create path and map variables
@@ -673,6 +694,8 @@ public PromptTemplateListResponse listPromptTemplates(
     localVarQueryParams.addAll(ApiClient.parameterToPair("version", version));
     localVarQueryParams.addAll(ApiClient.parameterToPair("retrieve", retrieve));
     localVarQueryParams.addAll(ApiClient.parameterToPair("includeSpec", includeSpec));
+    localVarQueryParams.addAll(ApiClient.parameterToPair("$top", $top));
+    localVarQueryParams.addAll(ApiClient.parameterToPair("$skip", $skip));
     if (aiResourceGroup != null)
       localVarHeaderParams.put("AI-Resource-Group", ApiClient.parameterToString(aiResourceGroup));
     if (aiResourceGroupScope != null)
@@ -711,6 +734,9 @@ public PromptTemplateListResponse listPromptTemplates(
    *
    * <p><b>403</b> - Forbidden Error
    *
+   * <p><b>413</b> - Payload Too Large — result set exceeds maximum allowed rows; use $top and $skip
+   * to paginate
+   *
    * <p><b>0</b> - Common Error
    *
    * @return PromptTemplateListResponse
@@ -718,7 +744,7 @@ public PromptTemplateListResponse listPromptTemplates(
    */
   @Nonnull
   public PromptTemplateListResponse listPromptTemplates() throws OpenApiRequestException {
-    return listPromptTemplates(null, null, null, null, null, null, null);
+    return listPromptTemplates(null, null, null, null, null, null, null, null, null);
   }
 
   /**
diff --git a/core-services/prompt-registry/src/main/resources/spec/prompt-registry.yaml b/core-services/prompt-registry/src/main/resources/spec/prompt-registry.yaml
index 98aaba206..7b2e71edf 100644
--- a/core-services/prompt-registry/src/main/resources/spec/prompt-registry.yaml
+++ b/core-services/prompt-registry/src/main/resources/spec/prompt-registry.yaml
@@ -69,9 +69,16 @@ paths:
           schema:
             type: boolean
             default: false
+        - $ref: '#/components/parameters/top'
+        - $ref: '#/components/parameters/skip'
       responses:
         '200':
           description: Successful response
+          headers:
+            Link:
+              description: Pagination links (rel=next, rel=prev)
+              schema:
+                type: string
           content:
             application/json:
               schema:
@@ -80,6 +87,8 @@ paths:
           $ref: '#/components/responses/BadRequest'
         '403':
           $ref: '#/components/responses/ForbiddenError'
+        '413':
+          $ref: '#/components/responses/PayloadTooLarge'
         default:
           $ref: '#/components/responses/CommonError'
   /lm/scenarios/{scenario}/promptTemplates/{name}/versions/{version}/history:
@@ -107,9 +116,16 @@ paths:
           required: true
           schema:
             type: string
+        - $ref: '#/components/parameters/top'
+        - $ref: '#/components/parameters/skip'
       responses:
         '200':
           description: Successful response
+          headers:
+            Link:
+              description: Pagination links (rel=next, rel=prev)
+              schema:
+                type: string
           content:
             application/json:
               schema:
@@ -118,6 +134,8 @@ paths:
           $ref: '#/components/responses/BadRequest'
         '403':
           $ref: '#/components/responses/ForbiddenError'
+        '413':
+          $ref: '#/components/responses/PayloadTooLarge'
         default:
           $ref: '#/components/responses/CommonError'
   /lm/promptTemplates/{promptTemplateId}:
@@ -401,9 +419,16 @@ paths:
           in: query
           schema:
             type: boolean
+        - $ref: '#/components/parameters/top'
+        - $ref: '#/components/parameters/skip'
       responses:
         '200':
           description: Successful response
+          headers:
+            Link:
+              description: Pagination links (rel=next, rel=prev)
+              schema:
+                type: string
           content:
             application/json:
               schema:
@@ -412,6 +437,8 @@ paths:
           $ref: '#/components/responses/BadRequest'
         '403':
           $ref: '#/components/responses/ForbiddenError'
+        '413':
+          $ref: '#/components/responses/PayloadTooLarge'
         default:
           $ref: '#/components/responses/CommonError'
   /registry/v2/scenarios/{scenario}/orchestrationConfigs/{name}/versions/{version}/history:
@@ -460,9 +487,16 @@ paths:
           in: query
           schema:
             type: boolean
+        - $ref: '#/components/parameters/top'
+        - $ref: '#/components/parameters/skip'
       responses:
         '200':
           description: Successful response
+          headers:
+            Link:
+              description: Pagination links (rel=next, rel=prev)
+              schema:
+                type: string
           content:
             application/json:
               schema:
@@ -471,6 +505,8 @@ paths:
           $ref: '#/components/responses/BadRequest'
         '403':
           $ref: '#/components/responses/ForbiddenError'
+        '413':
+          $ref: '#/components/responses/PayloadTooLarge'
         default:
           $ref: '#/components/responses/CommonError'
   /registry/v2/orchestrationConfigs/{orchestrationConfigId}:
@@ -2161,6 +2197,12 @@ components:
         application/json:
           schema:
             $ref: '#/components/schemas/ErrorResponse'
+    PayloadTooLarge:
+      description: Payload Too Large — result set exceeds maximum allowed rows; use $top and $skip to paginate
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/ErrorResponse'
   parameters:
     ai-resource-group:
       name: AI-Resource-Group
@@ -2181,3 +2223,21 @@ components:
           - 'True'
           - 'false'
           - 'False'
+    top:
+      name: $top
+      in: query
+      description: Number of results to return (1–500). When omitted the full result set is returned (up to the server limit).
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 500
+    skip:
+      name: $skip
+      in: query
+      description: Number of results to skip before returning the page.
+      required: false
+      schema:
+        type: integer
+        minimum: 0
+        default: 0