diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AuthConfigs.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AuthConfigs.json
index 75bb7180a522..5977c1d5b806 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AuthConfigs.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AuthConfigs.json
@@ -258,7 +258,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AvailableWorkloadProfiles.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AvailableWorkloadProfiles.json
index 4b8315c90ef0..f59bca185ae5 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AvailableWorkloadProfiles.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AvailableWorkloadProfiles.json
@@ -62,7 +62,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/BillingMeters.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/BillingMeters.json
index 0729671a513a..376e654a58d3 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/BillingMeters.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/BillingMeters.json
@@ -59,7 +59,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/CommonDefinitions.json
index 0f5c976fba12..a5a8f9951a7a 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/CommonDefinitions.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/CommonDefinitions.json
@@ -763,7 +763,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -980,7 +980,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -1114,7 +1114,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironments.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironments.json
index 2405410b53ca..da09291a3181 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironments.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironments.json
@@ -371,7 +371,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json
index 86c368dc0e11..1d6e3d9d38b1 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json
@@ -252,7 +252,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerApps.json
index 747098a86d7e..64680e59576e 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerApps.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerApps.json
@@ -669,7 +669,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -1395,7 +1395,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerAppsRevisions.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerAppsRevisions.json
index 806a11a02c6b..fde135cf7b7d 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerAppsRevisions.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerAppsRevisions.json
@@ -395,7 +395,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -525,7 +525,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Diagnostics.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Diagnostics.json
index 454ce7d2412a..e57750150901 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Diagnostics.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Diagnostics.json
@@ -612,7 +612,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Jobs.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Jobs.json
index 84474e0eabac..7dafd1a62b8c 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Jobs.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Jobs.json
@@ -750,7 +750,7 @@
       "description": "Container App Job",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ManagedEnvironments.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ManagedEnvironments.json
index a545d54241ab..9d03296a50a0 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ManagedEnvironments.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ManagedEnvironments.json
@@ -1144,7 +1144,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -1333,7 +1333,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -1391,7 +1391,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ManagedEnvironmentsStorages.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ManagedEnvironmentsStorages.json
index 033cbb168d1e..cd43ff9e82a5 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ManagedEnvironmentsStorages.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ManagedEnvironmentsStorages.json
@@ -258,7 +258,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/SourceControls.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/SourceControls.json
index da35a3846cba..0ce9962c2b2c 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/SourceControls.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/SourceControls.json
@@ -266,7 +266,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/BillingMeters_Get.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/BillingMeters_Get.json
index 02e6676292fe..49175ab3d2b0 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/BillingMeters_Get.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/BillingMeters_Get.json
@@ -15,7 +15,7 @@
               "meterType": "CPU",
               "displayName": "General Purpose Cores per Second"
             },
-            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/GeneralPurposeDseriesCPU",
+            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/billingMeters/GeneralPurposeDseriesCPU",
             "name": "GeneralPurposeDseriesCPU",
             "type": "Microsoft.App/billingMeters"
           },
@@ -26,7 +26,7 @@
               "meterType": "Memory",
               "displayName": "General Purpose Memory GiB per Second"
             },
-            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/GeneralPurposeDseriesMemory",
+            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/billingMeters/GeneralPurposeDseriesMemory",
             "name": "GeneralPurposeDseriesMemory",
             "type": "Microsoft.App/billingMeters"
           },
@@ -37,7 +37,7 @@
               "meterType": "CPU",
               "displayName": "Memory Optimized Cores per Second"
             },
-            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/MemoryOptimizedEseriesCPU",
+            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/billingMeters/MemoryOptimizedEseriesCPU",
             "name": "MemoryOptimizedEseriesCPU",
             "type": "Microsoft.App/billingMeters"
           },
@@ -48,7 +48,7 @@
               "meterType": "Memory",
               "displayName": "Memory Optimized Memory GiB per Second"
             },
-            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/MemoryOptimizedEseriesMemory",
+            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/billingMeters/MemoryOptimizedEseriesMemory",
             "name": "MemoryOptimizedEseriesMemory",
             "type": "Microsoft.App/billingMeters"
           },
@@ -59,7 +59,7 @@
               "meterType": "CPU",
               "displayName": "Compute Optimized Cores per Second"
             },
-            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/ComputeOptimizedFseriesCPU",
+            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/billingMeters/ComputeOptimizedFseriesCPU",
             "name": "ComputeOptimizedFseriesCPU",
             "type": "Microsoft.App/billingMeters"
           },
@@ -70,7 +70,7 @@
               "meterType": "Memory",
               "displayName": "Compute Optimized Memory GiB per Second"
             },
-            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/GeneralComputeMemory",
+            "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/billingMeters/GeneralComputeMemory",
             "name": "GeneralComputeMemory",
             "type": "Microsoft.App/billingMeters"
           }
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_CreateOrUpdate.json
index 32c63bdcd7c2..fe435bc0f9b8 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_CreateOrUpdate.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_CreateOrUpdate.json
@@ -17,7 +17,7 @@
     "200": {
       "headers": {},
       "body": {
-        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
+        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/Certificates/certificate-firendly-name",
         "type": "Microsoft.App/ManagedEnvironments/Certificates",
         "location": "East US",
         "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_CreateOrUpdate_FromKeyVault.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_CreateOrUpdate_FromKeyVault.json
index 178693f9ae03..6f0b94b60a8c 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_CreateOrUpdate_FromKeyVault.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_CreateOrUpdate_FromKeyVault.json
@@ -19,7 +19,7 @@
     "200": {
       "headers": {},
       "body": {
-        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
+        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/Certificates/certificate-firendly-name",
         "type": "Microsoft.App/ManagedEnvironments/Certificates",
         "location": "East US",
         "properties": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_Get.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_Get.json
index c74266c77c8b..8d8d93821a17 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_Get.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificate_Get.json
@@ -10,7 +10,7 @@
     "200": {
       "headers": {},
       "body": {
-        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
+        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/Certificates/certificate-firendly-name",
         "name": "certificate-firendly-name",
         "type": "Microsoft.App/ManagedEnvironments/Certificates",
         "location": "East US",
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificates_ListByManagedEnvironment.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificates_ListByManagedEnvironment.json
index 8449399ccc3a..575bc02521d2 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificates_ListByManagedEnvironment.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificates_ListByManagedEnvironment.json
@@ -11,7 +11,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
+            "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name",
             "name": "certificate-firendly-name",
             "type": "Microsoft.App/ManagedEnvironments/Certificates",
             "location": "East US",
@@ -29,7 +29,7 @@
             }
           },
           {
-            "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
+            "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name",
             "name": "certificate-firendly-name",
             "type": "Microsoft.App/ManagedEnvironments/Certificates",
             "location": "East US",
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificates_Patch.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificates_Patch.json
index a383665f5d5f..f990c4af25f5 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificates_Patch.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Certificates_Patch.json
@@ -16,7 +16,7 @@
     "200": {
       "headers": {},
       "body": {
-        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
+        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name",
         "type": "Microsoft.App/ManagedEnvironments/Certificates",
         "location": "East US",
         "tags": {
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Revisions_Get.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Revisions_Get.json
index 9b996f1995df..52df2dd41e8b 100644
--- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Revisions_Get.json
+++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Revisions_Get.json
@@ -10,7 +10,7 @@
     "200": {
       "headers": {},
       "body": {
-        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.AppcontainerApps/testcontainerApp0/revisions/testcontainerApp0-pjxhsye",
+        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0/revisions/testcontainerApp0-pjxhsye",
         "name": "testcontainerApp0-pjxhsye",
         "type": "Microsoft.App/containerApps/revisions",
         "properties": {