diff --git a/specification/maintenance/Maintenance.Management/MaintenanceConfiguration.tsp b/specification/maintenance/Maintenance.Management/MaintenanceConfiguration.tsp
index f1dd4156a43b..241e2d9efa2f 100644
--- a/specification/maintenance/Maintenance.Management/MaintenanceConfiguration.tsp
+++ b/specification/maintenance/Maintenance.Management/MaintenanceConfiguration.tsp
@@ -14,13 +14,26 @@ namespace Microsoft.Maintenance;
  * Maintenance configuration record type
  */
 model MaintenanceConfiguration
-  is Azure.ResourceManager.TrackedResource<MaintenanceConfigurationProperties> {
+  is Azure.ResourceManager.ProxyResource<MaintenanceConfigurationProperties> {
   ...ResourceNameParameter<
     Resource = MaintenanceConfiguration,
     KeyName = "resourceName",
     SegmentName = "publicMaintenanceConfigurations",
     NamePattern = ""
   >;
+
+  /**
+   * Gets or sets location of the resource
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  location?: string;
+
+  /**
+   * Gets or sets tags of the resource
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-no-record" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  tags?: Record<string>;
 }
 
 @armResourceOperations
diff --git a/specification/maintenance/resource-manager/Microsoft.Maintenance/preview/2023-10-01-preview/Maintenance.json b/specification/maintenance/resource-manager/Microsoft.Maintenance/preview/2023-10-01-preview/Maintenance.json
index 4f8eb33a1e4c..d37b7964450f 100644
--- a/specification/maintenance/resource-manager/Microsoft.Maintenance/preview/2023-10-01-preview/Maintenance.json
+++ b/specification/maintenance/resource-manager/Microsoft.Maintenance/preview/2023-10-01-preview/Maintenance.json
@@ -2534,11 +2534,22 @@
           "$ref": "#/definitions/MaintenanceConfigurationProperties",
           "description": "Gets or sets properties of the resource",
           "x-ms-client-flatten": true
+        },
+        "location": {
+          "type": "string",
+          "description": "Gets or sets location of the resource"
+        },
+        "tags": {
+          "type": "object",
+          "description": "Gets or sets tags of the resource",
+          "additionalProperties": {
+            "type": "string"
+          }
         }
       },
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ]
     },