diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/Builders.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/Builders.json
new file mode 100644
index 000000000000..cd1e9fde63a1
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/Builders.json
@@ -0,0 +1,488 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ContainerApps API Client",
+    "version": "2023-05-01-preview"
+  },
+  "schemes": [
+    "https"
+  ],
+  "host": "management.azure.com",
+  "produces": [
+    "application/json"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "flow": "implicit",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.App/builders": {
+      "get": {
+        "tags": [
+          "Builders"
+        ],
+        "operationId": "Builders_ListBySubscription",
+        "description": "List BuilderResource resources by subscription ID",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ARM operation completed successfully.",
+            "schema": {
+              "$ref": "#/definitions/BuilderCollection"
+            }
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "Builders_ListBySubscription_0": {
+            "$ref": "./examples/Builders_ListBySubscription.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/builders": {
+      "get": {
+        "tags": [
+          "Builders"
+        ],
+        "operationId": "Builders_ListByResourceGroup",
+        "description": "List BuilderResource resources by resource group",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ARM operation completed successfully.",
+            "schema": {
+              "$ref": "#/definitions/BuilderCollection"
+            }
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "Builders_ListByResourceGroup_0": {
+            "$ref": "./examples/Builders_ListByResourceGroup.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/builders/{builderName}": {
+      "get": {
+        "tags": [
+          "Builders"
+        ],
+        "operationId": "Builders_Get",
+        "description": "Get a BuilderResource",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "name": "builderName",
+            "in": "path",
+            "required": true,
+            "description": "The name of the builder.",
+            "minLength": 2,
+            "maxLength": 32,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ARM operation completed successfully.",
+            "schema": {
+              "$ref": "#/definitions/BuilderResource"
+            }
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Builders_Get_0": {
+            "$ref": "./examples/Builders_Get.json"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Builders"
+        ],
+        "operationId": "Builders_CreateOrUpdate",
+        "description": "Create or update a BuilderResource",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "name": "builderName",
+            "in": "path",
+            "required": true,
+            "description": "The name of the builder.",
+            "minLength": 2,
+            "maxLength": 32,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          },
+          {
+            "name": "builderEnvelope",
+            "in": "body",
+            "required": true,
+            "description": "Resource create parameters.",
+            "schema": {
+              "$ref": "#/definitions/BuilderResource"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ARM create or update operation completed successfully.",
+            "schema": {
+              "$ref": "#/definitions/BuilderResource"
+            }
+          },
+          "201": {
+            "description": "ARM create or update operation has been started.",
+            "schema": {
+              "$ref": "#/definitions/BuilderResource"
+            },
+            "headers": {
+              "Azure-AsyncOperation": {
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "azure-async-operation"
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Builders_CreateOrUpdate_0": {
+            "$ref": "./examples/Builders_CreateOrUpdate.json"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Builders"
+        ],
+        "operationId": "Builders_Update",
+        "description": "Update a BuilderResource",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "name": "builderName",
+            "in": "path",
+            "required": true,
+            "description": "The name of the builder.",
+            "minLength": 2,
+            "maxLength": 32,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          },
+          {
+            "name": "builderEnvelope",
+            "in": "body",
+            "required": true,
+            "description": "The resource properties to be updated.",
+            "schema": {
+              "$ref": "#/definitions/BuilderResourceUpdate"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ARM operation completed successfully.",
+            "schema": {
+              "$ref": "#/definitions/BuilderResource"
+            }
+          },
+          "202": {
+            "description": "Resource update request accepted.",
+            "headers": {
+              "Location": {
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Builders_Update_0": {
+            "$ref": "./examples/Builders_Update.json"
+          }
+        },
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        },
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "Builders"
+        ],
+        "operationId": "Builders_Delete",
+        "description": "Delete a BuilderResource",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "name": "builderName",
+            "in": "path",
+            "required": true,
+            "description": "The name of the builder.",
+            "minLength": 2,
+            "maxLength": 32,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Resource deleted successfully."
+          },
+          "202": {
+            "description": "Resource deletion accepted.",
+            "headers": {
+              "Location": {
+                "type": "string"
+              }
+            }
+          },
+          "204": {
+            "description": "Resource deleted successfully."
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Builders_Delete_0": {
+            "$ref": "./examples/Builders_Delete.json"
+          }
+        },
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        },
+        "x-ms-long-running-operation": true
+      }
+    }
+  },
+  "definitions": {
+    "BuilderProperties": {
+      "type": "object",
+      "properties": {
+        "provisioningState": {
+          "$ref": "#/definitions/ProvisioningState",
+          "description": "Provisioning state of a builder resource.",
+          "readOnly": true
+        },
+        "environmentId": {
+          "type": "string",
+          "description": "Resource ID of the container apps environment that the builder is associated with."
+        },
+        "buildComputeId": {
+          "type": "string",
+          "description": "Resource ID of the compute that the builds will be performed on.",
+          "readOnly": true
+        },
+        "patchComputeId": {
+          "type": "string",
+          "description": "Resource ID of the compute that the patching will be performed on.",
+          "readOnly": true
+        }
+      },
+      "description": "The builder properties.",
+      "required": [
+        "environmentId"
+      ]
+    },
+    "BuilderResource": {
+      "type": "object",
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/BuilderProperties",
+          "description": "The resource-specific properties for this resource.",
+          "x-ms-client-flatten": true,
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ]
+        },
+        "identity": {
+          "$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity",
+          "description": "The managed service identities assigned to this resource."
+        }
+      },
+      "description": "Information about the SourceToCloud builder resource.",
+      "allOf": [
+        {
+          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+        }
+      ]
+    },
+    "BuilderCollection": {
+      "type": "object",
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BuilderResource"
+          },
+          "description": "The BuilderResource items on this page"
+        },
+        "nextLink": {
+          "type": "string",
+          "format": "uri",
+          "description": "The link to the next page of items"
+        }
+      },
+      "description": "The response of a BuilderResource list operation.",
+      "required": [
+        "value"
+      ]
+    },
+    "BuilderResourceUpdate": {
+      "type": "object",
+      "properties": {
+        "identity": {
+          "$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity",
+          "description": "The managed service identities assigned to this resource."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource tags."
+        },
+        "properties": {
+          "$ref": "#/definitions/BuilderResourceUpdateProperties",
+          "x-ms-client-flatten": true
+        }
+      },
+      "description": "The type used for update operations of the BuilderResource."
+    },
+    "BuilderResourceUpdateProperties": {
+      "type": "object",
+      "properties": {
+        "environmentId": {
+          "type": "string",
+          "description": "Resource ID of the container apps environment that the builder is associated with."
+        }
+      },
+      "description": "The updatable properties of the BuilderResource."
+    },
+    "ProvisioningState": {
+      "type": "string",
+      "description": "Resource instance provisioning state.",
+      "enum": [
+        "Succeeded",
+        "Failed",
+        "Canceled",
+        "InProgress",
+        "Deleting"
+      ],
+      "x-ms-enum": {
+        "name": "ProvisioningState",
+        "modelAsString": true
+      },
+      "readOnly": true
+    }
+  },
+  "parameters": {}
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/Builds.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/Builds.json
new file mode 100644
index 000000000000..df5aa0e85c1f
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/Builds.json
@@ -0,0 +1,527 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ContainerApps API Client",
+    "version": "2023-05-01-preview"
+  },
+  "schemes": [
+    "https"
+  ],
+  "host": "management.azure.com",
+  "produces": [
+    "application/json"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "flow": "implicit",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/builders/{builderName}/builds": {
+      "get": {
+        "tags": [
+          "Builds"
+        ],
+        "operationId": "Builds_ListByBuilderResource",
+        "description": "List BuildResource resources by BuilderResource",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "name": "builderName",
+            "in": "path",
+            "required": true,
+            "description": "The name of the builder.",
+            "minLength": 2,
+            "maxLength": 32,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ARM operation completed successfully.",
+            "schema": {
+              "$ref": "#/definitions/BuildCollection"
+            }
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "Builds_ListByBuilderResource_0": {
+            "$ref": "./examples/Builds_ListByBuilderResource.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/builders/{builderName}/builds/{buildName}": {
+      "get": {
+        "tags": [
+          "Builds"
+        ],
+        "operationId": "Builds_Get",
+        "description": "Get a BuildResource",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "name": "builderName",
+            "in": "path",
+            "required": true,
+            "description": "The name of the builder.",
+            "minLength": 2,
+            "maxLength": 32,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          },
+          {
+            "name": "buildName",
+            "in": "path",
+            "required": true,
+            "description": "The name of a build.",
+            "minLength": 2,
+            "maxLength": 64,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ARM operation completed successfully.",
+            "schema": {
+              "$ref": "#/definitions/BuildResource"
+            }
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Builds_Get_0": {
+            "$ref": "./examples/Builds_Get.json"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Builds"
+        ],
+        "operationId": "Builds_CreateOrUpdate",
+        "description": "Create a BuildResource",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "name": "builderName",
+            "in": "path",
+            "required": true,
+            "description": "The name of the builder.",
+            "minLength": 2,
+            "maxLength": 32,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          },
+          {
+            "name": "buildName",
+            "in": "path",
+            "required": true,
+            "description": "The name of a build.",
+            "minLength": 2,
+            "maxLength": 64,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          },
+          {
+            "name": "buildEnvelope",
+            "in": "body",
+            "required": true,
+            "description": "Resource create or update parameters.",
+            "schema": {
+              "$ref": "#/definitions/BuildResource"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ARM create or update operation completed successfully.",
+            "schema": {
+              "$ref": "#/definitions/BuildResource"
+            }
+          },
+          "201": {
+            "description": "ARM create or update operation has been started.",
+            "schema": {
+              "$ref": "#/definitions/BuildResource"
+            },
+            "headers": {
+              "Azure-AsyncOperation": {
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "azure-async-operation"
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Builds_CreateOrUpdate_WithConfig": {
+            "$ref": "./examples/Builds_CreateOrUpdate.json"
+          },
+          "Builds_CreateOrUpdate_NoConfig": {
+            "$ref": "./examples/Builds_CreateOrUpdate_NoConfig.json"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Builds"
+        ],
+        "operationId": "Builds_Delete",
+        "description": "Delete a BuildResource",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "name": "builderName",
+            "in": "path",
+            "required": true,
+            "description": "The name of the builder.",
+            "minLength": 2,
+            "maxLength": 32,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          },
+          {
+            "name": "buildName",
+            "in": "path",
+            "required": true,
+            "description": "The name of a build.",
+            "minLength": 2,
+            "maxLength": 64,
+            "type": "string",
+            "pattern": "^[-\\w\\._\\(\\)]+$"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Resource deleted successfully."
+          },
+          "202": {
+            "description": "Resource deletion accepted.",
+            "headers": {
+              "Location": {
+                "type": "string"
+              }
+            }
+          },
+          "204": {
+            "description": "Resource deleted successfully."
+          },
+          "default": {
+            "description": "Common error response.",
+            "schema": {
+              "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Builds_Delete_0": {
+            "$ref": "./examples/Builds_Delete.json"
+          }
+        },
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        },
+        "x-ms-long-running-operation": true
+      }
+    }
+  },
+  "definitions": {
+    "BuildConfiguration": {
+      "type": "object",
+      "properties": {
+        "baseOs": {
+          "type": "string",
+          "description": "Base OS used to build and run the app."
+        },
+        "platform": {
+          "type": "string",
+          "description": "Platform to be used to build and run the app."
+        },
+        "platformVersion": {
+          "type": "string",
+          "description": "Platform version to be used to build and run the app."
+        },
+        "environmentVariables": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/EnvironmentVariable"
+          },
+          "x-ms-identifiers": [
+            "name"
+          ],
+          "description": "List of environment variables to be passed to the build and application runtime."
+        },
+        "preBuildSteps": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PreBuildStep"
+          },
+          "x-ms-identifiers": [],
+          "description": "List of steps to perform before the build."
+        }
+      },
+      "description": "Configuration of the build."
+    },
+    "BuildProperties": {
+      "type": "object",
+      "properties": {
+        "provisioningState": {
+          "$ref": "#/definitions/ProvisioningState",
+          "description": "Build provisioning state.",
+          "readOnly": true
+        },
+        "buildStatus": {
+          "$ref": "#/definitions/BuildStatus",
+          "description": "Status of the build once it has been provisioned.",
+          "readOnly": true
+        },
+        "destinationContainerRegistry": {
+          "$ref": "#/definitions/ContainerRegistryWithCustomImage",
+          "description": "Container registry that the final image will be uploaded to."
+        },
+        "configuration": {
+          "$ref": "#/definitions/BuildConfiguration",
+          "description": "Configuration of the build."
+        },
+        "uploadEndpoint": {
+          "type": "string",
+          "description": "Endpoint to which the source code should be uploaded.",
+          "readOnly": true
+        }
+      },
+      "description": "The build properties."
+    },
+    "BuildResource": {
+      "type": "object",
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/BuildProperties",
+          "description": "The resource-specific properties for this resource.",
+          "x-ms-client-flatten": true,
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ]
+        }
+      },
+      "description": "Information pertaining to an individual build.",
+      "allOf": [
+        {
+          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+        }
+      ]
+    },
+    "BuildCollection": {
+      "type": "object",
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BuildResource"
+          },
+          "description": "The BuildResource items on this page"
+        },
+        "nextLink": {
+          "type": "string",
+          "format": "uri",
+          "description": "The link to the next page of items"
+        }
+      },
+      "description": "The response of a BuildResource list operation.",
+      "required": [
+        "value"
+      ]
+    },
+    "BuildStatus": {
+      "type": "string",
+      "description": "Status of the build once it has been provisioned.",
+      "enum": [
+        "NotStarted",
+        "InProgress",
+        "Succeeded",
+        "Canceled",
+        "Failed"
+      ],
+      "x-ms-enum": {
+        "name": "BuildStatus",
+        "modelAsString": true
+      }
+    },
+    "ContainerRegistryWithCustomImage": {
+      "type": "object",
+      "properties": {
+        "server": {
+          "type": "string",
+          "description": "Login server of the container registry that the final image should be uploaded to."
+        },
+        "identity": {
+          "type": "string",
+          "description": "Full user-assigned identity Resource ID for the managed identity that should be used to connect to the container registry."
+        },
+        "image": {
+          "type": "string",
+          "description": "Full name that the final image should be uploaded as, including both image name and tag."
+        }
+      },
+      "description": "Container registry that the final image will be uploaded to.",
+      "required": [
+        "server",
+        "identity"
+      ]
+    },
+    "EnvironmentVariable": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Environment variable name."
+        },
+        "value": {
+          "type": "string",
+          "description": "Environment variable value."
+        }
+      },
+      "description": "Model representing an environment variable.",
+      "required": [
+        "name",
+        "value"
+      ]
+    },
+    "HttpGet": {
+      "type": "object",
+      "properties": {
+        "url": {
+          "type": "string",
+          "description": "URL to make HTTP GET request against."
+        },
+        "fileName": {
+          "type": "string",
+          "description": "Name of the file that the request should be saved to."
+        },
+        "headers": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of headers to send with the request."
+        }
+      },
+      "description": "Model representing a http get request.",
+      "required": [
+        "url"
+      ]
+    },
+    "PreBuildStep": {
+      "type": "object",
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Description of the pre-build step."
+        },
+        "scripts": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of custom commands to run."
+        },
+        "httpGet": {
+          "$ref": "#/definitions/HttpGet",
+          "description": "Http get request to send before the build.",
+          "x-ms-identifiers": []
+        }
+      },
+      "description": "Model representing a pre-build step."
+    },
+    "ProvisioningState": {
+      "type": "string",
+      "description": "Resource instance provisioning state.",
+      "enum": [
+        "Succeeded",
+        "Failed",
+        "Canceled",
+        "InProgress",
+        "Deleting"
+      ],
+      "x-ms-enum": {
+        "name": "ProvisioningState",
+        "modelAsString": true
+      },
+      "readOnly": true
+    }
+  },
+  "parameters": {}
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_CreateOrUpdate.json
new file mode 100644
index 000000000000..3e18b5617d1d
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_CreateOrUpdate.json
@@ -0,0 +1,102 @@
+{
+  "operationId": "Builders_CreateOrUpdate",
+  "title": "Builders_CreateOrUpdate_0",
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "builderName": "testBuilder",
+    "api-version": "2023-05-01-preview",
+    "builderEnvelope": {
+      "identity": {
+        "type": "SystemAssigned,UserAssigned",
+        "userAssignedIdentities": {
+          "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
+        }
+      },
+      "properties": {
+        "environmentId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv"
+      },
+      "tags": {
+        "company": "Microsoft"
+      },
+      "location": "eastus"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
+        "name": "testBuilder",
+        "type": "Microsoft.App/builders",
+        "location": "eastus",
+        "identity": {
+          "type": "SystemAssigned,UserAssigned",
+          "principalId": "00000000-0000-0000-0000-000000000000",
+          "tenantId": "00000000-0000-0000-0000-000000000000",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
+        "properties": {
+          "provisioningState": "Succeeded",
+          "environmentId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
+          "buildComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
+          "patchComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234"
+        },
+        "systemData": {
+          "createdBy": "sample@microsoft.com",
+          "createdByType": "User",
+          "createdAt": "2022-10-11T11:05:51.4940669Z",
+          "lastModifiedBy": "sample@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+        },
+        "tags": {
+          "company": "Microsoft"
+        }
+      }
+    },
+    "201": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
+        "name": "testBuilder",
+        "type": "Microsoft.App/builders",
+        "location": "eastus",
+        "identity": {
+          "type": "SystemAssigned,UserAssigned",
+          "principalId": "00000000-0000-0000-0000-000000000000",
+          "tenantId": "00000000-0000-0000-0000-000000000000",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
+        "properties": {
+          "provisioningState": "Succeeded",
+          "environmentId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
+          "buildComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
+          "patchComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234"
+        },
+        "systemData": {
+          "createdBy": "sample@microsoft.com",
+          "createdByType": "User",
+          "createdAt": "2022-10-11T11:05:51.4940669Z",
+          "lastModifiedBy": "sample@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+        },
+        "tags": {
+          "company": "Microsoft"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_Delete.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_Delete.json
new file mode 100644
index 000000000000..fe69bd5a8e5e
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_Delete.json
@@ -0,0 +1,19 @@
+{
+  "operationId": "Builders_Delete",
+  "title": "Builders_Delete_0",
+  "parameters": {
+    "api-version": "2023-05-01-preview",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "builderName": "testBuilder"
+  },
+  "responses": {
+    "200": {},
+    "202": {
+      "headers": {
+        "Location": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
+      }
+    },
+    "204": {}
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_Get.json
new file mode 100644
index 000000000000..94bc07d0c885
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_Get.json
@@ -0,0 +1,48 @@
+{
+  "operationId": "Builders_Get",
+  "title": "Builders_Get_0",
+  "parameters": {
+    "api-version": "2023-05-01-preview",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "builderName": "testBuilder"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
+        "name": "testBuilder",
+        "type": "Microsoft.App/builders",
+        "location": "eastus",
+        "identity": {
+          "type": "SystemAssigned,UserAssigned",
+          "principalId": "00000000-0000-0000-0000-000000000000",
+          "tenantId": "00000000-0000-0000-0000-000000000000",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
+        "properties": {
+          "provisioningState": "Succeeded",
+          "environmentId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
+          "buildComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
+          "patchComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234"
+        },
+        "systemData": {
+          "createdBy": "sample@microsoft.com",
+          "createdByType": "User",
+          "createdAt": "2022-10-11T11:05:51.4940669Z",
+          "lastModifiedBy": "sample@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+        },
+        "tags": {
+          "key": "value"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_ListByResourceGroup.json
new file mode 100644
index 000000000000..51c15e32ff84
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_ListByResourceGroup.json
@@ -0,0 +1,86 @@
+{
+  "operationId": "Builders_ListByResourceGroup",
+  "title": "Builders_ListByResourceGroup_0",
+  "parameters": {
+    "api-version": "2023-05-01-preview",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder1",
+            "name": "testBuilder1",
+            "type": "Microsoft.App/builders",
+            "location": "eastus",
+            "identity": {
+              "type": "SystemAssigned,UserAssigned",
+              "principalId": "00000000-0000-0000-0000-000000000000",
+              "tenantId": "00000000-0000-0000-0000-000000000000",
+              "userAssignedIdentities": {
+                "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+                  "clientId": "00000000-0000-0000-0000-000000000000",
+                  "principalId": "00000000-0000-0000-0000-000000000000"
+                }
+              }
+            },
+            "properties": {
+              "provisioningState": "Succeeded",
+              "environmentId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
+              "buildComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
+              "patchComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234"
+            },
+            "systemData": {
+              "createdBy": "sample@microsoft.com",
+              "createdByType": "User",
+              "createdAt": "2022-10-11T11:05:51.4940669Z",
+              "lastModifiedBy": "sample@microsoft.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+            },
+            "tags": {
+              "key": "value"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder2",
+            "name": "testBuilder2",
+            "type": "Microsoft.App/builders",
+            "location": "eastus",
+            "identity": {
+              "type": "SystemAssigned,UserAssigned",
+              "principalId": "00000000-0000-0000-0000-000000000000",
+              "tenantId": "00000000-0000-0000-0000-000000000000",
+              "userAssignedIdentities": {
+                "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+                  "clientId": "00000000-0000-0000-0000-000000000000",
+                  "principalId": "00000000-0000-0000-0000-000000000000"
+                }
+              }
+            },
+            "properties": {
+              "provisioningState": "Succeeded",
+              "environmentId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
+              "buildComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
+              "patchComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234"
+            },
+            "systemData": {
+              "createdBy": "sample@microsoft.com",
+              "createdByType": "User",
+              "createdAt": "2022-10-11T11:05:51.4940669Z",
+              "lastModifiedBy": "sample@microsoft.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+            },
+            "tags": {
+              "key": "value"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_ListBySubscription.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_ListBySubscription.json
new file mode 100644
index 000000000000..959e95fa3dfc
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_ListBySubscription.json
@@ -0,0 +1,85 @@
+{
+  "operationId": "Builders_ListBySubscription",
+  "title": "Builders_ListBySubscription_0",
+  "parameters": {
+    "api-version": "2023-05-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.App/builders/testBuilder1",
+            "name": "testBuilder1",
+            "type": "Microsoft.App/builders",
+            "location": "eastus",
+            "identity": {
+              "type": "SystemAssigned,UserAssigned",
+              "principalId": "00000000-0000-0000-0000-000000000000",
+              "tenantId": "00000000-0000-0000-0000-000000000000",
+              "userAssignedIdentities": {
+                "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+                  "clientId": "00000000-0000-0000-0000-000000000000",
+                  "principalId": "00000000-0000-0000-0000-000000000000"
+                }
+              }
+            },
+            "properties": {
+              "provisioningState": "Succeeded",
+              "environmentId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
+              "buildComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
+              "patchComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234"
+            },
+            "systemData": {
+              "createdBy": "sample@microsoft.com",
+              "createdByType": "User",
+              "createdAt": "2022-10-11T11:05:51.4940669Z",
+              "lastModifiedBy": "sample@microsoft.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+            },
+            "tags": {
+              "key": "value"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg2/providers/Microsoft.App/builders/testBuilder2",
+            "name": "testBuilder2",
+            "type": "Microsoft.App/builders",
+            "location": "eastus",
+            "identity": {
+              "type": "SystemAssigned,UserAssigned",
+              "principalId": "00000000-0000-0000-0000-000000000000",
+              "tenantId": "00000000-0000-0000-0000-000000000000",
+              "userAssignedIdentities": {
+                "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+                  "clientId": "00000000-0000-0000-0000-000000000000",
+                  "principalId": "00000000-0000-0000-0000-000000000000"
+                }
+              }
+            },
+            "properties": {
+              "provisioningState": "Succeeded",
+              "environmentId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
+              "buildComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
+              "patchComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234"
+            },
+            "systemData": {
+              "createdBy": "sample@microsoft.com",
+              "createdByType": "User",
+              "createdAt": "2022-10-11T11:05:51.4940669Z",
+              "lastModifiedBy": "sample@microsoft.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+            },
+            "tags": {
+              "key": "value"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_Update.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_Update.json
new file mode 100644
index 000000000000..23e35494d3b0
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builders_Update.json
@@ -0,0 +1,58 @@
+{
+  "operationId": "Builders_Update",
+  "title": "Builders_Update_0",
+  "parameters": {
+    "api-version": "2023-05-01-preview",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "builderName": "testBuilder",
+    "builderEnvelope": {
+      "tags": {
+        "mytag1": "myvalue1"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
+        "name": "testBuilder",
+        "type": "Microsoft.App/builders",
+        "location": "eastus",
+        "identity": {
+          "type": "SystemAssigned,UserAssigned",
+          "principalId": "00000000-0000-0000-0000-000000000000",
+          "tenantId": "00000000-0000-0000-0000-000000000000",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+              "clientId": "00000000-0000-0000-0000-000000000000",
+              "principalId": "00000000-0000-0000-0000-000000000000"
+            }
+          }
+        },
+        "properties": {
+          "provisioningState": "Succeeded",
+          "environmentId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
+          "buildComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
+          "patchComputeId": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234"
+        },
+        "systemData": {
+          "createdBy": "sample@microsoft.com",
+          "createdByType": "User",
+          "createdAt": "2022-10-11T11:05:51.4940669Z",
+          "lastModifiedBy": "sample@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+        },
+        "tags": {
+          "mytag1": "myvalue1"
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "Location": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
+      }
+    }
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_CreateOrUpdate.json
new file mode 100644
index 000000000000..a9c2cedf43fa
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_CreateOrUpdate.json
@@ -0,0 +1,213 @@
+{
+  "operationId": "Builds_CreateOrUpdate",
+  "title": "Builds_CreateOrUpdate_WithConfig",
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "builderName": "testBuilder",
+    "buildName": "testBuild-123456789az",
+    "api-version": "2023-05-01-preview",
+    "buildEnvelope": {
+      "properties": {
+        "destinationContainerRegistry": {
+          "server": "test.azurecr.io",
+          "identity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1",
+          "image": "test.azurecr.io/repo:tag"
+        },
+        "configuration": {
+          "baseOs": "DebianBullseye",
+          "platform": "dotnetcore",
+          "platformVersion": "7.0",
+          "environmentVariables": [
+            {
+              "name": "foo1",
+              "value": "bar1"
+            },
+            {
+              "name": "foo2",
+              "value": "bar2"
+            }
+          ],
+          "preBuildSteps": [
+            {
+              "description": "First pre build step.",
+              "scripts": [
+                "echo 'hello'",
+                "echo 'world'"
+              ],
+              "httpGet": {
+                "url": "https://microsoft.com",
+                "fileName": "output.txt",
+                "headers": [
+                  "foo",
+                  "bar"
+                ]
+              }
+            },
+            {
+              "description": "Second pre build step.",
+              "scripts": [
+                "echo 'hello'",
+                "echo 'again'"
+              ],
+              "httpGet": {
+                "url": "https://microsoft.com",
+                "fileName": "output.txt",
+                "headers": [
+                  "foo"
+                ]
+              }
+            }
+          ]
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder/builds/testBuild-123456789az",
+        "name": "testBuild-123456789az",
+        "type": "Microsoft.App/builders/builds",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "buildStatus": "InProgress",
+          "destinationContainerRegistry": {
+            "server": "test.azurecr.io",
+            "identity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1",
+            "image": "test.azurecr.io/repo:tag"
+          },
+          "configuration": {
+            "baseOs": "DebianBullseye",
+            "platform": "dotnetcore",
+            "platformVersion": "7.0",
+            "environmentVariables": [
+              {
+                "name": "foo1",
+                "value": "bar1"
+              },
+              {
+                "name": "foo2",
+                "value": "bar2"
+              }
+            ],
+            "preBuildSteps": [
+              {
+                "description": "First pre build step.",
+                "scripts": [
+                  "echo 'hello'",
+                  "echo 'world'"
+                ],
+                "httpGet": {
+                  "url": "https://microsoft.com",
+                  "fileName": "output.txt",
+                  "headers": [
+                    "foo",
+                    "bar"
+                  ]
+                }
+              },
+              {
+                "description": "Second pre build step.",
+                "scripts": [
+                  "echo 'hello'",
+                  "echo 'again'"
+                ],
+                "httpGet": {
+                  "url": "https://microsoft.com",
+                  "fileName": "output.txt",
+                  "headers": [
+                    "foo"
+                  ]
+                }
+              }
+            ]
+          },
+          "uploadEndpoint": "foo.azurecontainerapps.dev/upload"
+        },
+        "systemData": {
+          "createdBy": "sample@microsoft.com",
+          "createdByType": "User",
+          "createdAt": "2022-10-11T11:05:51.4940669Z",
+          "lastModifiedBy": "sample@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+        }
+      }
+    },
+    "201": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder/builds/testBuild",
+        "name": "testBuild",
+        "type": "Microsoft.App/build",
+        "properties": {
+          "provisioningState": "Creating",
+          "buildStatus": "NotStarted",
+          "destinationContainerRegistry": {
+            "server": "test.azurecr.io",
+            "identity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1",
+            "image": "test.azurecr.io/repo:tag"
+          },
+          "configuration": {
+            "baseOs": "DebianBullseye",
+            "platform": "dotnetcore",
+            "platformVersion": "7.0",
+            "environmentVariables": [
+              {
+                "name": "foo1",
+                "value": "bar1"
+              },
+              {
+                "name": "foo2",
+                "value": "bar2"
+              }
+            ],
+            "preBuildSteps": [
+              {
+                "description": "First pre build step.",
+                "scripts": [
+                  "echo 'hello'",
+                  "echo 'world'"
+                ],
+                "httpGet": {
+                  "url": "https://microsoft.com",
+                  "fileName": "output.txt",
+                  "headers": [
+                    "foo",
+                    "bar"
+                  ]
+                }
+              },
+              {
+                "description": "Second pre build step.",
+                "scripts": [
+                  "echo 'hello'",
+                  "echo 'again'"
+                ],
+                "httpGet": {
+                  "url": "https://microsoft.com",
+                  "fileName": "output.txt",
+                  "headers": [
+                    "foo"
+                  ]
+                }
+              }
+            ]
+          },
+          "uploadEndpoint": "foo.azurecontainerapps.dev/upload"
+        },
+        "systemData": {
+          "createdBy": "sample@microsoft.com",
+          "createdByType": "User",
+          "createdAt": "2022-10-11T11:05:51.4940669Z",
+          "lastModifiedBy": "sample@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_CreateOrUpdate_NoConfig.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_CreateOrUpdate_NoConfig.json
new file mode 100644
index 000000000000..7cc836f0082a
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_CreateOrUpdate_NoConfig.json
@@ -0,0 +1,57 @@
+{
+  "operationId": "Builds_CreateOrUpdate",
+  "title": "Builds_CreateOrUpdate_NoConfig",
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "builderName": "testBuilder",
+    "buildName": "testBuild",
+    "api-version": "2023-05-01-preview",
+    "buildEnvelope": {}
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder/builds/testBuild",
+        "name": "testBuild",
+        "type": "Microsoft.App/builders/builds",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "buildStatus": "InProgress",
+          "uploadEndpoint": "https://testStorage.blob.core.windows.net/buildGUID/blobName"
+        },
+        "systemData": {
+          "createdBy": "sample@microsoft.com",
+          "createdByType": "User",
+          "createdAt": "2022-10-11T11:05:51.4940669Z",
+          "lastModifiedBy": "sample@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+        }
+      }
+    },
+    "201": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder/builds/testBuild",
+        "name": "testBuild",
+        "type": "Microsoft.App/build",
+        "properties": {
+          "provisioningState": "Creating",
+          "buildStatus": "InProgress",
+          "uploadEndpoint": "https://testStorage.blob.core.windows.net/buildGUID/blobName"
+        },
+        "systemData": {
+          "createdBy": "sample@microsoft.com",
+          "createdByType": "User",
+          "createdAt": "2022-10-11T11:05:51.4940669Z",
+          "lastModifiedBy": "sample@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_Delete.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_Delete.json
new file mode 100644
index 000000000000..afc6619e8d46
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_Delete.json
@@ -0,0 +1,20 @@
+{
+  "operationId": "Builds_Delete",
+  "title": "Builds_Delete_0",
+  "parameters": {
+    "api-version": "2023-05-01-preview",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "builderName": "testBuilder",
+    "buildName": "testBuild"
+  },
+  "responses": {
+    "200": {},
+    "202": {
+      "headers": {
+        "Location": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
+      }
+    },
+    "204": {}
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_Get.json
new file mode 100644
index 000000000000..646c17d45019
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_Get.json
@@ -0,0 +1,84 @@
+{
+  "operationId": "Builds_Get",
+  "title": "Builds_Get_0",
+  "parameters": {
+    "api-version": "2023-05-01-preview",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "builderName": "testBuilder",
+    "buildName": "testBuild"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder/builds/testBuild",
+        "name": "testBuild",
+        "type": "Microsoft.App/builders/builds",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "buildStatus": "InProgress",
+          "destinationContainerRegistry": {
+            "server": "test.azurecr.io",
+            "identity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1",
+            "image": "test.azurecr.io/repo:tag"
+          },
+          "configuration": {
+            "baseOs": "DebianBullseye",
+            "platform": "dotnetcore",
+            "platformVersion": "7.0",
+            "environmentVariables": [
+              {
+                "name": "foo1",
+                "value": "bar1"
+              },
+              {
+                "name": "foo2",
+                "value": "bar2"
+              }
+            ],
+            "preBuildSteps": [
+              {
+                "description": "First pre build step.",
+                "scripts": [
+                  "echo 'hello'",
+                  "echo 'world'"
+                ],
+                "httpGet": {
+                  "url": "https://microsoft.com",
+                  "fileName": "output.txt",
+                  "headers": [
+                    "foo",
+                    "bar"
+                  ]
+                }
+              },
+              {
+                "description": "Second pre build step.",
+                "scripts": [
+                  "echo 'hello'",
+                  "echo 'again'"
+                ],
+                "httpGet": {
+                  "url": "https://microsoft.com",
+                  "fileName": "output.txt",
+                  "headers": [
+                    "foo"
+                  ]
+                }
+              }
+            ]
+          },
+          "uploadEndpoint": "foo.azurecontainerapps.dev/upload"
+        },
+        "systemData": {
+          "createdBy": "sample@microsoft.com",
+          "createdByType": "User",
+          "createdAt": "2022-10-11T11:05:51.4940669Z",
+          "lastModifiedBy": "sample@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_ListByBuilderResource.json b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_ListByBuilderResource.json
new file mode 100644
index 000000000000..29b43ed3bcf9
--- /dev/null
+++ b/specification/app/resource-manager/Microsoft.App/preview/2023-05-01-preview/examples/Builds_ListByBuilderResource.json
@@ -0,0 +1,157 @@
+{
+  "operationId": "Builds_ListByBuilderResource",
+  "title": "Builds_ListByBuilderResource_0",
+  "parameters": {
+    "api-version": "2023-05-01-preview",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "builderName": "testBuilder"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder/builds/testBuild1",
+            "name": "testBuild1",
+            "type": "Microsoft.App/builders/builds",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "buildStatus": "InProgress",
+              "destinationContainerRegistry": {
+                "server": "test.azurecr.io",
+                "identity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1",
+                "image": "test.azurecr.io/repo:tag"
+              },
+              "configuration": {
+                "baseOs": "DebianBullseye",
+                "platform": "dotnetcore",
+                "platformVersion": "7.0",
+                "environmentVariables": [
+                  {
+                    "name": "foo1",
+                    "value": "bar1"
+                  },
+                  {
+                    "name": "foo2",
+                    "value": "bar2"
+                  }
+                ],
+                "preBuildSteps": [
+                  {
+                    "description": "First pre build step.",
+                    "scripts": [
+                      "echo 'hello'",
+                      "echo 'world'"
+                    ],
+                    "httpGet": {
+                      "url": "https://microsoft.com",
+                      "fileName": "output.txt",
+                      "headers": [
+                        "foo",
+                        "bar"
+                      ]
+                    }
+                  },
+                  {
+                    "description": "Second pre build step.",
+                    "scripts": [
+                      "echo 'hello'",
+                      "echo 'again'"
+                    ],
+                    "httpGet": {
+                      "url": "https://microsoft.com",
+                      "fileName": "output.txt",
+                      "headers": [
+                        "foo"
+                      ]
+                    }
+                  }
+                ]
+              },
+              "uploadEndpoint": "foo.azurecontainerapps.dev/upload"
+            },
+            "systemData": {
+              "createdBy": "sample@microsoft.com",
+              "createdByType": "User",
+              "createdAt": "2022-10-11T11:05:51.4940669Z",
+              "lastModifiedBy": "sample@microsoft.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder/builds/testBuild2",
+            "name": "testBuild2",
+            "type": "Microsoft.App/builders/builds",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "buildStatus": "InProgress",
+              "destinationContainerRegistry": {
+                "server": "test.azurecr.io",
+                "identity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1",
+                "image": "test.azurecr.io/repo:tag"
+              },
+              "configuration": {
+                "baseOs": "DebianBullseye",
+                "platform": "dotnetcore",
+                "platformVersion": "7.0",
+                "environmentVariables": [
+                  {
+                    "name": "foo1",
+                    "value": "bar1"
+                  },
+                  {
+                    "name": "foo2",
+                    "value": "bar2"
+                  }
+                ],
+                "preBuildSteps": [
+                  {
+                    "description": "First pre build step.",
+                    "scripts": [
+                      "echo 'hello'",
+                      "echo 'world'"
+                    ],
+                    "httpGet": {
+                      "url": "https://microsoft.com",
+                      "fileName": "output.txt",
+                      "headers": [
+                        "foo",
+                        "bar"
+                      ]
+                    }
+                  },
+                  {
+                    "description": "Second pre build step.",
+                    "scripts": [
+                      "echo 'hello'",
+                      "echo 'again'"
+                    ],
+                    "httpGet": {
+                      "url": "https://microsoft.com",
+                      "fileName": "output.txt",
+                      "headers": [
+                        "foo"
+                      ]
+                    }
+                  }
+                ]
+              },
+              "uploadEndpoint": "foo.azurecontainerapps.dev/upload"
+            },
+            "systemData": {
+              "createdBy": "sample@microsoft.com",
+              "createdByType": "User",
+              "createdAt": "2022-10-11T11:05:51.4940669Z",
+              "lastModifiedBy": "sample@microsoft.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/app/resource-manager/readme.md b/specification/app/resource-manager/readme.md
index c5d6ffb83ceb..56b2d3dc9349 100644
--- a/specification/app/resource-manager/readme.md
+++ b/specification/app/resource-manager/readme.md
@@ -39,6 +39,8 @@ input-file:
   - Microsoft.App/preview/2023-05-01-preview/AuthConfigs.json
   - Microsoft.App/preview/2023-05-01-preview/AvailableWorkloadProfiles.json
   - Microsoft.App/preview/2023-05-01-preview/BillingMeters.json
+  - Microsoft.App/preview/2023-05-01-preview/Builders.json
+  - Microsoft.App/preview/2023-05-01-preview/Builds.json
   - Microsoft.App/preview/2023-05-01-preview/CommonDefinitions.json
   - Microsoft.App/preview/2023-05-01-preview/ConnectedEnvironments.json
   - Microsoft.App/preview/2023-05-01-preview/ConnectedEnvironmentsCertificates.json
@@ -53,6 +55,12 @@ input-file:
   - Microsoft.App/preview/2023-05-01-preview/ManagedEnvironmentsDaprComponents.json
   - Microsoft.App/preview/2023-05-01-preview/ManagedEnvironmentsStorages.json
   - Microsoft.App/preview/2023-05-01-preview/SourceControls.json
+directive:
+  - suppress: OperationIdNounVerb
+    from: Builds.json
+    reason: |
+      The linting thinks that 'Builder' in 'Builds_ListByBuilderResource' is a noun, while it
+      is really the parent.
 ```
 ### Tag: package-preview-2023-04