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 15cc46600..0934b0541 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
@@ -65,13 +65,16 @@ public PromptTemplatesApi(@Nonnull final ApiClient apiClient) {
    *
    * <p><b>0</b> - Common Error
    *
-   * @param promptTemplatePostRequest The value for the parameter promptTemplatePostRequest
+   * @param promptTemplatePostRequest (required) The value for the parameter
+   *     promptTemplatePostRequest
+   * @param aiResourceGroup (optional) Specify a resource group id to use
    * @return PromptTemplatePostResponse
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
   @Nonnull
   public PromptTemplatePostResponse createUpdatePromptTemplate(
-      @Nonnull final PromptTemplatePostRequest promptTemplatePostRequest)
+      @Nonnull final PromptTemplatePostRequest promptTemplatePostRequest,
+      @Nullable final String aiResourceGroup)
       throws OpenApiRequestException {
     final Object localVarPostBody = promptTemplatePostRequest;
 
@@ -90,6 +93,9 @@ public PromptTemplatePostResponse createUpdatePromptTemplate(
     final MultiValueMap<String, Object> localVarFormParams =
         new LinkedMultiValueMap<String, Object>();
 
+    if (aiResourceGroup != null)
+      localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
+
     final String[] localVarAccepts = {"application/json"};
     final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
     final String[] localVarContentTypes = {"application/json"};
@@ -112,6 +118,28 @@ public PromptTemplatePostResponse createUpdatePromptTemplate(
         localVarReturnType);
   }
 
+  /**
+   * Create or update a prompt template
+   *
+   * <p><b>200</b> - Successful response
+   *
+   * <p><b>403</b> - Forbidden Error
+   *
+   * <p><b>400</b> - Bad Request
+   *
+   * <p><b>0</b> - Common Error
+   *
+   * @param promptTemplatePostRequest The value for the parameter promptTemplatePostRequest
+   * @return PromptTemplatePostResponse
+   * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
+   */
+  @Nonnull
+  public PromptTemplatePostResponse createUpdatePromptTemplate(
+      @Nonnull final PromptTemplatePostRequest promptTemplatePostRequest)
+      throws OpenApiRequestException {
+    return createUpdatePromptTemplate(promptTemplatePostRequest, null);
+  }
+
   /**
    * Delete prompt template
    *
@@ -123,12 +151,14 @@ public PromptTemplatePostResponse createUpdatePromptTemplate(
    *
    * <p><b>0</b> - Common Error
    *
-   * @param promptTemplateId The value for the parameter promptTemplateId
+   * @param promptTemplateId (required) The value for the parameter promptTemplateId
+   * @param aiResourceGroup (optional) Specify a resource group id to use
    * @return PromptTemplateDeleteResponse
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
   @Nonnull
-  public PromptTemplateDeleteResponse deletePromptTemplate(@Nonnull final UUID promptTemplateId)
+  public PromptTemplateDeleteResponse deletePromptTemplate(
+      @Nonnull final UUID promptTemplateId, @Nullable final String aiResourceGroup)
       throws OpenApiRequestException {
     final Object localVarPostBody = null;
 
@@ -152,6 +182,9 @@ public PromptTemplateDeleteResponse deletePromptTemplate(@Nonnull final UUID pro
     final MultiValueMap<String, Object> localVarFormParams =
         new LinkedMultiValueMap<String, Object>();
 
+    if (aiResourceGroup != null)
+      localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
+
     final String[] localVarAccepts = {"application/json"};
     final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
     final String[] localVarContentTypes = {};
@@ -174,6 +207,27 @@ public PromptTemplateDeleteResponse deletePromptTemplate(@Nonnull final UUID pro
         localVarReturnType);
   }
 
+  /**
+   * Delete prompt template
+   *
+   * <p><b>200</b> - Successful response
+   *
+   * <p><b>404</b> - Bad Request
+   *
+   * <p><b>403</b> - Forbidden Error
+   *
+   * <p><b>0</b> - Common Error
+   *
+   * @param promptTemplateId The value for the parameter promptTemplateId
+   * @return PromptTemplateDeleteResponse
+   * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
+   */
+  @Nonnull
+  public PromptTemplateDeleteResponse deletePromptTemplate(@Nonnull final UUID promptTemplateId)
+      throws OpenApiRequestException {
+    return deletePromptTemplate(promptTemplateId, null);
+  }
+
   /**
    * Export prompt template
    *
@@ -183,12 +237,14 @@ public PromptTemplateDeleteResponse deletePromptTemplate(@Nonnull final UUID pro
    *
    * <p><b>0</b> - Common Error
    *
-   * @param promptTemplateId The value for the parameter promptTemplateId
+   * @param promptTemplateId (required) The value for the parameter promptTemplateId
+   * @param aiResourceGroup (optional) Specify a resource group id to use
    * @return File
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
   @Nonnull
-  public File exportPromptTemplate(@Nonnull final UUID promptTemplateId)
+  public File exportPromptTemplate(
+      @Nonnull final UUID promptTemplateId, @Nullable final String aiResourceGroup)
       throws OpenApiRequestException {
     final Object localVarPostBody = null;
 
@@ -212,6 +268,9 @@ public File exportPromptTemplate(@Nonnull final UUID promptTemplateId)
     final MultiValueMap<String, Object> localVarFormParams =
         new LinkedMultiValueMap<String, Object>();
 
+    if (aiResourceGroup != null)
+      localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
+
     final String[] localVarAccepts = {"application/octet-stream", "application/json"};
     final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
     final String[] localVarContentTypes = {};
@@ -234,6 +293,25 @@ public File exportPromptTemplate(@Nonnull final UUID promptTemplateId)
         localVarReturnType);
   }
 
+  /**
+   * Export prompt template
+   *
+   * <p><b>200</b> - Successful response
+   *
+   * <p><b>400</b> - Bad Request
+   *
+   * <p><b>0</b> - Common Error
+   *
+   * @param promptTemplateId The value for the parameter promptTemplateId
+   * @return File
+   * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
+   */
+  @Nonnull
+  public File exportPromptTemplate(@Nonnull final UUID promptTemplateId)
+      throws OpenApiRequestException {
+    return exportPromptTemplate(promptTemplateId, null);
+  }
+
   /**
    * Get prompt template by UUID
    *
@@ -245,12 +323,14 @@ public File exportPromptTemplate(@Nonnull final UUID promptTemplateId)
    *
    * <p><b>0</b> - Common Error
    *
-   * @param promptTemplateId The value for the parameter promptTemplateId
+   * @param promptTemplateId (required) The value for the parameter promptTemplateId
+   * @param aiResourceGroup (optional) Specify a resource group id to use
    * @return PromptTemplateGetResponse
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
   @Nonnull
-  public PromptTemplateGetResponse getPromptTemplateByUuid(@Nonnull final UUID promptTemplateId)
+  public PromptTemplateGetResponse getPromptTemplateByUuid(
+      @Nonnull final UUID promptTemplateId, @Nullable final String aiResourceGroup)
       throws OpenApiRequestException {
     final Object localVarPostBody = null;
 
@@ -274,6 +354,9 @@ public PromptTemplateGetResponse getPromptTemplateByUuid(@Nonnull final UUID pro
     final MultiValueMap<String, Object> localVarFormParams =
         new LinkedMultiValueMap<String, Object>();
 
+    if (aiResourceGroup != null)
+      localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
+
     final String[] localVarAccepts = {"application/json"};
     final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
     final String[] localVarContentTypes = {};
@@ -296,6 +379,27 @@ public PromptTemplateGetResponse getPromptTemplateByUuid(@Nonnull final UUID pro
         localVarReturnType);
   }
 
+  /**
+   * Get prompt template by UUID
+   *
+   * <p><b>200</b> - Successful response
+   *
+   * <p><b>400</b> - Bad Request
+   *
+   * <p><b>403</b> - Forbidden Error
+   *
+   * <p><b>0</b> - Common Error
+   *
+   * @param promptTemplateId The value for the parameter promptTemplateId
+   * @return PromptTemplateGetResponse
+   * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
+   */
+  @Nonnull
+  public PromptTemplateGetResponse getPromptTemplateByUuid(@Nonnull final UUID promptTemplateId)
+      throws OpenApiRequestException {
+    return getPromptTemplateByUuid(promptTemplateId, null);
+  }
+
   /**
    * Import prompt template
    *
@@ -305,12 +409,14 @@ public PromptTemplateGetResponse getPromptTemplateByUuid(@Nonnull final UUID pro
    *
    * <p><b>0</b> - Common Error
    *
+   * @param aiResourceGroup (optional) Specify a resource group id to use
    * @param _file (optional) The value for the parameter _file
    * @return PromptTemplatePostResponse
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
   @Nonnull
-  public PromptTemplatePostResponse importPromptTemplate(@Nullable final File _file)
+  public PromptTemplatePostResponse importPromptTemplate(
+      @Nullable final String aiResourceGroup, @Nullable final File _file)
       throws OpenApiRequestException {
     final Object localVarPostBody = null;
 
@@ -323,6 +429,9 @@ public PromptTemplatePostResponse importPromptTemplate(@Nullable final File _fil
     final MultiValueMap<String, Object> localVarFormParams =
         new LinkedMultiValueMap<String, Object>();
 
+    if (aiResourceGroup != null)
+      localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
+
     if (_file != null) localVarFormParams.add("file", new FileSystemResource(_file));
 
     final String[] localVarAccepts = {"application/json"};
@@ -361,7 +470,7 @@ public PromptTemplatePostResponse importPromptTemplate(@Nullable final File _fil
    */
   @Nonnull
   public PromptTemplatePostResponse importPromptTemplate() throws OpenApiRequestException {
-    return importPromptTemplate(null);
+    return importPromptTemplate(null, null);
   }
 
   /**
@@ -375,15 +484,19 @@ public PromptTemplatePostResponse importPromptTemplate() throws OpenApiRequestEx
    *
    * <p><b>0</b> - Common Error
    *
-   * @param scenario The value for the parameter scenario
-   * @param version The value for the parameter version
-   * @param name The value for the parameter name
+   * @param scenario (required) The value for the parameter scenario
+   * @param version (required) The value for the parameter version
+   * @param name (required) The value for the parameter name
+   * @param aiResourceGroup (optional) Specify a resource group id to use
    * @return PromptTemplateListResponse
    * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
    */
   @Nonnull
   public PromptTemplateListResponse listPromptTemplateHistory(
-      @Nonnull final String scenario, @Nonnull final String version, @Nonnull final String name)
+      @Nonnull final String scenario,
+      @Nonnull final String version,
+      @Nonnull final String name,
+      @Nullable final String aiResourceGroup)
       throws OpenApiRequestException {
     final Object localVarPostBody = null;
 
@@ -422,6 +535,9 @@ public PromptTemplateListResponse listPromptTemplateHistory(
     final MultiValueMap<String, Object> localVarFormParams =
         new LinkedMultiValueMap<String, Object>();
 
+    if (aiResourceGroup != null)
+      localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
+
     final String[] localVarAccepts = {"application/json"};
     final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
     final String[] localVarContentTypes = {};
@@ -444,6 +560,30 @@ public PromptTemplateListResponse listPromptTemplateHistory(
         localVarReturnType);
   }
 
+  /**
+   * List prompt template history
+   *
+   * <p><b>200</b> - Successful response
+   *
+   * <p><b>400</b> - Bad Request
+   *
+   * <p><b>403</b> - Forbidden Error
+   *
+   * <p><b>0</b> - Common Error
+   *
+   * @param scenario The value for the parameter scenario
+   * @param version The value for the parameter version
+   * @param name The value for the parameter name
+   * @return PromptTemplateListResponse
+   * @throws OpenApiRequestException if an error occurs while attempting to invoke the API
+   */
+  @Nonnull
+  public PromptTemplateListResponse listPromptTemplateHistory(
+      @Nonnull final String scenario, @Nonnull final String version, @Nonnull final String name)
+      throws OpenApiRequestException {
+    return listPromptTemplateHistory(scenario, version, name, null);
+  }
+
   /**
    * List prompt templates
    *
@@ -455,6 +595,7 @@ public PromptTemplateListResponse listPromptTemplateHistory(
    *
    * <p><b>0</b> - Common Error
    *
+   * @param aiResourceGroup (optional) Specify a resource group id to use
    * @param scenario (optional) The value for the parameter scenario
    * @param name (optional) The value for the parameter name
    * @param version (optional) The value for the parameter version
@@ -465,6 +606,7 @@ public PromptTemplateListResponse listPromptTemplateHistory(
    */
   @Nonnull
   public PromptTemplateListResponse listPromptTemplates(
+      @Nullable final String aiResourceGroup,
       @Nullable final String scenario,
       @Nullable final String name,
       @Nullable final String version,
@@ -489,6 +631,9 @@ public PromptTemplateListResponse listPromptTemplates(
     localVarQueryParams.putAll(
         apiClient.parameterToMultiValueMap(null, "includeSpec", includeSpec));
 
+    if (aiResourceGroup != null)
+      localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
+
     final String[] localVarAccepts = {"application/json"};
     final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
     final String[] localVarContentTypes = {};
@@ -527,7 +672,7 @@ public PromptTemplateListResponse listPromptTemplates(
    */
   @Nonnull
   public PromptTemplateListResponse listPromptTemplates() throws OpenApiRequestException {
-    return listPromptTemplates(null, null, null, null, null);
+    return listPromptTemplates(null, null, null, null, null, null);
   }
 
   /**
@@ -542,6 +687,7 @@ public PromptTemplateListResponse listPromptTemplates() throws OpenApiRequestExc
    * <p><b>0</b> - Common Error
    *
    * @param promptTemplateId (required) The value for the parameter promptTemplateId
+   * @param aiResourceGroup (optional) Specify a resource group id to use
    * @param metadata (optional, default to false) The value for the parameter metadata
    * @param promptTemplateSubstitutionRequest (optional) The value for the parameter
    *     promptTemplateSubstitutionRequest
@@ -551,6 +697,7 @@ public PromptTemplateListResponse listPromptTemplates() throws OpenApiRequestExc
   @Nonnull
   public PromptTemplateSubstitutionResponse parsePromptTemplateById(
       @Nonnull final UUID promptTemplateId,
+      @Nullable final String aiResourceGroup,
       @Nullable final Boolean metadata,
       @Nullable final PromptTemplateSubstitutionRequest promptTemplateSubstitutionRequest)
       throws OpenApiRequestException {
@@ -578,6 +725,9 @@ public PromptTemplateSubstitutionResponse parsePromptTemplateById(
 
     localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "metadata", metadata));
 
+    if (aiResourceGroup != null)
+      localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
+
     final String[] localVarAccepts = {"application/json"};
     final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
     final String[] localVarContentTypes = {"application/json"};
@@ -618,7 +768,7 @@ public PromptTemplateSubstitutionResponse parsePromptTemplateById(
   @Nonnull
   public PromptTemplateSubstitutionResponse parsePromptTemplateById(
       @Nonnull final UUID promptTemplateId) throws OpenApiRequestException {
-    return parsePromptTemplateById(promptTemplateId, null, null);
+    return parsePromptTemplateById(promptTemplateId, null, null, null);
   }
 
   /**
@@ -635,6 +785,7 @@ public PromptTemplateSubstitutionResponse parsePromptTemplateById(
    * @param scenario (required) The value for the parameter scenario
    * @param version (required) The value for the parameter version
    * @param name (required) The value for the parameter name
+   * @param aiResourceGroup (optional) Specify a resource group id to use
    * @param metadata (optional, default to false) The value for the parameter metadata
    * @param promptTemplateSubstitutionRequest (optional) The value for the parameter
    *     promptTemplateSubstitutionRequest
@@ -646,6 +797,7 @@ public PromptTemplateSubstitutionResponse parsePromptTemplateByNameVersion(
       @Nonnull final String scenario,
       @Nonnull final String version,
       @Nonnull final String name,
+      @Nullable final String aiResourceGroup,
       @Nullable final Boolean metadata,
       @Nullable final PromptTemplateSubstitutionRequest promptTemplateSubstitutionRequest)
       throws OpenApiRequestException {
@@ -688,6 +840,9 @@ public PromptTemplateSubstitutionResponse parsePromptTemplateByNameVersion(
 
     localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "metadata", metadata));
 
+    if (aiResourceGroup != null)
+      localVarHeaderParams.add("AI-Resource-Group", apiClient.parameterToString(aiResourceGroup));
+
     final String[] localVarAccepts = {"application/json"};
     final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
     final String[] localVarContentTypes = {"application/json"};
@@ -731,6 +886,6 @@ public PromptTemplateSubstitutionResponse parsePromptTemplateByNameVersion(
   public PromptTemplateSubstitutionResponse parsePromptTemplateByNameVersion(
       @Nonnull final String scenario, @Nonnull final String version, @Nonnull final String name)
       throws OpenApiRequestException {
-    return parsePromptTemplateByNameVersion(scenario, version, name, null, null);
+    return parsePromptTemplateByNameVersion(scenario, version, name, null, null, null);
   }
 }
diff --git a/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateGetResponse.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateGetResponse.java
index 1fed2af05..18ad9b2f4 100644
--- a/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateGetResponse.java
+++ b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/model/PromptTemplateGetResponse.java
@@ -50,6 +50,9 @@ public class PromptTemplateGetResponse
   @JsonProperty("isVersionHead")
   private Boolean isVersionHead;
 
+  @JsonProperty("resourceGroupId")
+  private String resourceGroupId;
+
   @JsonProperty("spec")
   private PromptTemplateSpec spec;
 
@@ -282,6 +285,38 @@ public void setIsVersionHead(@Nullable final Boolean isVersionHead) {
     this.isVersionHead = isVersionHead;
   }
 
+  /**
+   * Set the resourceGroupId of this {@link PromptTemplateGetResponse} instance and return the same
+   * instance.
+   *
+   * @param resourceGroupId The resourceGroupId of this {@link PromptTemplateGetResponse}
+   * @return The same instance of this {@link PromptTemplateGetResponse} class
+   */
+  @Nonnull
+  public PromptTemplateGetResponse resourceGroupId(@Nullable final String resourceGroupId) {
+    this.resourceGroupId = resourceGroupId;
+    return this;
+  }
+
+  /**
+   * Get resourceGroupId
+   *
+   * @return resourceGroupId The resourceGroupId of this {@link PromptTemplateGetResponse} instance.
+   */
+  @Nonnull
+  public String getResourceGroupId() {
+    return resourceGroupId;
+  }
+
+  /**
+   * Set the resourceGroupId of this {@link PromptTemplateGetResponse} instance.
+   *
+   * @param resourceGroupId The resourceGroupId of this {@link PromptTemplateGetResponse}
+   */
+  public void setResourceGroupId(@Nullable final String resourceGroupId) {
+    this.resourceGroupId = resourceGroupId;
+  }
+
   /**
    * Set the spec of this {@link PromptTemplateGetResponse} instance and return the same instance.
    *
@@ -359,6 +394,7 @@ public Map<String, Object> toMap() {
     if (creationTimestamp != null) declaredFields.put("creationTimestamp", creationTimestamp);
     if (managedBy != null) declaredFields.put("managedBy", managedBy);
     if (isVersionHead != null) declaredFields.put("isVersionHead", isVersionHead);
+    if (resourceGroupId != null) declaredFields.put("resourceGroupId", resourceGroupId);
     if (spec != null) declaredFields.put("spec", spec);
     return declaredFields;
   }
@@ -392,6 +428,7 @@ public boolean equals(@Nullable final java.lang.Object o) {
         && Objects.equals(this.creationTimestamp, promptTemplateGetResponse.creationTimestamp)
         && Objects.equals(this.managedBy, promptTemplateGetResponse.managedBy)
         && Objects.equals(this.isVersionHead, promptTemplateGetResponse.isVersionHead)
+        && Objects.equals(this.resourceGroupId, promptTemplateGetResponse.resourceGroupId)
         && Objects.equals(this.spec, promptTemplateGetResponse.spec);
   }
 
@@ -405,6 +442,7 @@ public int hashCode() {
         creationTimestamp,
         managedBy,
         isVersionHead,
+        resourceGroupId,
         spec,
         cloudSdkCustomFields);
   }
@@ -421,6 +459,7 @@ public String toString() {
     sb.append("    creationTimestamp: ").append(toIndentedString(creationTimestamp)).append("\n");
     sb.append("    managedBy: ").append(toIndentedString(managedBy)).append("\n");
     sb.append("    isVersionHead: ").append(toIndentedString(isVersionHead)).append("\n");
+    sb.append("    resourceGroupId: ").append(toIndentedString(resourceGroupId)).append("\n");
     sb.append("    spec: ").append(toIndentedString(spec)).append("\n");
     cloudSdkCustomFields.forEach(
         (k, v) ->
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 35a198ad0..a139dba0a 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
@@ -17,6 +17,8 @@ paths:
       description: Create or update a prompt template
       tags:
         - prompt templates
+      parameters:
+        - $ref: "#/components/parameters/ai-resource-group"
       requestBody:
         required: true
         content:
@@ -43,6 +45,7 @@ paths:
       tags:
         - prompt templates
       parameters:
+        - $ref: "#/components/parameters/ai-resource-group"
         - name: scenario
           in: query
           schema:
@@ -86,6 +89,7 @@ paths:
       tags:
         - prompt templates
       parameters:
+        - $ref: "#/components/parameters/ai-resource-group"
         - name: scenario
           in: path
           required: true
@@ -122,6 +126,7 @@ paths:
       tags:
         - prompt templates
       parameters:
+        - $ref: "#/components/parameters/ai-resource-group"
         - name: promptTemplateId
           in: path
           required: true
@@ -148,6 +153,7 @@ paths:
       tags:
         - prompt templates
       parameters:
+        - $ref: "#/components/parameters/ai-resource-group"
         - name: promptTemplateId
           in: path
           required: true
@@ -174,6 +180,8 @@ paths:
       description: Import prompt template
       tags:
         - prompt templates
+      parameters:
+        - $ref: "#/components/parameters/ai-resource-group"
       requestBody:
         content:
           multipart/form-data:
@@ -202,6 +210,7 @@ paths:
       tags:
         - prompt templates
       parameters:
+        - $ref: "#/components/parameters/ai-resource-group"
         - name: promptTemplateId
           in: path
           required: true
@@ -228,6 +237,7 @@ paths:
       tags:
         - prompt templates
       parameters:
+        - $ref: "#/components/parameters/ai-resource-group"
         - name: promptTemplateId
           in: path
           required: true
@@ -265,6 +275,7 @@ paths:
       tags:
         - prompt templates
       parameters:
+        - $ref: "#/components/parameters/ai-resource-group"
         - name: scenario
           in: path
           required: true
@@ -594,6 +605,8 @@ components:
           type: string
         isVersionHead:
           type: boolean
+        resourceGroupId:
+          type: string
         spec:
           $ref: "#/components/schemas/PromptTemplateSpec"
     PromptTemplateListResponse:
@@ -682,3 +695,11 @@ components:
         application/json:
           schema:
             $ref: "#/components/schemas/ErrorResponse"
+  parameters:
+    ai-resource-group:
+      name: AI-Resource-Group
+      in: header
+      description: Specify a resource group id to use
+      required: false
+      schema:
+        type: string
\ No newline at end of file
diff --git a/docs/release_notes.md b/docs/release_notes.md
index 973c1201a..dfb9f3109 100644
--- a/docs/release_notes.md
+++ b/docs/release_notes.md
@@ -21,6 +21,10 @@
 - [Orchestration] `OrchestrationTemplate.withTemplate()` has been deprecated. Please use `OrchestrationTemplate.withTemplateMessages()` instead.
 - [Orchestration] The method `createConfig()` is removed from `ContentFilter`, `AzureContentFilter` and `LlamaGuardFilter` and is replaced by `createInputFilterConfig()` and `createOutputFilterConfig()`.
 
+- [Prompt Registry] Resource group has been added as a optional parameter to all endpoints. Set it to `"default"` if it was not set before. Examples:
+  - `client.importPromptTemplate(File)` --> `client.importPromptTemplate("default", File)`.
+  - `client.parsePromptTemplateById(id, false, inputParams)` --> `client.parsePromptTemplateById(id, "default", false, inputParams)`.
+
 ### ✨ New Functionality
 
 - [Orchestration] Added support for [transforming a JSON output into an entity](https://sap.github.io/ai-sdk/docs/java/orchestration/chat-completion#json_schema)
diff --git a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/PromptRegistryController.java b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/PromptRegistryController.java
index 67dc31ba8..cf8fdb513 100644
--- a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/PromptRegistryController.java
+++ b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/PromptRegistryController.java
@@ -70,7 +70,7 @@ PromptTemplateListResponse history() {
   @GetMapping("/importTemplate")
   PromptTemplatePostResponse importTemplate() throws IOException {
     final Resource template = new ClassPathResource("prompt-template.yaml");
-    return client.importPromptTemplate(template.getFile());
+    return client.importPromptTemplate("default", template.getFile());
   }
 
   @GetMapping("/exportTemplate")
@@ -84,6 +84,7 @@ PromptTemplateSubstitutionResponse useTemplate() {
     final var template = createTemplate();
     return client.parsePromptTemplateById(
         template.getId(),
+        "default",
         false,
         PromptTemplateSubstitutionRequest.create()
             .inputParams(Map.of("inputExample", "I love football")));