diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/create.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/create.json
index 0d7c5d38400f..5b8b152044e2 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/create.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/create.json
@@ -8,7 +8,6 @@
     "api-version": "2024-04-01-preview",
     "body": {
       "properties": {
-        "type": "Azure.OpenAI",
         "model": {
           "format": "OpenAI",
           "name": "text-davinci-003",
@@ -31,7 +30,6 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
         "properties": {
-          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/get.json
index d78ff733ba16..139d7cadbe81 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/get.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/get.json
@@ -20,7 +20,6 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
         "properties": {
-          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getDeployments.json
index 555ad524d752..000a604af11e 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getDeployments.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getDeployments.json
@@ -21,7 +21,6 @@
             "name": "text-davinci-003",
             "type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
             "properties": {
-              "type": "Azure.OpenAI",
               "model": {
                 "format": "OpenAI",
                 "name": "text-davinci-003",
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getInWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getInWorkspace.json
index a10bd84719b2..adb99272c435 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getInWorkspace.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getInWorkspace.json
@@ -20,7 +20,6 @@
             "name": "text-davinci-003",
             "type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
             "properties": {
-              "type": "Azure.OpenAI",
               "model": {
                 "format": "OpenAI",
                 "name": "text-davinci-003",
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/createDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/createDeployment.json
index 0e63735ca681..4ca24a7da91f 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/createDeployment.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/createDeployment.json
@@ -8,7 +8,6 @@
     "api-version": "2024-04-01-preview",
     "body": {
       "properties": {
-        "type": "Azure.OpenAI",
         "model": {
           "format": "OpenAI",
           "name": "text-davinci-003",
@@ -31,7 +30,6 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
         "properties": {
-          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",
@@ -56,7 +54,6 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
         "properties": {
-          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/getDeployment.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/getDeployment.json
index e7ece185d1d8..d02138d739d1 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/getDeployment.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/getDeployment.json
@@ -20,7 +20,6 @@
         "name": "text-davinci-003",
         "type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
         "properties": {
-          "type": "Azure.OpenAI",
           "model": {
             "format": "OpenAI",
             "name": "text-davinci-003",
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/listDeployments.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/listDeployments.json
index 98edc266d7fd..14f2caf80ba5 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/listDeployments.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/listDeployments.json
@@ -21,7 +21,6 @@
             "name": "text-davinci-003",
             "type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
             "properties": {
-              "type": "Azure.OpenAI",
               "model": {
                 "format": "OpenAI",
                 "name": "text-davinci-003",
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/workspaceRP.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/workspaceRP.json
index 716135740c2b..15149610bbcd 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/workspaceRP.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/workspaceRP.json
@@ -3756,7 +3756,7 @@
       ],
       "properties": {
         "credentials": {
-          "$ref": "#/definitions/WorkspaceConnectionSharedAccessSignature"
+          "$ref": "#/definitions/WorkspaceConnectionAccountKey"
         }
       },
       "x-ms-discriminator-value": "AccountKey"
@@ -3928,9 +3928,6 @@
           "type": "string",
           "description": "The name of RAI policy."
         },
-        "sku": {
-          "$ref": "#/definitions/CognitiveServicesSku"
-        },
         "versionUpgradeOption": {
           "description": "Deployment model version upgrade option.",
           "type": "string",
@@ -4125,18 +4122,6 @@
         "modelAsString": true
       }
     },
-    "ContentSafetyEndpointDeploymentResourceProperties": {
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
-        },
-        {
-          "$ref": "#/definitions/EndpointDeploymentResourceProperties"
-        }
-      ],
-      "x-ms-discriminator-value": "Azure.ContentSafety"
-    },
     "ContentSafetyEndpointResourceProperties": {
       "type": "object",
       "allOf": [
@@ -4518,27 +4503,18 @@
       }
     },
     "EndpointDeploymentResourceProperties": {
-      "required": [
-        "type"
-      ],
       "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
+        }
+      ],
       "properties": {
-        "failureReason": {
-          "description": "The failure reason if the creation failed.",
-          "type": "string"
-        },
         "provisioningState": {
           "description": "Read-only provision state status property.",
           "$ref": "#/definitions/DefaultResourceProvisioningState"
-        },
-        "type": {
-          "description": "Kind of the deployment.",
-          "minLength": 1,
-          "pattern": "[a-zA-Z0-9._]",
-          "type": "string"
         }
-      },
-      "discriminator": "type"
+      }
     },
     "EndpointDeploymentResourcePropertiesBasicResource": {
       "required": [
@@ -4553,6 +4529,9 @@
       "properties": {
         "properties": {
           "$ref": "#/definitions/EndpointDeploymentResourceProperties"
+        },
+        "sku": {
+          "$ref": "#/definitions/CognitiveServicesSku"
         }
       }
     },
@@ -4975,15 +4954,6 @@
         "modelAsString": true
       }
     },
-    "ManagedOnlineEndpointDeploymentResourceProperties": {
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/EndpointDeploymentResourceProperties"
-        }
-      ],
-      "x-ms-discriminator-value": "managedOnlineEndpoint"
-    },
     "ManagedOnlineEndpointResourceProperties": {
       "type": "object",
       "allOf": [
@@ -5164,18 +5134,6 @@
       },
       "x-ms-discriminator-value": "OAuth2"
     },
-    "OpenAIEndpointDeploymentResourceProperties": {
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
-        },
-        {
-          "$ref": "#/definitions/EndpointDeploymentResourceProperties"
-        }
-      ],
-      "x-ms-discriminator-value": "Azure.OpenAI"
-    },
     "OpenAIEndpointResourceProperties": {
       "type": "object",
       "allOf": [
@@ -5992,18 +5950,6 @@
         }
       }
     },
-    "SpeechEndpointDeploymentResourceProperties": {
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
-        },
-        {
-          "$ref": "#/definitions/EndpointDeploymentResourceProperties"
-        }
-      ],
-      "x-ms-discriminator-value": "Azure.Speech"
-    },
     "SpeechEndpointResourceProperties": {
       "type": "object",
       "allOf": [
@@ -6279,6 +6225,14 @@
         }
       }
     },
+    "WorkspaceConnectionAccountKey": {
+      "type": "object",
+      "properties": {
+        "key": {
+          "type": "string"
+        }
+      }
+    },
     "WorkspaceConnectionUpdateParameter": {
       "description": "The properties that the machine learning workspace connection will be updated with.",
       "type": "object",
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2024-04-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2024-04-01/machineLearningServices.json
index de9a74144b7f..db6d2e18a504 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2024-04-01/machineLearningServices.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2024-04-01/machineLearningServices.json
@@ -6692,6 +6692,15 @@
       },
       "additionalProperties": false
     },
+    "WorkspaceConnectionAccountKey": {
+      "type": "object",
+      "properties": {
+        "key": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
     "SASAuthTypeWorkspaceConnectionProperties": {
       "type": "object",
       "allOf": [
@@ -7103,7 +7112,7 @@
       ],
       "properties": {
         "credentials": {
-          "$ref": "#/definitions/WorkspaceConnectionSharedAccessSignature"
+          "$ref": "#/definitions/WorkspaceConnectionAccountKey"
         }
       },
       "x-ms-discriminator-value": "AccountKey"