diff --git a/en/asgardeo/docs/apis/organization-apis/restapis/claim-management.yaml b/en/asgardeo/docs/apis/organization-apis/restapis/claim-management.yaml
index 81e3763bee..b4c4af498e 100644
--- a/en/asgardeo/docs/apis/organization-apis/restapis/claim-management.yaml
+++ b/en/asgardeo/docs/apis/organization-apis/restapis/claim-management.yaml
@@ -503,6 +503,11 @@ components:
           type: string
           description: The local claim URI to map with the external claim.
           example: http://wso2.org/claims/username
+        properties:
+          type: array
+          description: Define any additional properties if required.
+          items:
+            $ref: '#/components/schemas/Property'
       description: External claim response.
     Property:
       required:
diff --git a/en/identity-server/next/docs/apis/organization-apis/restapis/claim-mgt.yaml b/en/identity-server/next/docs/apis/organization-apis/restapis/claim-mgt.yaml
index a50c98a4c6..fd807937bb 100644
--- a/en/identity-server/next/docs/apis/organization-apis/restapis/claim-mgt.yaml
+++ b/en/identity-server/next/docs/apis/organization-apis/restapis/claim-mgt.yaml
@@ -507,6 +507,11 @@ components:
           type: string
           description: The local claim URI to map with the external claim.
           example: http://wso2.org/claims/username
+        properties:
+          type: array
+          description: Define any additional properties if required.
+          items:
+            $ref: '#/components/schemas/Property'
       description: External claim response.
     Property:
       required:
diff --git a/en/identity-server/next/docs/apis/restapis/claim-management.yaml b/en/identity-server/next/docs/apis/restapis/claim-management.yaml
index 74d2c604ac..e2410da268 100644
--- a/en/identity-server/next/docs/apis/restapis/claim-management.yaml
+++ b/en/identity-server/next/docs/apis/restapis/claim-management.yaml
@@ -300,7 +300,7 @@ paths:
       tags:
       - management
       summary: Delete a local claim
-      description: Delete a claim by claim ID. <br>
+      description: Delete a claim by claim ID. Only custom claims can be deleted. <br>
         <br> <b>Scope(Permission) required:</b> `internal_claim_meta_delete`
       operationId: deleteLocalClaim
       parameters:
@@ -572,7 +572,7 @@ paths:
       tags:
       - management
       summary: Delete a claim dialect
-      description: Delete a claim dialect by claim ID. <br>
+      description: Delete a claim dialect by claim ID. Only custom claim dialects can be deleted. <br>
         <br><b>Scope(Permission) required:</b> `internal_claim_meta_delete`
       operationId: deleteClaimDialect
       parameters:
@@ -1013,7 +1013,7 @@ paths:
       tags:
       - management
       summary: Delete an external claim
-      description: Delete a claim by dialect ID and claim ID. <br>
+      description: Delete a claim by dialect ID and claim ID. Only custom claims can be deleted. <br>
         <br>  <b>Scope(Permission) required:</b> `internal_claim_meta_delete`
       operationId: deleteExternalClaim
       parameters:
@@ -1242,6 +1242,11 @@ components:
           type: string
           description: The local claim URI to map with the external claim.
           example: http://wso2.org/claims/username
+        properties:
+          type: array
+          description: Define any additional properties if required.
+          items:
+            $ref: '#/components/schemas/Property'
       description: External claim response.
     Property:
       required:
diff --git a/en/includes/guides/users/attributes/manage-attributes.md b/en/includes/guides/users/attributes/manage-attributes.md
index 651b0b3182..2361e685c8 100644
--- a/en/includes/guides/users/attributes/manage-attributes.md
+++ b/en/includes/guides/users/attributes/manage-attributes.md
@@ -104,6 +104,29 @@ To update the properties of a user attribute:
 
 {% endif %}
 
+## Delete attributes
+
+!!! warning "Before you proceed"
+
+    Attributes cannot be deleted if it has any associations with external schema. If you have attribute mappings, make sure you delete these associations before attempting to delete an attribute.
+    
+    Refer to [Delete an OpenID Connect attribute]({{base_path}}/guides/users/attributes/manage-oidc-attribute-mappings/#delete-an-openid-connect-attribute) and [Delete a SCIM2 attribute]({{base_path}}/guides/users/attributes/manage-scim2-attribute-mappings/#delete-a-scim-20-custom-schema-attribute) to delete any existing associations.
+
+
+To delete an attribute:
+
+1. On the {{ product_name }} Console, go to {{ attribute_path }} > **Attributes**.
+2. Click **Attributes** to see the list of attributes.
+3. Select the attribute you wish to delete.
+4. Click **Delete attribute** within the **Danger Zone**.
+5. Select the checkbox to confirm your action.
+6. Click **Confirm**.
+
+!!! note
+
+    Only custom attributes can be deleted.
+
+
 ## Assign multiple email addresses and mobile numbers to a user
 
 {{ product_name }} allows users to associate multiple email addresses and mobile numbers with their profiles. For users with multiple values, they may also select a primary email address and a primary mobile number.
@@ -136,4 +159,5 @@ For non-JDBC {{ 'secondary' if product_name == 'WSO2 Identity Server' else 'remo
    4. Find the corresponding user store and uncheck the **Enable for this user store** checkbox.
    5. Click **Update** to save the changes
 
-   ![Enable for user store]({{base_path}}/assets/img/guides/organization/attributes/enable-for-user-store.png){: width="500" style="display: block; margin: 0; border: 0.3px solid lightgrey;"}
\ No newline at end of file
+   ![Enable for user store]({{base_path}}/assets/img/guides/organization/attributes/enable-for-user-store.png){: width="500" style="display: block; margin: 0; border: 0.3px solid lightgrey;"}
+
diff --git a/en/includes/guides/users/attributes/manage-oidc-attribute-mappings.md b/en/includes/guides/users/attributes/manage-oidc-attribute-mappings.md
index 6c61dd9b17..77e5975631 100644
--- a/en/includes/guides/users/attributes/manage-oidc-attribute-mappings.md
+++ b/en/includes/guides/users/attributes/manage-oidc-attribute-mappings.md
@@ -86,4 +86,8 @@ To delete the OpenID Connect attributes available in your organization:
 2. Under **Manage Attribute Mappings**, click **OpenID Connect**.
 3. Select the attribute you wish to delete.
 3. Click **Delete** and select the checkbox to confirm your action.
-4. Click **Confirm**.
\ No newline at end of file
+4. Click **Confirm**.
+
+!!! note
+    
+    Only custom attributes can be deleted.
diff --git a/en/includes/guides/users/attributes/manage-scim2-attribute-mappings.md b/en/includes/guides/users/attributes/manage-scim2-attribute-mappings.md
index 31c103731f..7fb3387a21 100644
--- a/en/includes/guides/users/attributes/manage-scim2-attribute-mappings.md
+++ b/en/includes/guides/users/attributes/manage-scim2-attribute-mappings.md
@@ -50,4 +50,7 @@ To delete the SCIM 2.0 custom schema attributes available in your organization:
 2. Under **Manage Attribute Mappings**, click **SCIM 2.0**.
 3. Navigate to the **Custom Schema** tab and select the attribute to delete.
 3. Click **Delete** and select the checkbox to confirm you action.
-4. Click **Confirm**.
\ No newline at end of file
+4. Click **Confirm**.
+
+!!! note
+    Only custom attributes can be deleted.
\ No newline at end of file