diff --git a/specification/communication/data-plane/Chat/preview/2023-07-01-preview/communicationserviceschat.json b/specification/communication/data-plane/Chat/preview/2023-07-01-preview/communicationserviceschat.json
index d4b627822d50..f8c4fd275c2c 100644
--- a/specification/communication/data-plane/Chat/preview/2023-07-01-preview/communicationserviceschat.json
+++ b/specification/communication/data-plane/Chat/preview/2023-07-01-preview/communicationserviceschat.json
@@ -1355,6 +1355,13 @@
           "description": "Time from which the chat history is shared with the participant. The timestamp is in RFC3339 format: `yyyy-MM-ddTHH:mm:ssZ`.",
           "type": "string",
           "example": "2020-10-30T10:50:50Z"
+        },
+        "metadata": {
+          "description": "Contextual metadata for the chat participant. The metadata consists of name/value pairs. The total size of all metadata pairs can be up to 1KB in size.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
         }
       }
     },
@@ -1619,8 +1626,12 @@
             "$ref": "#/definitions/ChatParticipant"
           }
         },
-        "retentionPolicy": {
-          "$ref": "#/definitions/ChatRetentionPolicy"
+        "metadata": {
+          "description": "Contextual metadata for the thread. The metadata consists of name/value pairs. The total size of all metadata pairs can be up to 1KB in size.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
         }
       }
     },
@@ -1659,8 +1670,12 @@
           "type": "string",
           "example": "2020-10-30T10:50:50Z"
         },
-        "retentionPolicy": {
-          "$ref": "#/definitions/ChatRetentionPolicy"
+        "metadata": {
+          "description": "Contextual metadata for the thread. The metadata consists of name/value pairs. The total size of all metadata pairs can be up to 1KB in size.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
         }
       }
     },
@@ -1711,9 +1726,6 @@
           "type": "string",
           "readOnly": true,
           "example": "2020-10-30T10:50:50Z"
-        },
-        "retentionPolicy": {
-          "$ref": "#/definitions/ChatRetentionPolicy"
         }
       }
     },
@@ -1746,6 +1758,13 @@
           "description": "Chat thread topic.",
           "type": "string",
           "example": "Lunch Thread"
+        },
+        "metadata": {
+          "description": "Contextual metadata for the thread. The metadata consists of name/value pairs. The total size of all metadata pairs can be up to 1KB in size.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
         }
       }
     },
@@ -1759,53 +1778,6 @@
           "example": "Bob Admin"
         }
       }
-    },
-    "ChatRetentionPolicy": {
-      "description": "Data retention policy for auto deletion. It's not updatable after creation.",
-      "type": "object",
-      "discriminator": "kind",
-      "properties": {
-        "kind": {
-          "description": "Retention Policy Type",
-          "enum": [
-            "threadCreationDate"
-          ],
-          "type": "string",
-          "x-ms-enum": {
-            "name": "RetentionPolicyKind",
-            "modelAsString": true,
-            "values": [
-              {
-                "value": "threadCreationDate",
-                "description": "Thread retention policy based on thread creation date."
-              }
-            ]
-          }
-        }
-      },
-      "required": [
-        "kind"
-      ]
-    },
-    "ThreadCreationDateRetentionPolicy": {
-      "description": "Thread retention policy based on thread creation date.",
-      "type": "object",
-      "x-ms-discriminator-value": "threadCreationDate",
-      "allOf": [
-        {
-          "$ref": "#/definitions/ChatRetentionPolicy"
-        }
-      ],
-      "properties": {
-        "deleteThreadAfterDays": {
-          "type": "integer",
-          "format": "int32",
-          "description": "Indicates how many days after the thread creation the thread will be deleted. Only 90 is accepted for now."
-        }
-      },
-      "required": [
-        "deleteThreadAfterDays"
-      ]
     }
   },
   "parameters": {
diff --git a/specification/communication/data-plane/Chat/preview/2023-07-01-preview/examples/Threads_CreateChatThread.json b/specification/communication/data-plane/Chat/preview/2023-07-01-preview/examples/Threads_CreateChatThread.json
index fcb2c48ecdf5..03098d631638 100644
--- a/specification/communication/data-plane/Chat/preview/2023-07-01-preview/examples/Threads_CreateChatThread.json
+++ b/specification/communication/data-plane/Chat/preview/2023-07-01-preview/examples/Threads_CreateChatThread.json
@@ -41,11 +41,7 @@
           },
           "displayName": "Peter"
         }
-      ],
-      "retentionPolicy": {
-        "kind": "threadCreationDate",
-        "deleteThreadAfterDays": 90
-      }
+      ]
     }
   },
   "responses": {
@@ -63,10 +59,6 @@
             "communicationUser": {
               "id": "8:acs:8540c0de-899f-5cce-acb5-3ec493af3800_c94ff260-162d-46d6-94fd-e79f4d213715"
             }
-          },
-          "retentionPolicy": {
-            "kind": "threadCreationDate",
-            "deleteThreadAfterDays": 90
           }
         },
         "invalidParticipants": [
diff --git a/specification/communication/data-plane/Chat/preview/2023-07-01-preview/examples/Threads_GetChatThread.json b/specification/communication/data-plane/Chat/preview/2023-07-01-preview/examples/Threads_GetChatThread.json
index f05a95473143..c8e186c0f68c 100644
--- a/specification/communication/data-plane/Chat/preview/2023-07-01-preview/examples/Threads_GetChatThread.json
+++ b/specification/communication/data-plane/Chat/preview/2023-07-01-preview/examples/Threads_GetChatThread.json
@@ -10,10 +10,6 @@
         "id": "19:uni01_zbnh3nt2dfuffezc3sox7dog7wfhk6y5qe2rwlnfhlhdzirihdpq@thread.v2",
         "topic": "Lunch",
         "createdOn": "2020-06-06T05:55:41.6460000Z",
-        "retentionPolicy": {
-          "kind": "threadCreationDate",
-          "deleteThreadAfterDays": 90
-        },
         "createdByCommunicationIdentifier": {
           "rawId": "8:acs:8540c0de-899f-5cce-acb5-3ec493af3800_0e59221d-0c1d-46ae-9544-c963ce56c10b",
           "communicationUser": {