From 5d19286b1823d43e84b111406f73910f83d8bfc1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:12:29 +0000
Subject: [PATCH] [GitHub Action - Generate Templates] Generate templates for
 alerts

---
 ..._bb83ae53-3b91-49ff-a351-9545ea747335.json |   2 +-
 ..._282cb835-592b-4e49-89c1-ea1aaefb37c4.json |   2 +-
 ..._23ac19cb-5eff-4cfa-9817-93466e1a94f7.json |   2 +-
 ..._a2f5e5a3-ec38-4201-970f-971ad4707b93.json |   2 +-
 ..._e840c7a9-e070-4dc9-919b-c75a3679f6b7.json |   2 +-
 ..._8bafb3d5-d961-49a4-9867-f1cddfd703e0.json |   2 +-
 ..._b9f2fe91-023a-443c-b376-b12f0cd5d965.json |   2 +-
 ...bb83ae53-3b91-49ff-a351-9545ea747335.bicep |   2 +-
 ...282cb835-592b-4e49-89c1-ea1aaefb37c4.bicep |   2 +-
 ...23ac19cb-5eff-4cfa-9817-93466e1a94f7.bicep |   2 +-
 ...a2f5e5a3-ec38-4201-970f-971ad4707b93.bicep |   2 +-
 ...e840c7a9-e070-4dc9-919b-c75a3679f6b7.bicep |   2 +-
 ...8bafb3d5-d961-49a4-9867-f1cddfd703e0.bicep |   2 +-
 ...b9f2fe91-023a-443c-b376-b12f0cd5d965.bicep |   2 +-
 ..._0289bc11-db65-4a58-91ed-fda8637322ec.json |   2 +-
 ...0289bc11-db65-4a58-91ed-fda8637322ec.bicep |   2 +-
 ..._fd5d63e0-ab2f-4300-af65-05bf2e490d0e.json |   2 +-
 ..._6b1dd1ae-05de-43d2-bdea-7981c49127fc.json |   2 +-
 ..._52cd4aba-4ad0-402a-880d-ba625ebcf37f.json |   2 +-
 ..._1f8626fe-812a-48a7-b237-2f9181a5ea12.json |   2 +-
 ..._2e16fd84-d92f-44ee-8191-ff47e90a9526.json |   2 +-
 ..._a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.json |   2 +-
 ..._c0c3e784-f488-43a6-a423-18dbb444d443.json |   2 +-
 ...fd5d63e0-ab2f-4300-af65-05bf2e490d0e.bicep |   2 +-
 ...6b1dd1ae-05de-43d2-bdea-7981c49127fc.bicep |   2 +-
 ...52cd4aba-4ad0-402a-880d-ba625ebcf37f.bicep |   2 +-
 ...1f8626fe-812a-48a7-b237-2f9181a5ea12.bicep |   2 +-
 ...2e16fd84-d92f-44ee-8191-ff47e90a9526.bicep |   2 +-
 ...a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.bicep |   2 +-
 ...c0c3e784-f488-43a6-a423-18dbb444d443.bicep |   2 +-
 ..._94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.json |   2 +-
 ..._b12cad96-7ef2-4223-97f4-53b3dc64ecfa.json |   2 +-
 ..._a9e1306a-a541-423f-a69e-bd37f8f5013a.json |   2 +-
 ..._423b4280-1f68-49d8-b11a-6a816b0d9172.json |   2 +-
 ...94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.bicep |   2 +-
 ...b12cad96-7ef2-4223-97f4-53b3dc64ecfa.bicep |   2 +-
 ...a9e1306a-a541-423f-a69e-bd37f8f5013a.bicep |   2 +-
 ...423b4280-1f68-49d8-b11a-6a816b0d9172.bicep |   2 +-
 ..._74e0e3b4-62aa-4503-b05d-c5c79a029ed6.json |   2 +-
 ..._49e7f58f-4910-4d2f-8589-573e8a65c6dd.json |   2 +-
 ..._c521bf0d-efec-4d3a-8541-d8749915bfd4.json |   2 +-
 ...74e0e3b4-62aa-4503-b05d-c5c79a029ed6.bicep |   2 +-
 ...49e7f58f-4910-4d2f-8589-573e8a65c6dd.bicep |   2 +-
 ...c521bf0d-efec-4d3a-8541-d8749915bfd4.bicep |   2 +-
 ..._b40fdb04-cada-4870-80f3-317afc57e5fb.json |   2 +-
 ..._8ce7d791-41a5-4d6a-9516-b009eabbd8f7.json |   2 +-
 ..._f49539ff-35b1-4d83-8541-e3cf49b383e5.json |   2 +-
 ..._70b8ce6d-0d28-4997-84df-957791877eec.json |   2 +-
 ..._6c9857e4-7d6b-4384-80da-b88a2e6858ac.json |   2 +-
 ...b40fdb04-cada-4870-80f3-317afc57e5fb.bicep |   2 +-
 ...8ce7d791-41a5-4d6a-9516-b009eabbd8f7.bicep |   2 +-
 ...f49539ff-35b1-4d83-8541-e3cf49b383e5.bicep |   2 +-
 ...70b8ce6d-0d28-4997-84df-957791877eec.bicep |   2 +-
 ...6c9857e4-7d6b-4384-80da-b88a2e6858ac.bicep |   2 +-
 ..._af750dfc-62e5-4b74-9514-ca419d800590.json |   2 +-
 ..._24c5276b-77b1-48ab-a8c1-15844b11e0aa.json |   2 +-
 ..._7072ba94-41d2-4584-89ab-a5824ed045f4.json |   2 +-
 ..._b9ffe52a-f430-4605-a2b1-d815eb1bcc56.json |   2 +-
 ..._82cb3ad7-d44f-4131-9078-5aac82d3333a.json |   2 +-
 ..._cc764431-e1b0-4455-94b1-b66d32cc54b4.json |   2 +-
 ..._f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.json |   2 +-
 ..._24b37318-9353-4424-9d8e-ac28450328b6.json |   2 +-
 ..._8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.json |   2 +-
 ..._837ecf42-3f25-41ae-b97d-34193f0669da.json |   2 +-
 ..._1b68776d-4d11-4d27-96c5-4d51cf17e1fc.json |   2 +-
 ..._aecc75bf-f961-4c22-86e9-84c5039a2938.json |   2 +-
 ..._d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.json |   2 +-
 ...af750dfc-62e5-4b74-9514-ca419d800590.bicep |   2 +-
 ...24c5276b-77b1-48ab-a8c1-15844b11e0aa.bicep |   2 +-
 ...7072ba94-41d2-4584-89ab-a5824ed045f4.bicep |   2 +-
 ...b9ffe52a-f430-4605-a2b1-d815eb1bcc56.bicep |   2 +-
 ...82cb3ad7-d44f-4131-9078-5aac82d3333a.bicep |   2 +-
 ...cc764431-e1b0-4455-94b1-b66d32cc54b4.bicep |   2 +-
 ...f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.bicep |   2 +-
 ...24b37318-9353-4424-9d8e-ac28450328b6.bicep |   2 +-
 ...8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.bicep |   2 +-
 ...837ecf42-3f25-41ae-b97d-34193f0669da.bicep |   2 +-
 ...1b68776d-4d11-4d27-96c5-4d51cf17e1fc.bicep |   2 +-
 ...aecc75bf-f961-4c22-86e9-84c5039a2938.bicep |   2 +-
 ...d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.bicep |   2 +-
 ..._5e8aaa27-e5b3-4774-9807-af61ec96b001.json |   2 +-
 ..._c42138d4-bb4c-4171-8802-ba44d671d72f.json |   2 +-
 ..._c47441d4-7061-4acd-8ad8-69e52d00557c.json |   2 +-
 ..._cf6babc2-f623-4f12-a352-c30a02bcb6c6.json |   2 +-
 ..._5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.json |   2 +-
 ...5e8aaa27-e5b3-4774-9807-af61ec96b001.bicep |   2 +-
 ...c42138d4-bb4c-4171-8802-ba44d671d72f.bicep |   2 +-
 ...c47441d4-7061-4acd-8ad8-69e52d00557c.bicep |   2 +-
 ...cf6babc2-f623-4f12-a352-c30a02bcb6c6.bicep |   2 +-
 ...5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.bicep |   2 +-
 ..._81f8369c-65bf-4194-bfd2-ffdfa2470577.json |   2 +-
 ..._693a3b37-1e2a-42d1-aaed-b1f374276d1c.json |   2 +-
 ..._995cc12a-1887-4669-92c5-70a6ca8bfe70.json |   2 +-
 ...87fe8679-655d-4acb-a37c-b7faebe26d47.json} |  12 +-
 ...ec8c928a-5206-4059-8aea-8486004dd30d.json} |  10 +-
 ...d76ab40a-2831-4fa2-b476-5fdcda3d7c4c.json} |  12 +-
 ..._3c550d9c-8276-4a61-b0cf-ef437a55e299.json | 199 ++++++++++++++++++
 ..._80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.json | 199 ++++++++++++++++++
 ..._287a29bf-097d-4c4a-9ac5-df70a10f6903.json | 199 ++++++++++++++++++
 ...07f1ae0a-94f3-41da-b3a6-ca9188e416cb.json} |  12 +-
 ..._e228ad2d-7f9f-4843-88e2-57f6d44c59e9.json | 199 ++++++++++++++++++
 ...81f8369c-65bf-4194-bfd2-ffdfa2470577.bicep |   2 +-
 ...693a3b37-1e2a-42d1-aaed-b1f374276d1c.bicep |   2 +-
 ...995cc12a-1887-4669-92c5-70a6ca8bfe70.bicep |   2 +-
 ...7fe8679-655d-4acb-a37c-b7faebe26d47.bicep} |  12 +-
 ...c8c928a-5206-4059-8aea-8486004dd30d.bicep} |  10 +-
 ...76ab40a-2831-4fa2-b476-5fdcda3d7c4c.bicep} |  12 +-
 ...3c550d9c-8276-4a61-b0cf-ef437a55e299.bicep | 135 ++++++++++++
 ...80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.bicep | 135 ++++++++++++
 ...287a29bf-097d-4c4a-9ac5-df70a10f6903.bicep | 135 ++++++++++++
 ...7f1ae0a-94f3-41da-b3a6-ca9188e416cb.bicep} |  12 +-
 ...e228ad2d-7f9f-4843-88e2-57f6d44c59e9.bicep | 135 ++++++++++++
 ..._d9089d09-ddec-4f6a-8dc1-e2544e5765cb.json |   2 +-
 ..._a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.json |   2 +-
 ..._ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.json |   2 +-
 ..._dce1cda8-1dab-4941-b607-1d5d449709d5.json |   2 +-
 ..._86991e6e-efc9-4898-adf8-4e8e3a60c57e.json |   2 +-
 ..._f0e94112-5509-47b6-8def-91fb5ca5d0cd.json |   2 +-
 ..._87dfe717-217f-4447-b59a-7ea39160b83a.json |   2 +-
 ..._98de2aed-3493-4e65-919b-b1f8e6995819.json |   2 +-
 ..._55dc79f4-5666-420f-8c53-141d73e01fee.json |   2 +-
 ..._d336cfa2-724e-419a-809d-c716741d5279.json |   2 +-
 ..._310c2a27-8933-434e-a366-cb35831cde44.json |   2 +-
 ..._6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.json |   2 +-
 ...d9089d09-ddec-4f6a-8dc1-e2544e5765cb.bicep |   2 +-
 ...a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.bicep |   2 +-
 ...ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.bicep |   2 +-
 ...dce1cda8-1dab-4941-b607-1d5d449709d5.bicep |   2 +-
 ...86991e6e-efc9-4898-adf8-4e8e3a60c57e.bicep |   2 +-
 ...f0e94112-5509-47b6-8def-91fb5ca5d0cd.bicep |   2 +-
 ...87dfe717-217f-4447-b59a-7ea39160b83a.bicep |   2 +-
 ...98de2aed-3493-4e65-919b-b1f8e6995819.bicep |   2 +-
 ...55dc79f4-5666-420f-8c53-141d73e01fee.bicep |   2 +-
 ...d336cfa2-724e-419a-809d-c716741d5279.bicep |   2 +-
 ...310c2a27-8933-434e-a366-cb35831cde44.bicep |   2 +-
 ...6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.bicep |   2 +-
 ..._bf1e0006-6089-4f92-a115-fc83aa0fbdd5.json |   2 +-
 ..._69912da3-8d8d-4d57-884a-97c2bdd03bdd.json |   2 +-
 ..._a407ae10-6263-449c-81b9-172760d6dc6d.json |   2 +-
 ..._821888a1-6490-4a2d-8850-bdc45057a853.json |   2 +-
 ..._b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.json |   2 +-
 ..._5dbf3a3d-7f08-4deb-a153-129c3485da84.json |   2 +-
 ..._b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.json |   2 +-
 ..._9b0f41af-1c52-4890-a23a-3bfebfee1154.json |   2 +-
 ..._040bc9c3-da5c-4fd0-b160-979ce89364ae.json |   2 +-
 ..._abddd643-e7c7-411c-b13a-64fdbb406cc8.json |   2 +-
 ..._3c5518ea-9a0f-44ff-b197-47b3d6db060b.json |   2 +-
 ..._e45d685d-14c4-4422-8096-6f11d628fb20.json |   2 +-
 ..._5c51e187-5b5d-428d-98d8-fb9ab4fea646.json |   2 +-
 ..._326b359d-e0a2-4055-8e1f-f9c5f9df5599.json |   2 +-
 ..._b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.json |   2 +-
 ..._8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.json |   2 +-
 ..._b1cc650c-24fe-4f9e-a2ec-5757816526c0.json |   2 +-
 ..._edff41cb-d9b8-46ba-ba39-42747c1a4c4b.json |   2 +-
 ..._b3a5f580-77a6-4161-9a1e-7370ce783e67.json |   2 +-
 ..._6de4e570-4270-4e9b-949e-5680b061e7fd.json |   2 +-
 ..._ea4501a3-1e77-4df1-ab61-3ee28ae529eb.json |   2 +-
 ..._e2028144-b142-445c-b544-3bb438537c8f.json |   2 +-
 ..._b565e73f-71c8-4bb3-a792-903b67775497.json |   2 +-
 ..._552ca1f1-d69d-4bc2-b044-19f81b225fd4.json |   2 +-
 ..._f7e19635-0118-4040-83d5-2f4c2150aef1.json |   2 +-
 ..._dca7af9f-cad2-4751-a61f-77d92c2ce523.json |   2 +-
 ..._a2bf3c43-d327-473b-9204-f77e2a0fe398.json |   2 +-
 ..._916dc60b-b2d2-4708-9fa4-6a36b244f499.json |   2 +-
 ..._36262245-4c8a-4143-9ab4-68e9c23ae19a.json |   2 +-
 ..._299ce963-728a-48c8-8b7d-e05b5f8a8f38.json |   2 +-
 ..._929b095e-5ea1-48b4-bf4e-bfc1a941a908.json |   2 +-
 ..._37d9da12-88e6-4c01-8772-384920d34458.json |   2 +-
 ..._3be4037a-c692-402d-843d-b3fe43053edf.json |   2 +-
 ..._a477bf96-4b0f-471c-b5d3-0acdb59612e6.json |   2 +-
 ..._a9bac9fd-2382-4ce1-b68b-8898caf45038.json |   2 +-
 ..._56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.json |   2 +-
 ..._eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.json |   2 +-
 ..._c878115f-2a89-446e-8980-ef4f152120c5.json |   2 +-
 ..._e3981e7b-fd8b-4e07-bb68-d598c020c12d.json |   2 +-
 ..._765ceb5b-ec1d-44d7-b94d-bb139030df81.json |   2 +-
 ..._3fa5376a-705a-48e4-b314-6282a74c9f7c.json |   2 +-
 ...bf1e0006-6089-4f92-a115-fc83aa0fbdd5.bicep |   2 +-
 ...69912da3-8d8d-4d57-884a-97c2bdd03bdd.bicep |   2 +-
 ...a407ae10-6263-449c-81b9-172760d6dc6d.bicep |   2 +-
 ...821888a1-6490-4a2d-8850-bdc45057a853.bicep |   2 +-
 ...b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.bicep |   2 +-
 ...5dbf3a3d-7f08-4deb-a153-129c3485da84.bicep |   2 +-
 ...b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.bicep |   2 +-
 ...9b0f41af-1c52-4890-a23a-3bfebfee1154.bicep |   2 +-
 ...040bc9c3-da5c-4fd0-b160-979ce89364ae.bicep |   2 +-
 ...abddd643-e7c7-411c-b13a-64fdbb406cc8.bicep |   2 +-
 ...3c5518ea-9a0f-44ff-b197-47b3d6db060b.bicep |   2 +-
 ...e45d685d-14c4-4422-8096-6f11d628fb20.bicep |   2 +-
 ...5c51e187-5b5d-428d-98d8-fb9ab4fea646.bicep |   2 +-
 ...326b359d-e0a2-4055-8e1f-f9c5f9df5599.bicep |   2 +-
 ...b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.bicep |   2 +-
 ...8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.bicep |   2 +-
 ...b1cc650c-24fe-4f9e-a2ec-5757816526c0.bicep |   2 +-
 ...edff41cb-d9b8-46ba-ba39-42747c1a4c4b.bicep |   2 +-
 ...b3a5f580-77a6-4161-9a1e-7370ce783e67.bicep |   2 +-
 ...6de4e570-4270-4e9b-949e-5680b061e7fd.bicep |   2 +-
 ...ea4501a3-1e77-4df1-ab61-3ee28ae529eb.bicep |   2 +-
 ...e2028144-b142-445c-b544-3bb438537c8f.bicep |   2 +-
 ...b565e73f-71c8-4bb3-a792-903b67775497.bicep |   2 +-
 ...552ca1f1-d69d-4bc2-b044-19f81b225fd4.bicep |   2 +-
 ...f7e19635-0118-4040-83d5-2f4c2150aef1.bicep |   2 +-
 ...dca7af9f-cad2-4751-a61f-77d92c2ce523.bicep |   2 +-
 ...a2bf3c43-d327-473b-9204-f77e2a0fe398.bicep |   2 +-
 ...916dc60b-b2d2-4708-9fa4-6a36b244f499.bicep |   2 +-
 ...36262245-4c8a-4143-9ab4-68e9c23ae19a.bicep |   2 +-
 ...299ce963-728a-48c8-8b7d-e05b5f8a8f38.bicep |   2 +-
 ...929b095e-5ea1-48b4-bf4e-bfc1a941a908.bicep |   2 +-
 ...37d9da12-88e6-4c01-8772-384920d34458.bicep |   2 +-
 ...3be4037a-c692-402d-843d-b3fe43053edf.bicep |   2 +-
 ...a477bf96-4b0f-471c-b5d3-0acdb59612e6.bicep |   2 +-
 ...a9bac9fd-2382-4ce1-b68b-8898caf45038.bicep |   2 +-
 ...56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.bicep |   2 +-
 ...eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.bicep |   2 +-
 ...c878115f-2a89-446e-8980-ef4f152120c5.bicep |   2 +-
 ...e3981e7b-fd8b-4e07-bb68-d598c020c12d.bicep |   2 +-
 ...765ceb5b-ec1d-44d7-b94d-bb139030df81.bicep |   2 +-
 ...3fa5376a-705a-48e4-b314-6282a74c9f7c.bicep |   2 +-
 ..._970af9d6-9212-420d-af7b-4fbd790a2596.json |   2 +-
 ..._4758386e-12ee-411a-9e49-445b5c5c3051.json |   2 +-
 ..._8beff742-9cd8-43ed-9680-57ae35bee6e8.json |   2 +-
 ..._5b26b965-2662-4a89-9d7e-771486357f39.json |   2 +-
 ...970af9d6-9212-420d-af7b-4fbd790a2596.bicep |   2 +-
 ...4758386e-12ee-411a-9e49-445b5c5c3051.bicep |   2 +-
 ...8beff742-9cd8-43ed-9680-57ae35bee6e8.bicep |   2 +-
 ...5b26b965-2662-4a89-9d7e-771486357f39.bicep |   2 +-
 ..._fa9efde4-3586-4595-a442-b7e97f70fe91.json |   2 +-
 ..._42995506-5bd2-4687-9316-d9399919990b.json |   2 +-
 ..._b8c8a846-a8d0-4e8f-b854-030955a20135.json |   2 +-
 ..._9dca87c2-de00-40fd-b0bb-c8335e5f978a.json |   2 +-
 ...fa9efde4-3586-4595-a442-b7e97f70fe91.bicep |   2 +-
 ...42995506-5bd2-4687-9316-d9399919990b.bicep |   2 +-
 ...b8c8a846-a8d0-4e8f-b854-030955a20135.bicep |   2 +-
 ...9dca87c2-de00-40fd-b0bb-c8335e5f978a.bicep |   2 +-
 ..._49fd8bac-d061-459d-8d80-a048c4c8ba56.json |   2 +-
 ..._301ca0e3-fc88-4285-be99-a2a587c412f5.json |   2 +-
 ..._64a872f9-5ec6-4121-acad-edd12f4c3466.json |   2 +-
 ..._14fa63fb-7da9-4d2e-9de9-203c4a3e0401.json |   2 +-
 ..._ebbbbb92-5208-4d52-b407-6bea8e4473b9.json |   2 +-
 ..._e38e6e11-ac88-4014-98c8-8e64f70b832a.json |   2 +-
 ..._cebf00b7-7294-4cf7-bc50-108f999d0c67.json |   2 +-
 ..._1303e91d-bc80-4ec2-937e-1d179fc32b43.json |   2 +-
 ..._aa3c5697-5cca-4c16-a37e-94f1d580701e.json |   2 +-
 ..._e89e023e-117b-4db4-bfb2-853849e273f5.json |   2 +-
 ..._9ae2dfbf-d69b-4802-8497-8b7836bef5e9.json |   2 +-
 ...49fd8bac-d061-459d-8d80-a048c4c8ba56.bicep |   2 +-
 ...301ca0e3-fc88-4285-be99-a2a587c412f5.bicep |   2 +-
 ...64a872f9-5ec6-4121-acad-edd12f4c3466.bicep |   2 +-
 ...14fa63fb-7da9-4d2e-9de9-203c4a3e0401.bicep |   2 +-
 ...ebbbbb92-5208-4d52-b407-6bea8e4473b9.bicep |   2 +-
 ...e38e6e11-ac88-4014-98c8-8e64f70b832a.bicep |   2 +-
 ...cebf00b7-7294-4cf7-bc50-108f999d0c67.bicep |   2 +-
 ...1303e91d-bc80-4ec2-937e-1d179fc32b43.bicep |   2 +-
 ...aa3c5697-5cca-4c16-a37e-94f1d580701e.bicep |   2 +-
 ...e89e023e-117b-4db4-bfb2-853849e273f5.bicep |   2 +-
 ...9ae2dfbf-d69b-4802-8497-8b7836bef5e9.bicep |   2 +-
 ..._0f19979d-9dc2-4636-8e15-435bbfa1f0f9.json |   2 +-
 ..._13bbfe6e-3b65-4940-9344-6d1cc78e7d54.json |   2 +-
 ..._faf01668-c98a-4755-ae74-9dd4151f4c39.json |   2 +-
 ..._ef38051a-d9e3-4705-b208-29a421e729be.json |   2 +-
 ...0f19979d-9dc2-4636-8e15-435bbfa1f0f9.bicep |   2 +-
 ...13bbfe6e-3b65-4940-9344-6d1cc78e7d54.bicep |   2 +-
 ...faf01668-c98a-4755-ae74-9dd4151f4c39.bicep |   2 +-
 ...ef38051a-d9e3-4705-b208-29a421e729be.bicep |   2 +-
 ..._269d640c-b6ba-45e1-a52f-67708f9f99d7.json |   2 +-
 ..._347674ce-8534-403d-8281-cac9ea6f412a.json |   2 +-
 ..._218161be-4952-495b-aed1-03cccda3d42f.json |   2 +-
 ..._a3601973-f48c-4bf2-8384-90d250702a79.json |   2 +-
 ..._757e2adf-60b8-4688-ae8f-03dd7dcd5226.json |   2 +-
 ..._dfe563fc-0ec1-401d-a362-8d293a06d02b.json |   2 +-
 ..._f285c23f-3b8e-428a-b289-8ff38a3c0e4b.json |   2 +-
 ..._e6771f44-f6d3-4a27-a9e4-b402a79c2891.json |   2 +-
 ...269d640c-b6ba-45e1-a52f-67708f9f99d7.bicep |   2 +-
 ...347674ce-8534-403d-8281-cac9ea6f412a.bicep |   2 +-
 ...218161be-4952-495b-aed1-03cccda3d42f.bicep |   2 +-
 ...a3601973-f48c-4bf2-8384-90d250702a79.bicep |   2 +-
 ...757e2adf-60b8-4688-ae8f-03dd7dcd5226.bicep |   2 +-
 ...dfe563fc-0ec1-401d-a362-8d293a06d02b.bicep |   2 +-
 ...f285c23f-3b8e-428a-b289-8ff38a3c0e4b.bicep |   2 +-
 ...e6771f44-f6d3-4a27-a9e4-b402a79c2891.bicep |   2 +-
 ..._60453255-5e0e-4fa5-95b5-6c449bee6902.json |   2 +-
 ..._f0767b27-b88b-46a1-ab90-37dc8c399358.json |   2 +-
 ..._173e6b88-e8a9-4763-becb-9c749878c767.json |   2 +-
 ..._978944c7-a049-4847-8483-dcf5baa92f6a.json |   2 +-
 ..._3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.json |   2 +-
 ..._af2b7bbb-9476-475a-b523-da3ee521eda7.json |   2 +-
 ..._4f988eb2-c420-4ef2-82ed-2569b21b70e1.json |   2 +-
 ...60453255-5e0e-4fa5-95b5-6c449bee6902.bicep |   2 +-
 ...f0767b27-b88b-46a1-ab90-37dc8c399358.bicep |   2 +-
 ...173e6b88-e8a9-4763-becb-9c749878c767.bicep |   2 +-
 ...978944c7-a049-4847-8483-dcf5baa92f6a.bicep |   2 +-
 ...3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.bicep |   2 +-
 ...af2b7bbb-9476-475a-b523-da3ee521eda7.bicep |   2 +-
 ...4f988eb2-c420-4ef2-82ed-2569b21b70e1.bicep |   2 +-
 ..._f9b59221-8055-449e-bfd5-7a056945c694.json |   2 +-
 ..._5f9cdad0-db39-48c9-a4eb-3107b5b79414.json |   2 +-
 ..._389057c9-a0e0-4327-b89f-58c3dabb519d.json |   2 +-
 ..._1904dd93-9655-403f-bb89-dc42e5ebc666.json |   2 +-
 ..._5856ad80-7256-441f-8a62-af1fdc712018.json |   2 +-
 ..._eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.json |   2 +-
 ..._b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.json |   2 +-
 ..._1103b9a5-3d3d-4aa8-a3c2-66958e32c220.json |   2 +-
 ..._0c64aa8f-4bdb-4bb0-961c-d298000536af.json |   2 +-
 ..._d389ee62-f431-4faa-a4bc-4a3d02cea182.json |   2 +-
 ..._e397645f-359b-46d1-8182-d2cabab71aae.json |   2 +-
 ...f9b59221-8055-449e-bfd5-7a056945c694.bicep |   2 +-
 ...5f9cdad0-db39-48c9-a4eb-3107b5b79414.bicep |   2 +-
 ...389057c9-a0e0-4327-b89f-58c3dabb519d.bicep |   2 +-
 ...1904dd93-9655-403f-bb89-dc42e5ebc666.bicep |   2 +-
 ...5856ad80-7256-441f-8a62-af1fdc712018.bicep |   2 +-
 ...eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.bicep |   2 +-
 ...b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.bicep |   2 +-
 ...1103b9a5-3d3d-4aa8-a3c2-66958e32c220.bicep |   2 +-
 ...0c64aa8f-4bdb-4bb0-961c-d298000536af.bicep |   2 +-
 ...d389ee62-f431-4faa-a4bc-4a3d02cea182.bicep |   2 +-
 ...e397645f-359b-46d1-8182-d2cabab71aae.bicep |   2 +-
 ..._186c5227-a9f4-4cd0-a355-c8d28f359398.json |   2 +-
 ..._0a6de1a0-e4df-470f-9bc7-247838fc428c.json |   2 +-
 ..._a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.json |   2 +-
 ..._ea7248bd-f96c-4391-ac48-c95312441028.json |   2 +-
 ..._1d53e3ac-e98a-426c-81f1-aa1834c49692.json |   2 +-
 ..._90c0997a-f96e-4a34-87c7-c394c6e8b940.json |   2 +-
 ..._56a13163-c2b6-4235-96bd-ef1e373b19ba.json |   2 +-
 ..._e031f8bf-ed3f-4a41-87fe-b301c1d02367.json |   2 +-
 ...186c5227-a9f4-4cd0-a355-c8d28f359398.bicep |   2 +-
 ...0a6de1a0-e4df-470f-9bc7-247838fc428c.bicep |   2 +-
 ...a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.bicep |   2 +-
 ...ea7248bd-f96c-4391-ac48-c95312441028.bicep |   2 +-
 ...1d53e3ac-e98a-426c-81f1-aa1834c49692.bicep |   2 +-
 ...90c0997a-f96e-4a34-87c7-c394c6e8b940.bicep |   2 +-
 ...56a13163-c2b6-4235-96bd-ef1e373b19ba.bicep |   2 +-
 ...e031f8bf-ed3f-4a41-87fe-b301c1d02367.bicep |   2 +-
 ..._980f53cb-3eef-4263-952e-e69709e2a6e7.json |   2 +-
 ..._321c2df7-c548-4e06-8729-8132b4dc3386.json |   2 +-
 ..._08bfad59-0c23-4e6b-b577-e325f445a2cc.json |   2 +-
 ..._e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.json |   2 +-
 ..._4b40d85d-f0be-41e5-9d60-ad9a99c54a41.json |   2 +-
 ..._473c5450-95cc-4f86-bb8a-d0a06edd1357.json |   2 +-
 ..._71d5d464-ae1c-4383-835f-bb7369e307ea.json |   2 +-
 ..._a678b284-d23b-46e4-a8fa-75bb744a53bb.json |   2 +-
 ..._f5e0a050-1994-4864-b2c3-a09dc77fb5b4.json |   2 +-
 ..._df4f3e6f-757e-4fa0-a411-b2cdf4039649.json |   2 +-
 ..._2dd0b760-3235-479d-86d4-c152ca76b7e8.json |   2 +-
 ..._47615ecc-bf5d-47e2-8c10-f8411e6c5d56.json |   2 +-
 ..._740b104c-1ad2-4ef7-bafc-c98f22551548.json |   2 +-
 ..._5f2a0272-792a-4cdd-ba94-9f46db438a0e.json |   2 +-
 ..._c30b6089-59c5-4452-b382-d33152be9b03.json |   2 +-
 ..._9c7bde49-f0c2-4a07-b150-5dc9464fcf29.json |   2 +-
 ..._b8286cfa-9f86-4309-954b-ef69a6d8982d.json |   2 +-
 ...980f53cb-3eef-4263-952e-e69709e2a6e7.bicep |   2 +-
 ...321c2df7-c548-4e06-8729-8132b4dc3386.bicep |   2 +-
 ...08bfad59-0c23-4e6b-b577-e325f445a2cc.bicep |   2 +-
 ...e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.bicep |   2 +-
 ...4b40d85d-f0be-41e5-9d60-ad9a99c54a41.bicep |   2 +-
 ...473c5450-95cc-4f86-bb8a-d0a06edd1357.bicep |   2 +-
 ...71d5d464-ae1c-4383-835f-bb7369e307ea.bicep |   2 +-
 ...a678b284-d23b-46e4-a8fa-75bb744a53bb.bicep |   2 +-
 ...f5e0a050-1994-4864-b2c3-a09dc77fb5b4.bicep |   2 +-
 ...df4f3e6f-757e-4fa0-a411-b2cdf4039649.bicep |   2 +-
 ...2dd0b760-3235-479d-86d4-c152ca76b7e8.bicep |   2 +-
 ...47615ecc-bf5d-47e2-8c10-f8411e6c5d56.bicep |   2 +-
 ...740b104c-1ad2-4ef7-bafc-c98f22551548.bicep |   2 +-
 ...5f2a0272-792a-4cdd-ba94-9f46db438a0e.bicep |   2 +-
 ...c30b6089-59c5-4452-b382-d33152be9b03.bicep |   2 +-
 ...9c7bde49-f0c2-4a07-b150-5dc9464fcf29.bicep |   2 +-
 ...b8286cfa-9f86-4309-954b-ef69a6d8982d.bicep |   2 +-
 ..._a8e65618-c367-42bc-916a-b192ddf4c6ca.json |   2 +-
 ..._eefabb12-9ce7-4784-911a-c7000424388e.json |   2 +-
 ..._edbbb4d2-00e5-4592-a489-08c2afe37506.json |   2 +-
 ..._1b3f0c37-61b9-4024-8e4b-17b2279d3306.json |   2 +-
 ..._d11e2210-d818-43c6-9380-b0f6cd02ed6e.json |   2 +-
 ..._222d5a84-2439-4f76-90a2-a44161eafbb0.json |   2 +-
 ..._44d508c2-ae0c-487b-bf5f-65422a59cd63.json |   2 +-
 ..._560c969e-13bd-43bf-8b07-5798f6c4a31c.json |   2 +-
 ..._e03e4072-a5d4-46e8-b5fe-dc586ca56a86.json |   2 +-
 ..._1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.json |   2 +-
 ..._2f25b89a-6c5b-4a74-9584-31fe13802d3c.json |   2 +-
 ..._691468ac-c0a5-45cf-81d1-41032c7c766a.json |   2 +-
 ..._55c5591a-60bb-48a0-bdd5-4c35f6293278.json |   2 +-
 ..._c87ad0cd-e867-4d18-b61c-ec2a092ef459.json |   2 +-
 ..._1f0258f8-bc06-4593-9d77-eba879f5b62d.json |   2 +-
 ..._b31d7620-f79b-4a44-b4f6-e96563040ea4.json |   2 +-
 ..._c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.json |   2 +-
 ...a8e65618-c367-42bc-916a-b192ddf4c6ca.bicep |   2 +-
 ...eefabb12-9ce7-4784-911a-c7000424388e.bicep |   2 +-
 ...edbbb4d2-00e5-4592-a489-08c2afe37506.bicep |   2 +-
 ...1b3f0c37-61b9-4024-8e4b-17b2279d3306.bicep |   2 +-
 ...d11e2210-d818-43c6-9380-b0f6cd02ed6e.bicep |   2 +-
 ...222d5a84-2439-4f76-90a2-a44161eafbb0.bicep |   2 +-
 ...44d508c2-ae0c-487b-bf5f-65422a59cd63.bicep |   2 +-
 ...560c969e-13bd-43bf-8b07-5798f6c4a31c.bicep |   2 +-
 ...e03e4072-a5d4-46e8-b5fe-dc586ca56a86.bicep |   2 +-
 ...1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.bicep |   2 +-
 ...2f25b89a-6c5b-4a74-9584-31fe13802d3c.bicep |   2 +-
 ...691468ac-c0a5-45cf-81d1-41032c7c766a.bicep |   2 +-
 ...55c5591a-60bb-48a0-bdd5-4c35f6293278.bicep |   2 +-
 ...c87ad0cd-e867-4d18-b61c-ec2a092ef459.bicep |   2 +-
 ...1f0258f8-bc06-4593-9d77-eba879f5b62d.bicep |   2 +-
 ...b31d7620-f79b-4a44-b4f6-e96563040ea4.bicep |   2 +-
 ...c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.bicep |   2 +-
 ..._d5a028d1-ae0e-4349-8a79-630f891c8235.json |   2 +-
 ..._65deae31-85e8-477a-b17e-50d2d10cd7b0.json |   2 +-
 ..._d78fc655-68ca-4877-ac60-7fc805f1ae94.json |   2 +-
 ...d5a028d1-ae0e-4349-8a79-630f891c8235.bicep |   2 +-
 ...65deae31-85e8-477a-b17e-50d2d10cd7b0.bicep |   2 +-
 ...d78fc655-68ca-4877-ac60-7fc805f1ae94.bicep |   2 +-
 ..._0914c189-0adc-45d6-8704-d2ae73b9b7b6.json |   2 +-
 ..._3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.json |   2 +-
 ..._9bae539a-12ed-46e2-b105-101ce036c9a4.json |   2 +-
 ..._0cb53be3-76b5-44be-9f32-bcc821be34b6.json |   2 +-
 ..._f77ce9c2-bb95-47e7-8e5d-75d5c098f489.json |   2 +-
 ..._9c41c539-b81b-4917-b04a-e67225f78e75.json |   2 +-
 ..._228e104f-002a-441d-91ec-6140f233c1a4.json |   2 +-
 ..._cf0655a4-042d-4979-bbc7-5559eaa8f2b9.json |   2 +-
 ..._28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.json |   2 +-
 ..._ee10b769-b38b-44d1-9fd3-926b8dca4c41.json |   2 +-
 ..._faf5510e-28b7-42c9-8ad1-de68a5737eaf.json |   2 +-
 ..._a7958120-a386-46d0-9790-e80bfa72fb22.json |   2 +-
 ..._14fc7c6b-484f-427f-a1d2-94cded799f88.json |   2 +-
 ..._2a1deb2d-1fc0-499b-a828-04aeece855fe.json |   2 +-
 ..._d4d7685a-ce55-4709-a847-747d02165cb7.json |   2 +-
 ...0914c189-0adc-45d6-8704-d2ae73b9b7b6.bicep |   2 +-
 ...3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.bicep |   2 +-
 ...9bae539a-12ed-46e2-b105-101ce036c9a4.bicep |   2 +-
 ...0cb53be3-76b5-44be-9f32-bcc821be34b6.bicep |   2 +-
 ...f77ce9c2-bb95-47e7-8e5d-75d5c098f489.bicep |   2 +-
 ...9c41c539-b81b-4917-b04a-e67225f78e75.bicep |   2 +-
 ...228e104f-002a-441d-91ec-6140f233c1a4.bicep |   2 +-
 ...cf0655a4-042d-4979-bbc7-5559eaa8f2b9.bicep |   2 +-
 ...28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.bicep |   2 +-
 ...ee10b769-b38b-44d1-9fd3-926b8dca4c41.bicep |   2 +-
 ...faf5510e-28b7-42c9-8ad1-de68a5737eaf.bicep |   2 +-
 ...a7958120-a386-46d0-9790-e80bfa72fb22.bicep |   2 +-
 ...14fc7c6b-484f-427f-a1d2-94cded799f88.bicep |   2 +-
 ...2a1deb2d-1fc0-499b-a828-04aeece855fe.bicep |   2 +-
 ...d4d7685a-ce55-4709-a847-747d02165cb7.bicep |   2 +-
 ..._c02f2d18-2b7e-4d85-81fa-2c1437d0b092.json |   2 +-
 ..._6584a39d-0795-4132-8c33-376d3926d21b.json |   2 +-
 ..._fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.json |   2 +-
 ...c02f2d18-2b7e-4d85-81fa-2c1437d0b092.bicep |   2 +-
 ...6584a39d-0795-4132-8c33-376d3926d21b.bicep |   2 +-
 ...fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.bicep |   2 +-
 ..._343258f9-4bb2-41fb-abfa-d04ea62a6aad.json |   2 +-
 ..._95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.json |   2 +-
 ..._e9561f89-282e-4145-b5cc-8485a7fc987c.json |   2 +-
 ..._230c0173-8b36-4412-9617-3e096886a403.json |   2 +-
 ...343258f9-4bb2-41fb-abfa-d04ea62a6aad.bicep |   2 +-
 ...95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.bicep |   2 +-
 ...e9561f89-282e-4145-b5cc-8485a7fc987c.bicep |   2 +-
 ...230c0173-8b36-4412-9617-3e096886a403.bicep |   2 +-
 ..._8875590a-9f72-49a2-807f-62437f8079b1.json |   2 +-
 ...8875590a-9f72-49a2-807f-62437f8079b1.bicep |   2 +-
 ..._2959b52d-6756-480d-9193-b2c0c4c5d305.json |   2 +-
 ..._2ca39ff3-6f87-438c-81f6-7ce51f70902f.json |   2 +-
 ..._4f1964ce-6938-499a-af3d-bb746aaff72a.json |   2 +-
 ..._a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.json |   2 +-
 ..._26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.json |   2 +-
 ..._46a66177-c487-4ed1-b2fc-19c0bf52b168.json |   2 +-
 ..._c67b86dc-74d5-4ea1-882e-de257d054ff3.json |   2 +-
 ..._237493ef-15c0-4e87-80bc-f8c59dd897ce.json |   2 +-
 ..._48581aa9-53ee-4467-b04c-402061fe40e8.json |   2 +-
 ..._1684f387-04e6-440c-a931-f57efdc84cd2.json |   2 +-
 ..._b1700765-b168-4ad4-a73e-f3a93a6bf5cf.json |   2 +-
 ...2959b52d-6756-480d-9193-b2c0c4c5d305.bicep |   2 +-
 ...2ca39ff3-6f87-438c-81f6-7ce51f70902f.bicep |   2 +-
 ...4f1964ce-6938-499a-af3d-bb746aaff72a.bicep |   2 +-
 ...a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.bicep |   2 +-
 ...26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.bicep |   2 +-
 ...46a66177-c487-4ed1-b2fc-19c0bf52b168.bicep |   2 +-
 ...c67b86dc-74d5-4ea1-882e-de257d054ff3.bicep |   2 +-
 ...237493ef-15c0-4e87-80bc-f8c59dd897ce.bicep |   2 +-
 ...48581aa9-53ee-4467-b04c-402061fe40e8.bicep |   2 +-
 ...1684f387-04e6-440c-a931-f57efdc84cd2.bicep |   2 +-
 ...b1700765-b168-4ad4-a73e-f3a93a6bf5cf.bicep |   2 +-
 ..._f68ed392-7179-419d-8ee6-3813ea10866b.json |   2 +-
 ..._a3c8bcb4-22ca-45be-92f7-605f232ecec2.json |   2 +-
 ..._dc852755-e5df-4fd0-83ac-cbbc516f60b3.json |   2 +-
 ..._7b52bf07-3d86-4429-b5d4-829a6a5542df.json |   2 +-
 ..._2651f57f-ac74-44f3-8511-c245488134f8.json |   2 +-
 ..._14356b19-1264-498d-b1cd-e3fa9f0c9fc9.json |   2 +-
 ...f68ed392-7179-419d-8ee6-3813ea10866b.bicep |   2 +-
 ...a3c8bcb4-22ca-45be-92f7-605f232ecec2.bicep |   2 +-
 ...dc852755-e5df-4fd0-83ac-cbbc516f60b3.bicep |   2 +-
 ...7b52bf07-3d86-4429-b5d4-829a6a5542df.bicep |   2 +-
 ...2651f57f-ac74-44f3-8511-c245488134f8.bicep |   2 +-
 ...14356b19-1264-498d-b1cd-e3fa9f0c9fc9.bicep |   2 +-
 ..._422c292e-54e3-4e7d-93e2-bcd1bf65dae6.json |   2 +-
 ..._cae6ec0a-a26d-494b-94b2-3d93dcedff42.json |   2 +-
 ..._8493c362-2524-4079-9025-8f5ffee62936.json |   2 +-
 ..._6c4213c5-743f-48b8-b957-dd26fbf8809e.json |   2 +-
 ..._188fc0b5-a686-48a7-950f-76f183ba49d6.json |   2 +-
 ...422c292e-54e3-4e7d-93e2-bcd1bf65dae6.bicep |   2 +-
 ...cae6ec0a-a26d-494b-94b2-3d93dcedff42.bicep |   2 +-
 ...8493c362-2524-4079-9025-8f5ffee62936.bicep |   2 +-
 ...6c4213c5-743f-48b8-b957-dd26fbf8809e.bicep |   2 +-
 ...188fc0b5-a686-48a7-950f-76f183ba49d6.bicep |   2 +-
 ..._d8bf77d2-8572-4392-8097-5e84f136513d.json |   2 +-
 ..._5aa5790b-2bff-40b0-9099-38485b9a9e0a.json |   2 +-
 ..._514f695a-4f11-4a28-9516-f7f3b5b1c53b.json |   2 +-
 ..._c4864d80-dd28-4344-a135-03b600920c06.json |   2 +-
 ..._eb44cbdc-a259-4354-9b54-2bc72f811440.json |   2 +-
 ..._6524b22c-661e-48cd-87e7-7ee9ddea7b8b.json |   2 +-
 ..._346ba728-f7a1-4ca4-8486-786d6ebb9f9a.json |   2 +-
 ..._9d324d21-ab2b-48b7-a637-4b1d9891d6b5.json |   2 +-
 ..._a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.json |   2 +-
 ..._5d020d4d-9359-4ecd-934a-409d0e4a5abd.json |   2 +-
 ..._350cc22f-d202-4c7c-9239-cbdb3b71e14b.json |   2 +-
 ..._8f7a8cb8-feef-4eaa-9e74-18693ce9969e.json |   2 +-
 ..._16c2d231-f28b-4146-9aa3-57d419eb8780.json |   2 +-
 ..._85bb464e-d9ce-496a-a66d-4c6d28d808df.json |   2 +-
 ..._114f7c8e-e285-487d-9e50-7fe160769167.json |   2 +-
 ..._42ae6a24-d545-4bbd-a7f9-8a3b6f977366.json |   2 +-
 ..._0378fd1f-976e-4a32-aa2b-25003e7d6ee5.json |   2 +-
 ..._cb35fd68-9568-42f9-b527-44e77726b100.json |   2 +-
 ...d8bf77d2-8572-4392-8097-5e84f136513d.bicep |   2 +-
 ...5aa5790b-2bff-40b0-9099-38485b9a9e0a.bicep |   2 +-
 ...514f695a-4f11-4a28-9516-f7f3b5b1c53b.bicep |   2 +-
 ...c4864d80-dd28-4344-a135-03b600920c06.bicep |   2 +-
 ...eb44cbdc-a259-4354-9b54-2bc72f811440.bicep |   2 +-
 ...6524b22c-661e-48cd-87e7-7ee9ddea7b8b.bicep |   2 +-
 ...346ba728-f7a1-4ca4-8486-786d6ebb9f9a.bicep |   2 +-
 ...9d324d21-ab2b-48b7-a637-4b1d9891d6b5.bicep |   2 +-
 ...a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.bicep |   2 +-
 ...5d020d4d-9359-4ecd-934a-409d0e4a5abd.bicep |   2 +-
 ...350cc22f-d202-4c7c-9239-cbdb3b71e14b.bicep |   2 +-
 ...8f7a8cb8-feef-4eaa-9e74-18693ce9969e.bicep |   2 +-
 ...16c2d231-f28b-4146-9aa3-57d419eb8780.bicep |   2 +-
 ...85bb464e-d9ce-496a-a66d-4c6d28d808df.bicep |   2 +-
 ...114f7c8e-e285-487d-9e50-7fe160769167.bicep |   2 +-
 ...42ae6a24-d545-4bbd-a7f9-8a3b6f977366.bicep |   2 +-
 ...0378fd1f-976e-4a32-aa2b-25003e7d6ee5.bicep |   2 +-
 ...cb35fd68-9568-42f9-b527-44e77726b100.bicep |   2 +-
 ..._c897902c-40a5-497b-a0ce-86c3eda7c61d.json |   2 +-
 ..._0337a76f-238e-4d4d-9cd1-48b205874dbb.json |   2 +-
 ..._d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.json |   2 +-
 ..._be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.json |   2 +-
 ..._a171bc0c-676f-464b-a7b5-e50cd6c612a2.json |   2 +-
 ...c897902c-40a5-497b-a0ce-86c3eda7c61d.bicep |   2 +-
 ...0337a76f-238e-4d4d-9cd1-48b205874dbb.bicep |   2 +-
 ...d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.bicep |   2 +-
 ...be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.bicep |   2 +-
 ...a171bc0c-676f-464b-a7b5-e50cd6c612a2.bicep |   2 +-
 ..._30b0cb86-ba8b-4eeb-9067-88456ec403ad.json |   2 +-
 ..._075f0066-51f6-4c36-8000-ce7070493674.json |   2 +-
 ..._27768691-301d-4938-bd8a-85598c2b50c6.json |   2 +-
 ..._1be09484-96ee-4399-8ed4-35f5f4b5c23e.json |   2 +-
 ..._d474e6d2-0b9a-4912-ae61-16dc23126b3f.json |   2 +-
 ..._149f6b6c-4729-4da4-af00-bccbb1cce9ae.json |   2 +-
 ...30b0cb86-ba8b-4eeb-9067-88456ec403ad.bicep |   2 +-
 ...075f0066-51f6-4c36-8000-ce7070493674.bicep |   2 +-
 ...27768691-301d-4938-bd8a-85598c2b50c6.bicep |   2 +-
 ...1be09484-96ee-4399-8ed4-35f5f4b5c23e.bicep |   2 +-
 ...d474e6d2-0b9a-4912-ae61-16dc23126b3f.bicep |   2 +-
 ...149f6b6c-4729-4da4-af00-bccbb1cce9ae.bicep |   2 +-
 ..._73fa1878-d22d-4e8d-922d-9f146454cc40.json |   2 +-
 ..._d5827f03-efb6-4257-96e2-b6e34e3bef7e.json |   2 +-
 ..._e636b3ea-da2d-42f5-aedf-12b69432ac1f.json |   2 +-
 ..._3cbcad15-0bb6-423e-87c1-4d40722103d6.json |   2 +-
 ..._57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.json |   2 +-
 ..._c319a40c-3750-4fb4-a36d-beb3d09ef2ee.json |   2 +-
 ..._d43ca9ef-6211-40ff-972e-fffb17923fc9.json |   2 +-
 ..._e59f4d17-2600-4bcc-ab57-6c695d37a0b2.json |   2 +-
 ..._9c8be4c5-5ba3-47ef-8a0a-97144734a336.json |   2 +-
 ..._695b9710-e432-4521-9042-36287f0fc5ba.json |   2 +-
 ..._e77b6820-e115-4e33-97c1-9bb902eec3b2.json |   2 +-
 ..._73afde26-bd0c-4c31-8801-5b2444629448.json |   2 +-
 ..._f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.json |   2 +-
 ..._6d77d848-23b1-4ff4-b9de-d421845d9566.json |   2 +-
 ..._7640663c-b2f7-41bf-9419-be5e8cfdf74e.json |   2 +-
 ..._06982a17-4def-405d-bb59-4ecfb6486f9e.json |   2 +-
 ..._c88acf4e-2d23-4ac7-93fb-e44ded53ecee.json |   2 +-
 ...73fa1878-d22d-4e8d-922d-9f146454cc40.bicep |   2 +-
 ...d5827f03-efb6-4257-96e2-b6e34e3bef7e.bicep |   2 +-
 ...e636b3ea-da2d-42f5-aedf-12b69432ac1f.bicep |   2 +-
 ...3cbcad15-0bb6-423e-87c1-4d40722103d6.bicep |   2 +-
 ...57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.bicep |   2 +-
 ...c319a40c-3750-4fb4-a36d-beb3d09ef2ee.bicep |   2 +-
 ...d43ca9ef-6211-40ff-972e-fffb17923fc9.bicep |   2 +-
 ...e59f4d17-2600-4bcc-ab57-6c695d37a0b2.bicep |   2 +-
 ...9c8be4c5-5ba3-47ef-8a0a-97144734a336.bicep |   2 +-
 ...695b9710-e432-4521-9042-36287f0fc5ba.bicep |   2 +-
 ...e77b6820-e115-4e33-97c1-9bb902eec3b2.bicep |   2 +-
 ...73afde26-bd0c-4c31-8801-5b2444629448.bicep |   2 +-
 ...f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.bicep |   2 +-
 ...6d77d848-23b1-4ff4-b9de-d421845d9566.bicep |   2 +-
 ...7640663c-b2f7-41bf-9419-be5e8cfdf74e.bicep |   2 +-
 ...06982a17-4def-405d-bb59-4ecfb6486f9e.bicep |   2 +-
 ...c88acf4e-2d23-4ac7-93fb-e44ded53ecee.bicep |   2 +-
 ..._0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.json |   2 +-
 ..._0ff72493-3822-4315-a146-8977a0963e39.json |   2 +-
 ..._b23f1e82-a791-4610-aaa6-2d960b48b81d.json |   2 +-
 ..._e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.json |   2 +-
 ...0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.bicep |   2 +-
 ...0ff72493-3822-4315-a146-8977a0963e39.bicep |   2 +-
 ...b23f1e82-a791-4610-aaa6-2d960b48b81d.bicep |   2 +-
 ...e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.bicep |   2 +-
 ..._afd848a8-8b18-410c-bcc1-1b6f06a5a231.json |   2 +-
 ..._0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.json |   2 +-
 ..._2c288e52-422b-4f7e-85cf-feb3d08a1602.json |   2 +-
 ...afd848a8-8b18-410c-bcc1-1b6f06a5a231.bicep |   2 +-
 ...0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.bicep |   2 +-
 ...2c288e52-422b-4f7e-85cf-feb3d08a1602.bicep |   2 +-
 ..._494aa5d6-444d-4c86-9de5-431b3e12a233.json |   2 +-
 ..._b050d767-098e-4947-aa88-2a3090e62eab.json |   2 +-
 ...494aa5d6-444d-4c86-9de5-431b3e12a233.bicep |   2 +-
 ...b050d767-098e-4947-aa88-2a3090e62eab.bicep |   2 +-
 ..._0d1709ed-805e-4ca1-8490-f2d6b393e92f.json |   2 +-
 ..._dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.json |   2 +-
 ...0d1709ed-805e-4ca1-8490-f2d6b393e92f.bicep |   2 +-
 ...dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.bicep |   2 +-
 ..._efc101c0-0623-4928-86a7-6f2d37faf24b.json |   2 +-
 ..._37302f31-86e2-45c8-a39f-d0b41c1271df.json |   2 +-
 ..._2e4ae517-3d35-4677-a4b0-441ca19e7670.json |   2 +-
 ..._cc428042-1a21-43f7-b5f8-598dea50f4a2.json |   2 +-
 ..._d56551a8-1355-4aa3-871e-e20e1ce40f05.json |   2 +-
 ..._5808dbdb-712e-4bd3-b92e-4a08388c32c6.json |   2 +-
 ..._47fe6c76-47a0-433f-92d6-a23d9f573771.json | 199 ------------------
 ..._8a586e59-0f53-41bd-8406-174f9f0ecf7e.json | 199 ------------------
 ...efc101c0-0623-4928-86a7-6f2d37faf24b.bicep |   2 +-
 ...37302f31-86e2-45c8-a39f-d0b41c1271df.bicep |   2 +-
 ...2e4ae517-3d35-4677-a4b0-441ca19e7670.bicep |   2 +-
 ...cc428042-1a21-43f7-b5f8-598dea50f4a2.bicep |   2 +-
 ...d56551a8-1355-4aa3-871e-e20e1ce40f05.bicep |   2 +-
 ...5808dbdb-712e-4bd3-b92e-4a08388c32c6.bicep |   2 +-
 ...47fe6c76-47a0-433f-92d6-a23d9f573771.bicep | 135 ------------
 ...8a586e59-0f53-41bd-8406-174f9f0ecf7e.bicep | 135 ------------
 ..._ff147700-c9e6-4063-bb23-45500c00067a.json |   2 +-
 ..._4d5c7854-e044-4dd6-971b-df433fa3ad37.json |   2 +-
 ..._af1ba971-9b73-4b7f-8040-5eff9f5778d5.json |   2 +-
 ...ff147700-c9e6-4063-bb23-45500c00067a.bicep |   2 +-
 ...4d5c7854-e044-4dd6-971b-df433fa3ad37.bicep |   2 +-
 ...af1ba971-9b73-4b7f-8040-5eff9f5778d5.bicep |   2 +-
 ..._0fac138d-cf48-4dc2-ac02-053d0b24e620.json |   2 +-
 ..._08dad105-6416-4348-9feb-339f73e24262.json |   2 +-
 ..._ca29484c-b6e5-467e-984d-567e262380d7.json |   2 +-
 ..._ceaeccae-ffa5-4c8c-8415-c7be8266977d.json |   2 +-
 ..._bf37971c-60f4-4652-a059-7607b1d6d31b.json |   2 +-
 ..._dee0e83f-8d5c-4735-9730-1a850354e4b1.json |   2 +-
 ..._378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.json |   2 +-
 ...0fac138d-cf48-4dc2-ac02-053d0b24e620.bicep |   2 +-
 ...08dad105-6416-4348-9feb-339f73e24262.bicep |   2 +-
 ...ca29484c-b6e5-467e-984d-567e262380d7.bicep |   2 +-
 ...ceaeccae-ffa5-4c8c-8415-c7be8266977d.bicep |   2 +-
 ...bf37971c-60f4-4652-a059-7607b1d6d31b.bicep |   2 +-
 ...dee0e83f-8d5c-4735-9730-1a850354e4b1.bicep |   2 +-
 ...378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.bicep |   2 +-
 ..._15a67b66-30eb-4d0f-aa98-7350304347d0.json |   2 +-
 ..._a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.json |   2 +-
 ..._5ec4f863-ec6f-4fe8-b258-a53b3183138a.json |   2 +-
 ..._1987b5a9-bbc3-43c6-af35-cd69e61fe043.json |   2 +-
 ...15a67b66-30eb-4d0f-aa98-7350304347d0.bicep |   2 +-
 ...a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.bicep |   2 +-
 ...5ec4f863-ec6f-4fe8-b258-a53b3183138a.bicep |   2 +-
 ...1987b5a9-bbc3-43c6-af35-cd69e61fe043.bicep |   2 +-
 ..._a39efd3b-04ef-48d4-a862-053092bdd6e5.json |   2 +-
 ..._055c20da-0d21-4c6a-a80b-f2c4b3887804.json |   2 +-
 ..._39d3123b-daaa-4f70-97a3-8a4f326104af.json |   2 +-
 ..._a92cb746-f19f-450b-b413-8b9710b0176b.json |   2 +-
 ..._b239797f-e627-4e48-8609-94db72098c3d.json |   2 +-
 ...a39efd3b-04ef-48d4-a862-053092bdd6e5.bicep |   2 +-
 ...055c20da-0d21-4c6a-a80b-f2c4b3887804.bicep |   2 +-
 ...39d3123b-daaa-4f70-97a3-8a4f326104af.bicep |   2 +-
 ...a92cb746-f19f-450b-b413-8b9710b0176b.bicep |   2 +-
 ...b239797f-e627-4e48-8609-94db72098c3d.bicep |   2 +-
 ..._e1808855-9a4d-464d-b75a-a41183c520bd.json |   2 +-
 ..._7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.json |   2 +-
 ..._53bb49ec-ed5b-40c3-999b-efefa9be4536.json |   2 +-
 ..._4c2e410b-644e-4331-a55c-19bfdc3e4754.json |   2 +-
 ..._c57f27b1-151c-4d27-a77e-b85547d817f7.json |   2 +-
 ...e1808855-9a4d-464d-b75a-a41183c520bd.bicep |   2 +-
 ...7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.bicep |   2 +-
 ...53bb49ec-ed5b-40c3-999b-efefa9be4536.bicep |   2 +-
 ...4c2e410b-644e-4331-a55c-19bfdc3e4754.bicep |   2 +-
 ...c57f27b1-151c-4d27-a77e-b85547d817f7.bicep |   2 +-
 ..._4c54dd21-b5ce-4185-aa70-605b167f168f.json |   2 +-
 ...4c54dd21-b5ce-4185-aa70-605b167f168f.bicep |   2 +-
 ..._61cbc62a-1382-4581-850f-4ea69d8a9615.json |   2 +-
 ..._7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.json |   2 +-
 ..._1744119b-cabb-4ac4-97c6-a61249a6c5be.json |   2 +-
 ..._370ff9a8-11ea-469a-9f52-b1c39d61c39d.json |   2 +-
 ...61cbc62a-1382-4581-850f-4ea69d8a9615.bicep |   2 +-
 ...7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.bicep |   2 +-
 ...1744119b-cabb-4ac4-97c6-a61249a6c5be.bicep |   2 +-
 ...370ff9a8-11ea-469a-9f52-b1c39d61c39d.bicep |   2 +-
 ..._4d219611-6487-4fcf-9bac-29cd9e5046a9.json |   2 +-
 ..._95473b2f-74ea-4929-bf22-f6f3be4ccbd5.json |   2 +-
 ..._b410b69e-8bd5-44fe-899d-f4d5dce9931a.json |   2 +-
 ..._e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.json |   2 +-
 ..._c064753f-ea6a-4940-b603-975adb5127ae.json |   2 +-
 ...4d219611-6487-4fcf-9bac-29cd9e5046a9.bicep |   2 +-
 ...95473b2f-74ea-4929-bf22-f6f3be4ccbd5.bicep |   2 +-
 ...b410b69e-8bd5-44fe-899d-f4d5dce9931a.bicep |   2 +-
 ...e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.bicep |   2 +-
 ...c064753f-ea6a-4940-b603-975adb5127ae.bicep |   2 +-
 ..._652acaf1-c5a1-4a88-b3bb-822a14dece19.json |   2 +-
 ..._cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.json |   2 +-
 ..._a78addf1-4632-4fc2-9afc-d1fb75049872.json |   2 +-
 ..._54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.json |   2 +-
 ..._529b0b1f-46fc-423f-94ab-dd71dd7894e2.json |   2 +-
 ..._8020f41e-ca61-43b4-88ca-f520057dfa92.json |   2 +-
 ..._27181c58-ca7a-433f-a0ee-a7a33102cb36.json |   2 +-
 ..._7f4c355a-5411-4400-826a-b82007bbd83d.json |   2 +-
 ...652acaf1-c5a1-4a88-b3bb-822a14dece19.bicep |   2 +-
 ...cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.bicep |   2 +-
 ...a78addf1-4632-4fc2-9afc-d1fb75049872.bicep |   2 +-
 ...54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.bicep |   2 +-
 ...529b0b1f-46fc-423f-94ab-dd71dd7894e2.bicep |   2 +-
 ...8020f41e-ca61-43b4-88ca-f520057dfa92.bicep |   2 +-
 ...27181c58-ca7a-433f-a0ee-a7a33102cb36.bicep |   2 +-
 ...7f4c355a-5411-4400-826a-b82007bbd83d.bicep |   2 +-
 ..._6c81eeff-a3a7-4c72-a58e-f2e547ab2799.json |   2 +-
 ...6c81eeff-a3a7-4c72-a58e-f2e547ab2799.bicep |   2 +-
 ..._dd3f294f-d12e-4e34-8f6a-c304d3d977e2.json |   2 +-
 ..._f4699243-1ba2-49a8-85f8-c4a22a563925.json |   2 +-
 ...dd3f294f-d12e-4e34-8f6a-c304d3d977e2.bicep |   2 +-
 ...f4699243-1ba2-49a8-85f8-c4a22a563925.bicep |   2 +-
 ..._88642ff7-6c08-486a-9bf2-37764d5bf6a3.json |   2 +-
 ..._4c3c25d2-7473-4d0c-9174-609162571859.json |   2 +-
 ..._56491bc7-1267-42a2-92c6-fe9efe822ff1.json |   2 +-
 ..._09bb7f01-a715-437d-b692-325f89e1869e.json |   2 +-
 ..._092f6e09-1eb5-436d-b7c2-eadb70318920.json |   2 +-
 ..._6f02e3e8-9bfa-4312-a352-6506139e3dba.json |   2 +-
 ..._ca909c09-89c4-467e-bdca-9140e72d6c82.json |   2 +-
 ..._a34fa329-da3e-4947-8d06-9bd2bee6c8a7.json |   2 +-
 ..._b511650f-535c-45d1-a089-0ea402245deb.json |   2 +-
 ..._1cc4a539-e4bf-40e8-a280-f4e9e178fb51.json |   2 +-
 ...88642ff7-6c08-486a-9bf2-37764d5bf6a3.bicep |   2 +-
 ...4c3c25d2-7473-4d0c-9174-609162571859.bicep |   2 +-
 ...56491bc7-1267-42a2-92c6-fe9efe822ff1.bicep |   2 +-
 ...09bb7f01-a715-437d-b692-325f89e1869e.bicep |   2 +-
 ...092f6e09-1eb5-436d-b7c2-eadb70318920.bicep |   2 +-
 ...6f02e3e8-9bfa-4312-a352-6506139e3dba.bicep |   2 +-
 ...ca909c09-89c4-467e-bdca-9140e72d6c82.bicep |   2 +-
 ...a34fa329-da3e-4947-8d06-9bd2bee6c8a7.bicep |   2 +-
 ...b511650f-535c-45d1-a089-0ea402245deb.bicep |   2 +-
 ...1cc4a539-e4bf-40e8-a280-f4e9e178fb51.bicep |   2 +-
 ..._72dea6f4-858c-423f-8189-406aac7d20ac.json |   2 +-
 ...72dea6f4-858c-423f-8189-406aac7d20ac.bicep |   2 +-
 ..._50c8313a-bbe7-4981-8eee-4b4d44fda37f.json |   2 +-
 ..._b0ea832c-aae8-42c0-ad83-0bb13d66d56e.json |   2 +-
 ..._d74fd111-125f-45b8-8bbc-e23bd40aa869.json |   2 +-
 ..._cd3b834d-f34f-4a67-af01-b1c5d32195a9.json |   2 +-
 ..._c5ae6d80-59db-4087-8e9b-0df36c54ebe9.json |   2 +-
 ..._7b361791-127e-4a6f-9c1b-c8d9f41ec223.json |   2 +-
 ..._a05d97b8-37b9-4100-a860-d57363aaaf5f.json |   2 +-
 ..._c2c9a09d-7fad-4c67-9a29-4c2c376a7214.json |   2 +-
 ..._7affb4da-2058-4f12-b15b-ca58e92b63e5.json |   2 +-
 ...50c8313a-bbe7-4981-8eee-4b4d44fda37f.bicep |   2 +-
 ...b0ea832c-aae8-42c0-ad83-0bb13d66d56e.bicep |   2 +-
 ...d74fd111-125f-45b8-8bbc-e23bd40aa869.bicep |   2 +-
 ...cd3b834d-f34f-4a67-af01-b1c5d32195a9.bicep |   2 +-
 ...c5ae6d80-59db-4087-8e9b-0df36c54ebe9.bicep |   2 +-
 ...7b361791-127e-4a6f-9c1b-c8d9f41ec223.bicep |   2 +-
 ...a05d97b8-37b9-4100-a860-d57363aaaf5f.bicep |   2 +-
 ...c2c9a09d-7fad-4c67-9a29-4c2c376a7214.bicep |   2 +-
 ...7affb4da-2058-4f12-b15b-ca58e92b63e5.bicep |   2 +-
 ..._63cdfaa7-f029-4c4b-8f34-fff71fe401af.json |   2 +-
 ..._04a98577-458a-4a5d-88b2-22b2d140f9f3.json |   2 +-
 ..._99ba0b14-4b3c-49b5-8763-3161b9aae538.json |   2 +-
 ..._b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.json |   2 +-
 ..._91044c16-83bc-457f-80a9-360bad5dedb4.json |   2 +-
 ..._8b472051-ff68-4059-9e50-243bfb64bae4.json |   2 +-
 ..._aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.json |   2 +-
 ..._60ec2790-dc83-419c-bdb5-38da9a477c68.json |   2 +-
 ..._de6d5087-bc5a-474f-9319-248a3c03ab44.json |   2 +-
 ..._a70e406c-a0ae-4e0f-99cd-8b0836812c59.json |   2 +-
 ..._08a4f049-9bb8-45d0-9dfb-320f385cc71f.json |   2 +-
 ..._30b462dd-d026-4122-9bcf-3a114517e04c.json |   2 +-
 ..._969677fe-d1e0-42f6-92af-c9269780411b.json |   2 +-
 ..._db621663-ec0a-4fa3-82a7-b6b110726568.json |   2 +-
 ..._1116a5eb-9e12-415a-af46-fad552421d36.json |   2 +-
 ..._732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.json |   2 +-
 ..._88b7198b-32a5-4ae2-aaa5-7925066cc08c.json |   2 +-
 ..._0c416177-e7ce-40d5-8f15-8566b3d7c03c.json |   2 +-
 ..._593b6885-3fb8-4562-89f1-8b0b68649185.json |   2 +-
 ..._76583e85-8be6-4d02-8e09-aff0ce8574f8.json |   2 +-
 ..._af5d055f-0e1f-4c48-808a-d21f8268357d.json |   2 +-
 ..._171e5b5c-78cc-44a1-b7fb-7d750914ed5e.json |   2 +-
 ..._49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.json |   2 +-
 ..._04f64694-48a2-48ee-9455-ccce8e59b66f.json |   2 +-
 ..._b8140cdb-5492-4177-881f-8668372947a8.json |   2 +-
 ..._0b608189-b028-4851-8854-9ce1a48c3dd6.json |   2 +-
 ..._83703f70-9ea8-44aa-b88a-a8e56eb42858.json |   2 +-
 ...63cdfaa7-f029-4c4b-8f34-fff71fe401af.bicep |   2 +-
 ...04a98577-458a-4a5d-88b2-22b2d140f9f3.bicep |   2 +-
 ...99ba0b14-4b3c-49b5-8763-3161b9aae538.bicep |   2 +-
 ...b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.bicep |   2 +-
 ...91044c16-83bc-457f-80a9-360bad5dedb4.bicep |   2 +-
 ...8b472051-ff68-4059-9e50-243bfb64bae4.bicep |   2 +-
 ...aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.bicep |   2 +-
 ...60ec2790-dc83-419c-bdb5-38da9a477c68.bicep |   2 +-
 ...de6d5087-bc5a-474f-9319-248a3c03ab44.bicep |   2 +-
 ...a70e406c-a0ae-4e0f-99cd-8b0836812c59.bicep |   2 +-
 ...08a4f049-9bb8-45d0-9dfb-320f385cc71f.bicep |   2 +-
 ...30b462dd-d026-4122-9bcf-3a114517e04c.bicep |   2 +-
 ...969677fe-d1e0-42f6-92af-c9269780411b.bicep |   2 +-
 ...db621663-ec0a-4fa3-82a7-b6b110726568.bicep |   2 +-
 ...1116a5eb-9e12-415a-af46-fad552421d36.bicep |   2 +-
 ...732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.bicep |   2 +-
 ...88b7198b-32a5-4ae2-aaa5-7925066cc08c.bicep |   2 +-
 ...0c416177-e7ce-40d5-8f15-8566b3d7c03c.bicep |   2 +-
 ...593b6885-3fb8-4562-89f1-8b0b68649185.bicep |   2 +-
 ...76583e85-8be6-4d02-8e09-aff0ce8574f8.bicep |   2 +-
 ...af5d055f-0e1f-4c48-808a-d21f8268357d.bicep |   2 +-
 ...171e5b5c-78cc-44a1-b7fb-7d750914ed5e.bicep |   2 +-
 ...49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.bicep |   2 +-
 ...04f64694-48a2-48ee-9455-ccce8e59b66f.bicep |   2 +-
 ...b8140cdb-5492-4177-881f-8668372947a8.bicep |   2 +-
 ...0b608189-b028-4851-8854-9ce1a48c3dd6.bicep |   2 +-
 ...83703f70-9ea8-44aa-b88a-a8e56eb42858.bicep |   2 +-
 ..._2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.json |   2 +-
 ...2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.bicep |   2 +-
 ..._8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.json |   2 +-
 ..._805aa9c8-4d52-411d-9811-cc02b33952e3.json |   2 +-
 ...8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.bicep |   2 +-
 ...805aa9c8-4d52-411d-9811-cc02b33952e3.bicep |   2 +-
 ..._afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.json |   2 +-
 ..._7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.json |   2 +-
 ..._f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.json |   2 +-
 ..._26a33edf-0698-424d-aae2-6bcd5af323d5.json |   2 +-
 ..._89dbd4e4-f709-47c6-a243-4207678c8473.json |   2 +-
 ...afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.bicep |   2 +-
 ...7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.bicep |   2 +-
 ...f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.bicep |   2 +-
 ...26a33edf-0698-424d-aae2-6bcd5af323d5.bicep |   2 +-
 ...89dbd4e4-f709-47c6-a243-4207678c8473.bicep |   2 +-
 ..._5611eb31-51c7-4279-ab8c-97dba0a2c044.json |   2 +-
 ..._d3985fe5-c7f0-47a1-b52e-26098345a433.json |   2 +-
 ..._7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.json |   2 +-
 ...5611eb31-51c7-4279-ab8c-97dba0a2c044.bicep |   2 +-
 ...d3985fe5-c7f0-47a1-b52e-26098345a433.bicep |   2 +-
 ...7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.bicep |   2 +-
 ..._172396a9-27f0-4c01-9510-94ba4a0d4738.json |   2 +-
 ..._784a29e7-5799-4fde-90ee-b6ebcb2a8747.json |   2 +-
 ..._0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.json |   2 +-
 ..._868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.json |   2 +-
 ..._c1095936-da8d-4c63-ac70-cf97d5b1f630.json |   2 +-
 ..._67872571-d13d-4123-81c5-60404c4eea45.json |   2 +-
 ..._52ec94f5-0d89-434b-9d51-df92d69ba284.json |   2 +-
 ..._860d21ea-8c6a-4c78-ac40-f556eb02c3ac.json |   2 +-
 ..._fdde6805-edf8-4277-adb8-ad2f44e3f977.json |   2 +-
 ..._5543b815-f2c8-420e-847e-7507a9724557.json |   2 +-
 ..._c51c3514-1730-42f3-b8ae-f2980bd22d83.json |   2 +-
 ..._487c6beb-1468-4167-8eb6-e9b3ad8743b1.json |   2 +-
 ..._950586ee-6926-4483-96d4-82838afe1ca6.json |   2 +-
 ..._19785707-24c9-4852-b92a-31732b86ee04.json |   2 +-
 ..._a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.json |   2 +-
 ...172396a9-27f0-4c01-9510-94ba4a0d4738.bicep |   2 +-
 ...784a29e7-5799-4fde-90ee-b6ebcb2a8747.bicep |   2 +-
 ...0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.bicep |   2 +-
 ...868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.bicep |   2 +-
 ...c1095936-da8d-4c63-ac70-cf97d5b1f630.bicep |   2 +-
 ...67872571-d13d-4123-81c5-60404c4eea45.bicep |   2 +-
 ...52ec94f5-0d89-434b-9d51-df92d69ba284.bicep |   2 +-
 ...860d21ea-8c6a-4c78-ac40-f556eb02c3ac.bicep |   2 +-
 ...fdde6805-edf8-4277-adb8-ad2f44e3f977.bicep |   2 +-
 ...5543b815-f2c8-420e-847e-7507a9724557.bicep |   2 +-
 ...c51c3514-1730-42f3-b8ae-f2980bd22d83.bicep |   2 +-
 ...487c6beb-1468-4167-8eb6-e9b3ad8743b1.bicep |   2 +-
 ...950586ee-6926-4483-96d4-82838afe1ca6.bicep |   2 +-
 ...19785707-24c9-4852-b92a-31732b86ee04.bicep |   2 +-
 ...a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.bicep |   2 +-
 ..._b7581df7-f127-405e-9408-9d484122be74.json |   2 +-
 ...b7581df7-f127-405e-9408-9d484122be74.bicep |   2 +-
 ..._dfd37715-0d5c-4ec5-98ae-836cd626a27f.json |   2 +-
 ..._641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.json |   2 +-
 ...dfd37715-0d5c-4ec5-98ae-836cd626a27f.bicep |   2 +-
 ...641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.bicep |   2 +-
 ..._05591510-5fe2-454a-96d8-bbda8201c6a4.json |   2 +-
 ..._c5c95fe9-a4b4-4afa-a07a-a0d18804d416.json |   2 +-
 ..._2cda2f3a-8657-431a-a50f-56835aea9a81.json |   2 +-
 ..._7157dc17-9d5a-4835-a122-1d0d904d61ff.json |   2 +-
 ..._d528ffcb-3a99-4356-96d1-981499139ffb.json |   2 +-
 ..._460b6b29-a602-4409-b748-6b47b232a984.json |   2 +-
 ..._3ddd3f95-989c-4777-b6b8-728439aae1df.json |   2 +-
 ..._ce44fc81-3610-4165-a107-9dd4b8ab3972.json |   2 +-
 ..._50124594-a291-4183-a8e3-195f5e6f5204.json |   2 +-
 ..._d26f4c8b-0461-4c57-b230-cbd1a5424db1.json |   2 +-
 ..._70f88865-7a8b-4e03-9252-a9369df503ef.json |   2 +-
 ..._f5c13b49-8528-457d-9d7d-083b8433bf96.json |   2 +-
 ..._07eeae07-010e-47ca-ad90-fa7adb5a6c52.json |   2 +-
 ..._1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.json |   2 +-
 ..._f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.json |   2 +-
 ..._86922a27-41bb-4834-bc54-0b602b275597.json |   2 +-
 ..._0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.json |   2 +-
 ..._3743016a-a056-43fe-b53a-36dd9a17626d.json |   2 +-
 ..._7e9d0710-3243-4cf2-8b73-6be1539b8545.json |   2 +-
 ..._805c4ae5-a852-43bd-ad1c-0f7f381d8f32.json |   2 +-
 ..._5d9075b5-3c19-4cf6-9c2e-50ba4c175691.json |   2 +-
 ..._16a64053-1905-4d8e-8198-810584cad108.json |   2 +-
 ..._47cd814e-1991-437e-8feb-e589a250d2a3.json |   2 +-
 ..._92efc2ea-b6ed-41aa-921c-6d40e7b58c27.json |   2 +-
 ..._6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.json |   2 +-
 ..._73ec4301-872a-4bea-928e-420255aae8cb.json |   2 +-
 ..._fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.json |   2 +-
 ..._88f3cbc0-bcfb-482f-b6f4-709a335afcad.json |   2 +-
 ..._af66de51-079c-4d34-af92-f52f887642dc.json |   2 +-
 ..._1b37038e-6e5c-4463-97d4-8a632251d70e.json |   2 +-
 ..._db517009-30ad-4cbc-b282-7f212052c3b4.json |   2 +-
 ...05591510-5fe2-454a-96d8-bbda8201c6a4.bicep |   2 +-
 ...c5c95fe9-a4b4-4afa-a07a-a0d18804d416.bicep |   2 +-
 ...2cda2f3a-8657-431a-a50f-56835aea9a81.bicep |   2 +-
 ...7157dc17-9d5a-4835-a122-1d0d904d61ff.bicep |   2 +-
 ...d528ffcb-3a99-4356-96d1-981499139ffb.bicep |   2 +-
 ...460b6b29-a602-4409-b748-6b47b232a984.bicep |   2 +-
 ...3ddd3f95-989c-4777-b6b8-728439aae1df.bicep |   2 +-
 ...ce44fc81-3610-4165-a107-9dd4b8ab3972.bicep |   2 +-
 ...50124594-a291-4183-a8e3-195f5e6f5204.bicep |   2 +-
 ...d26f4c8b-0461-4c57-b230-cbd1a5424db1.bicep |   2 +-
 ...70f88865-7a8b-4e03-9252-a9369df503ef.bicep |   2 +-
 ...f5c13b49-8528-457d-9d7d-083b8433bf96.bicep |   2 +-
 ...07eeae07-010e-47ca-ad90-fa7adb5a6c52.bicep |   2 +-
 ...1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.bicep |   2 +-
 ...f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.bicep |   2 +-
 ...86922a27-41bb-4834-bc54-0b602b275597.bicep |   2 +-
 ...0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.bicep |   2 +-
 ...3743016a-a056-43fe-b53a-36dd9a17626d.bicep |   2 +-
 ...7e9d0710-3243-4cf2-8b73-6be1539b8545.bicep |   2 +-
 ...805c4ae5-a852-43bd-ad1c-0f7f381d8f32.bicep |   2 +-
 ...5d9075b5-3c19-4cf6-9c2e-50ba4c175691.bicep |   2 +-
 ...16a64053-1905-4d8e-8198-810584cad108.bicep |   2 +-
 ...47cd814e-1991-437e-8feb-e589a250d2a3.bicep |   2 +-
 ...92efc2ea-b6ed-41aa-921c-6d40e7b58c27.bicep |   2 +-
 ...6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.bicep |   2 +-
 ...73ec4301-872a-4bea-928e-420255aae8cb.bicep |   2 +-
 ...fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.bicep |   2 +-
 ...88f3cbc0-bcfb-482f-b6f4-709a335afcad.bicep |   2 +-
 ...af66de51-079c-4d34-af92-f52f887642dc.bicep |   2 +-
 ...1b37038e-6e5c-4463-97d4-8a632251d70e.bicep |   2 +-
 ...db517009-30ad-4cbc-b282-7f212052c3b4.bicep |   2 +-
 ..._b1a4849b-78a8-437f-8113-7c6f2dc34927.json |   2 +-
 ..._eb186756-b63b-408a-bbaf-ac94c1010287.json |   2 +-
 ..._a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.json |   2 +-
 ..._5d872cb4-7f71-4275-81eb-98c968c0cadd.json |   2 +-
 ..._f75dec98-78a3-4e42-954d-375fe3352857.json |   2 +-
 ..._5e544473-d84f-427d-869d-9d982619e4cb.json |   2 +-
 ..._b663a689-6db8-467d-8b5d-8cd34afe4b0e.json |   2 +-
 ..._8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.json |   2 +-
 ..._c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.json |   2 +-
 ..._0acc30dc-881d-46c9-b634-8cba507a263f.json |   2 +-
 ..._0a3689c7-b610-4c52-ae84-ab0640f3d6e4.json |   2 +-
 ..._45fef979-c27e-425a-a6c3-e5bd28b1eb86.json |   2 +-
 ..._26e09eae-c784-4e8f-a225-d3f13efff76f.json |   2 +-
 ..._8660f357-83f9-4719-bdf3-bae57af2d967.json |   2 +-
 ..._8cbe449d-9264-4ae1-8221-5d97989005a8.json |   2 +-
 ..._c81d3e6c-5539-42ad-a95f-9bba504d91f0.json |   2 +-
 ..._7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.json |   2 +-
 ..._34769aaa-5014-4ced-bb08-9fabfba3d959.json |   2 +-
 ...b1a4849b-78a8-437f-8113-7c6f2dc34927.bicep |   2 +-
 ...eb186756-b63b-408a-bbaf-ac94c1010287.bicep |   2 +-
 ...a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.bicep |   2 +-
 ...5d872cb4-7f71-4275-81eb-98c968c0cadd.bicep |   2 +-
 ...f75dec98-78a3-4e42-954d-375fe3352857.bicep |   2 +-
 ...5e544473-d84f-427d-869d-9d982619e4cb.bicep |   2 +-
 ...b663a689-6db8-467d-8b5d-8cd34afe4b0e.bicep |   2 +-
 ...8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.bicep |   2 +-
 ...c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.bicep |   2 +-
 ...0acc30dc-881d-46c9-b634-8cba507a263f.bicep |   2 +-
 ...0a3689c7-b610-4c52-ae84-ab0640f3d6e4.bicep |   2 +-
 ...45fef979-c27e-425a-a6c3-e5bd28b1eb86.bicep |   2 +-
 ...26e09eae-c784-4e8f-a225-d3f13efff76f.bicep |   2 +-
 ...8660f357-83f9-4719-bdf3-bae57af2d967.bicep |   2 +-
 ...8cbe449d-9264-4ae1-8221-5d97989005a8.bicep |   2 +-
 ...c81d3e6c-5539-42ad-a95f-9bba504d91f0.bicep |   2 +-
 ...7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.bicep |   2 +-
 ...34769aaa-5014-4ced-bb08-9fabfba3d959.bicep |   2 +-
 ..._ebd68fdd-9672-43e8-b7d5-6e479210535d.json |   2 +-
 ..._ecec6f93-af7e-4071-b35d-cd70b3f16581.json |   2 +-
 ..._2feba8fd-ff1e-4f48-bc01-6e2996edafa6.json |   2 +-
 ..._48fc094d-8a00-4d3c-86d3-3230c7e5881a.json |   2 +-
 ..._4eeca790-a804-4453-b339-73ea425610bc.json |   2 +-
 ..._59298086-ec77-4f47-b2ef-b853b79e31cb.json |   2 +-
 ..._8f231351-c123-4e4c-8631-9978e641a3ca.json |   2 +-
 ..._9d086772-1887-4893-8b9f-7e5169398bae.json |   2 +-
 ..._7f951991-c6ce-4c72-9f55-7eade2c4f57c.json |   2 +-
 ...ebd68fdd-9672-43e8-b7d5-6e479210535d.bicep |   2 +-
 ...ecec6f93-af7e-4071-b35d-cd70b3f16581.bicep |   2 +-
 ...2feba8fd-ff1e-4f48-bc01-6e2996edafa6.bicep |   2 +-
 ...48fc094d-8a00-4d3c-86d3-3230c7e5881a.bicep |   2 +-
 ...4eeca790-a804-4453-b339-73ea425610bc.bicep |   2 +-
 ...59298086-ec77-4f47-b2ef-b853b79e31cb.bicep |   2 +-
 ...8f231351-c123-4e4c-8631-9978e641a3ca.bicep |   2 +-
 ...9d086772-1887-4893-8b9f-7e5169398bae.bicep |   2 +-
 ...7f951991-c6ce-4c72-9f55-7eade2c4f57c.bicep |   2 +-
 ..._ea68cbf2-b8a6-4f47-afda-94cab9ce4622.json |   2 +-
 ..._eb627157-b9c8-4e8f-a00e-f9eb7df45c78.json |   2 +-
 ..._0020bd6d-cd35-491e-9c71-f66bd64ed9a9.json |   2 +-
 ...ea68cbf2-b8a6-4f47-afda-94cab9ce4622.bicep |   2 +-
 ...eb627157-b9c8-4e8f-a00e-f9eb7df45c78.bicep |   2 +-
 ...0020bd6d-cd35-491e-9c71-f66bd64ed9a9.bicep |   2 +-
 ..._f0fa5804-9d5f-4e23-91c0-996c561585ef.json |   2 +-
 ..._7d30aeb3-31e5-4742-aa7e-825c2a6af42a.json |   2 +-
 ..._381221db-fd9a-4d65-a16f-63e7492b0a49.json |   2 +-
 ..._ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.json |   2 +-
 ..._b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.json |   2 +-
 ..._1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.json |   2 +-
 ..._c0dbcbee-eefd-4ee4-bd25-48d42444c882.json |   2 +-
 ..._289283c0-87ae-475f-b756-306783c7ec4d.json |   2 +-
 ..._ea14eb56-238e-42b2-95ae-4d624d720d10.json |   2 +-
 ..._4f2ead64-7412-4695-9855-47f36ade6f7e.json |   2 +-
 ...f0fa5804-9d5f-4e23-91c0-996c561585ef.bicep |   2 +-
 ...7d30aeb3-31e5-4742-aa7e-825c2a6af42a.bicep |   2 +-
 ...381221db-fd9a-4d65-a16f-63e7492b0a49.bicep |   2 +-
 ...ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.bicep |   2 +-
 ...b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.bicep |   2 +-
 ...1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.bicep |   2 +-
 ...c0dbcbee-eefd-4ee4-bd25-48d42444c882.bicep |   2 +-
 ...289283c0-87ae-475f-b756-306783c7ec4d.bicep |   2 +-
 ...ea14eb56-238e-42b2-95ae-4d624d720d10.bicep |   2 +-
 ...4f2ead64-7412-4695-9855-47f36ade6f7e.bicep |   2 +-
 ..._8e2a7c77-890c-49d5-aadd-052764135995.json |   2 +-
 ..._6cf01e09-24d5-4097-bac1-1d39b0f577c8.json |   2 +-
 ..._21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.json |   2 +-
 ..._16072e08-8ffb-48c9-afa9-fe2192b4513b.json |   2 +-
 ..._583c6484-b7a3-4908-b4d4-9a8b08d1edf9.json |   2 +-
 ..._d8d1bc29-bfdb-48a5-89bd-7e34522d8085.json |   2 +-
 ..._64f41eaa-048f-4892-b80f-593e74ef4f84.json |   2 +-
 ..._4c4d35e8-fdd7-4951-8a71-7b9add69d337.json |   2 +-
 ...8e2a7c77-890c-49d5-aadd-052764135995.bicep |   2 +-
 ...6cf01e09-24d5-4097-bac1-1d39b0f577c8.bicep |   2 +-
 ...21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.bicep |   2 +-
 ...16072e08-8ffb-48c9-afa9-fe2192b4513b.bicep |   2 +-
 ...583c6484-b7a3-4908-b4d4-9a8b08d1edf9.bicep |   2 +-
 ...d8d1bc29-bfdb-48a5-89bd-7e34522d8085.bicep |   2 +-
 ...64f41eaa-048f-4892-b80f-593e74ef4f84.bicep |   2 +-
 ...4c4d35e8-fdd7-4951-8a71-7b9add69d337.bicep |   2 +-
 ..._7bdc68c3-7679-482d-82e4-92a8229db9d7.json |   2 +-
 ..._520cc4d4-2caa-42df-b8b7-86dbc4786ce6.json |   2 +-
 ..._8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.json |   2 +-
 ..._14dbacac-2559-4537-9be9-7d08bdd0888d.json |   2 +-
 ..._e85efb6a-239a-41e0-8cdd-b1792c41ec41.json |   2 +-
 ..._b87ecc60-7558-4cb4-8ef9-3185c4c19579.json |   2 +-
 ..._96257455-b2cf-4f35-9c64-00eea637471a.json |   2 +-
 ..._f03350e9-f936-4ac0-a64f-2d2df1fc9f75.json |   2 +-
 ..._2a129b1b-36a7-4048-9403-004dc5e6b0b2.json |   2 +-
 ...7bdc68c3-7679-482d-82e4-92a8229db9d7.bicep |   2 +-
 ...520cc4d4-2caa-42df-b8b7-86dbc4786ce6.bicep |   2 +-
 ...8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.bicep |   2 +-
 ...14dbacac-2559-4537-9be9-7d08bdd0888d.bicep |   2 +-
 ...e85efb6a-239a-41e0-8cdd-b1792c41ec41.bicep |   2 +-
 ...b87ecc60-7558-4cb4-8ef9-3185c4c19579.bicep |   2 +-
 ...96257455-b2cf-4f35-9c64-00eea637471a.bicep |   2 +-
 ...f03350e9-f936-4ac0-a64f-2d2df1fc9f75.bicep |   2 +-
 ...2a129b1b-36a7-4048-9403-004dc5e6b0b2.bicep |   2 +-
 ..._a74bd8f3-cab7-46e6-ac1e-7527d2385bee.json |   2 +-
 ..._b16f8234-e6c6-4723-933e-e5f8c179f23d.json |   2 +-
 ..._a9177e32-e3fa-425a-a02e-727ff3515ae0.json |   2 +-
 ..._49f62a85-7edf-4afc-9201-7a8939d6a42a.json |   2 +-
 ..._48fcc15e-f043-4bb5-a628-6aefc60432c1.json |   2 +-
 ..._b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.json |   2 +-
 ..._b0c0fca3-1832-4a18-8832-5eebd2c1370a.json |   2 +-
 ..._1e71d59c-b29f-4b43-9f49-7aa0da50c88c.json |   2 +-
 ..._12241b03-3f62-4100-9cf3-7798a7796600.json |   2 +-
 ..._dc560ab2-18ad-49ae-9937-9b9a770faaab.json |   2 +-
 ..._e4fa68d2-55cd-4371-9574-95ae5c34d4ae.json |   2 +-
 ..._0853a13e-b316-4ea0-98a2-9d722a508d1e.json |   2 +-
 ..._a8024ffc-b3b7-48eb-8f24-ae7da834cde2.json |   2 +-
 ..._02ef5600-fed6-474a-8fbb-5ed088b04d0d.json |   2 +-
 ..._93768520-ab75-4e4e-b39b-a210a32379c0.json |   2 +-
 ..._3acdc4ab-514c-42c3-82e1-cb41fa338c2f.json |   2 +-
 ..._2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.json |   2 +-
 ..._fa87c863-2d21-4b9d-897f-452fd35b06c3.json |   2 +-
 ..._9e412261-433b-45fd-8944-2f891bf14a56.json |   2 +-
 ..._89ec4b6f-d1b2-4402-8a1d-48440624fc31.json |   2 +-
 ..._8a492278-c49f-4e4c-8fd5-a1680590864a.json |   2 +-
 ..._e6f23a76-11f3-471e-b7d7-ebc787487069.json |   2 +-
 ..._ff5238a3-e40f-47c7-a142-f7a19b7764f9.json |   2 +-
 ..._67ca6d43-ab88-4fb8-9c18-2862765681e6.json |   2 +-
 ..._265b54e0-33a0-44b3-9f7b-ce53328439e3.json |   2 +-
 ..._0bdd95e0-1d48-40e5-85c7-cd8008b966b0.json |   2 +-
 ..._fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.json |   2 +-
 ..._b4e2bc80-9307-44d8-89f1-04c7133f37fc.json |   2 +-
 ...a74bd8f3-cab7-46e6-ac1e-7527d2385bee.bicep |   2 +-
 ...b16f8234-e6c6-4723-933e-e5f8c179f23d.bicep |   2 +-
 ...a9177e32-e3fa-425a-a02e-727ff3515ae0.bicep |   2 +-
 ...49f62a85-7edf-4afc-9201-7a8939d6a42a.bicep |   2 +-
 ...48fcc15e-f043-4bb5-a628-6aefc60432c1.bicep |   2 +-
 ...b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.bicep |   2 +-
 ...b0c0fca3-1832-4a18-8832-5eebd2c1370a.bicep |   2 +-
 ...1e71d59c-b29f-4b43-9f49-7aa0da50c88c.bicep |   2 +-
 ...12241b03-3f62-4100-9cf3-7798a7796600.bicep |   2 +-
 ...dc560ab2-18ad-49ae-9937-9b9a770faaab.bicep |   2 +-
 ...e4fa68d2-55cd-4371-9574-95ae5c34d4ae.bicep |   2 +-
 ...0853a13e-b316-4ea0-98a2-9d722a508d1e.bicep |   2 +-
 ...a8024ffc-b3b7-48eb-8f24-ae7da834cde2.bicep |   2 +-
 ...02ef5600-fed6-474a-8fbb-5ed088b04d0d.bicep |   2 +-
 ...93768520-ab75-4e4e-b39b-a210a32379c0.bicep |   2 +-
 ...3acdc4ab-514c-42c3-82e1-cb41fa338c2f.bicep |   2 +-
 ...2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.bicep |   2 +-
 ...fa87c863-2d21-4b9d-897f-452fd35b06c3.bicep |   2 +-
 ...9e412261-433b-45fd-8944-2f891bf14a56.bicep |   2 +-
 ...89ec4b6f-d1b2-4402-8a1d-48440624fc31.bicep |   2 +-
 ...8a492278-c49f-4e4c-8fd5-a1680590864a.bicep |   2 +-
 ...e6f23a76-11f3-471e-b7d7-ebc787487069.bicep |   2 +-
 ...ff5238a3-e40f-47c7-a142-f7a19b7764f9.bicep |   2 +-
 ...67ca6d43-ab88-4fb8-9c18-2862765681e6.bicep |   2 +-
 ...265b54e0-33a0-44b3-9f7b-ce53328439e3.bicep |   2 +-
 ...0bdd95e0-1d48-40e5-85c7-cd8008b966b0.bicep |   2 +-
 ...fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.bicep |   2 +-
 ...b4e2bc80-9307-44d8-89f1-04c7133f37fc.bicep |   2 +-
 1100 files changed, 2462 insertions(+), 1794 deletions(-)
 rename services/{Network/loadBalancers/templates/arm/SYNCount_94c90db6-8fd7-460c-b704-c2a429913376.json => CognitiveServices/accounts/templates/arm/BlockedCalls_87fe8679-655d-4acb-a37c-b7faebe26d47.json} (95%)
 rename services/{Network/loadBalancers/templates/arm/PacketCount_d766dc3e-42cc-42a7-ba4f-3c1d7fa295c5.json => CognitiveServices/accounts/templates/arm/ClientErrors_ec8c928a-5206-4059-8aea-8486004dd30d.json} (96%)
 rename services/{Network/loadBalancers/templates/arm/AllocatedSnartPorts_5b64d91c-54de-4f8c-a5d6-054967f4ceaf.json => CognitiveServices/accounts/templates/arm/Latency_d76ab40a-2831-4fa2-b476-5fdcda3d7c4c.json} (96%)
 create mode 100644 services/CognitiveServices/accounts/templates/arm/ServerErrors_3c550d9c-8276-4a61-b0cf-ef437a55e299.json
 create mode 100644 services/CognitiveServices/accounts/templates/arm/SuccessRate_80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.json
 create mode 100644 services/CognitiveServices/accounts/templates/arm/TokenTransaction_287a29bf-097d-4c4a-9ac5-df70a10f6903.json
 rename services/{Network/loadBalancers/templates/arm/ByteCount_d15179b2-4b57-41e4-997b-dc7c380963d9.json => CognitiveServices/accounts/templates/arm/TotalCalls_07f1ae0a-94f3-41da-b3a6-ca9188e416cb.json} (96%)
 create mode 100644 services/CognitiveServices/accounts/templates/arm/TotalErrors_e228ad2d-7f9f-4843-88e2-57f6d44c59e9.json
 rename services/{Network/loadBalancers/templates/bicep/SYNCount_94c90db6-8fd7-460c-b704-c2a429913376.bicep => CognitiveServices/accounts/templates/bicep/BlockedCalls_87fe8679-655d-4acb-a37c-b7faebe26d47.bicep} (91%)
 rename services/{Network/loadBalancers/templates/bicep/ByteCount_d15179b2-4b57-41e4-997b-dc7c380963d9.bicep => CognitiveServices/accounts/templates/bicep/ClientErrors_ec8c928a-5206-4059-8aea-8486004dd30d.bicep} (91%)
 rename services/{Network/loadBalancers/templates/bicep/AllocatedSnartPorts_5b64d91c-54de-4f8c-a5d6-054967f4ceaf.bicep => CognitiveServices/accounts/templates/bicep/Latency_d76ab40a-2831-4fa2-b476-5fdcda3d7c4c.bicep} (91%)
 create mode 100644 services/CognitiveServices/accounts/templates/bicep/ServerErrors_3c550d9c-8276-4a61-b0cf-ef437a55e299.bicep
 create mode 100644 services/CognitiveServices/accounts/templates/bicep/SuccessRate_80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.bicep
 create mode 100644 services/CognitiveServices/accounts/templates/bicep/TokenTransaction_287a29bf-097d-4c4a-9ac5-df70a10f6903.bicep
 rename services/{Network/loadBalancers/templates/bicep/PacketCount_d766dc3e-42cc-42a7-ba4f-3c1d7fa295c5.bicep => CognitiveServices/accounts/templates/bicep/TotalCalls_07f1ae0a-94f3-41da-b3a6-ca9188e416cb.bicep} (91%)
 create mode 100644 services/CognitiveServices/accounts/templates/bicep/TotalErrors_e228ad2d-7f9f-4843-88e2-57f6d44c59e9.bicep
 delete mode 100644 services/Network/expressRouteCircuits/templates/arm/globalreachbitsinpersecond_47fe6c76-47a0-433f-92d6-a23d9f573771.json
 delete mode 100644 services/Network/expressRouteCircuits/templates/arm/globalreachbitsoutpersecond_8a586e59-0f53-41bd-8406-174f9f0ecf7e.json
 delete mode 100644 services/Network/expressRouteCircuits/templates/bicep/globalreachbitsinpersecond_47fe6c76-47a0-433f-92d6-a23d9f573771.bicep
 delete mode 100644 services/Network/expressRouteCircuits/templates/bicep/globalreachbitsoutpersecond_8a586e59-0f53-41bd-8406-174f9f0ecf7e.bicep

diff --git a/services/AVS/privateClouds/templates/arm/CPUCritical_bb83ae53-3b91-49ff-a351-9545ea747335.json b/services/AVS/privateClouds/templates/arm/CPUCritical_bb83ae53-3b91-49ff-a351-9545ea747335.json
index 10fe083d3..6ec386ccc 100644
--- a/services/AVS/privateClouds/templates/arm/CPUCritical_bb83ae53-3b91-49ff-a351-9545ea747335.json
+++ b/services/AVS/privateClouds/templates/arm/CPUCritical_bb83ae53-3b91-49ff-a351-9545ea747335.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/AVS/privateClouds/templates/arm/CPU_282cb835-592b-4e49-89c1-ea1aaefb37c4.json b/services/AVS/privateClouds/templates/arm/CPU_282cb835-592b-4e49-89c1-ea1aaefb37c4.json
index a3252a726..e2e2bcbbe 100644
--- a/services/AVS/privateClouds/templates/arm/CPU_282cb835-592b-4e49-89c1-ea1aaefb37c4.json
+++ b/services/AVS/privateClouds/templates/arm/CPU_282cb835-592b-4e49-89c1-ea1aaefb37c4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/AVS/privateClouds/templates/arm/DiskUsedPercentage_23ac19cb-5eff-4cfa-9817-93466e1a94f7.json b/services/AVS/privateClouds/templates/arm/DiskUsedPercentage_23ac19cb-5eff-4cfa-9817-93466e1a94f7.json
index 0a8c980b8..519c072b2 100644
--- a/services/AVS/privateClouds/templates/arm/DiskUsedPercentage_23ac19cb-5eff-4cfa-9817-93466e1a94f7.json
+++ b/services/AVS/privateClouds/templates/arm/DiskUsedPercentage_23ac19cb-5eff-4cfa-9817-93466e1a94f7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/AVS/privateClouds/templates/arm/MemoryCritical_a2f5e5a3-ec38-4201-970f-971ad4707b93.json b/services/AVS/privateClouds/templates/arm/MemoryCritical_a2f5e5a3-ec38-4201-970f-971ad4707b93.json
index 075c7ee72..9507110bf 100644
--- a/services/AVS/privateClouds/templates/arm/MemoryCritical_a2f5e5a3-ec38-4201-970f-971ad4707b93.json
+++ b/services/AVS/privateClouds/templates/arm/MemoryCritical_a2f5e5a3-ec38-4201-970f-971ad4707b93.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/AVS/privateClouds/templates/arm/Memory_e840c7a9-e070-4dc9-919b-c75a3679f6b7.json b/services/AVS/privateClouds/templates/arm/Memory_e840c7a9-e070-4dc9-919b-c75a3679f6b7.json
index 9fdf26bbc..5a9354f7a 100644
--- a/services/AVS/privateClouds/templates/arm/Memory_e840c7a9-e070-4dc9-919b-c75a3679f6b7.json
+++ b/services/AVS/privateClouds/templates/arm/Memory_e840c7a9-e070-4dc9-919b-c75a3679f6b7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/AVS/privateClouds/templates/arm/Storage_8bafb3d5-d961-49a4-9867-f1cddfd703e0.json b/services/AVS/privateClouds/templates/arm/Storage_8bafb3d5-d961-49a4-9867-f1cddfd703e0.json
index a6bc42e24..5a4a2e056 100644
--- a/services/AVS/privateClouds/templates/arm/Storage_8bafb3d5-d961-49a4-9867-f1cddfd703e0.json
+++ b/services/AVS/privateClouds/templates/arm/Storage_8bafb3d5-d961-49a4-9867-f1cddfd703e0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/AVS/privateClouds/templates/arm/UsageAverage_b9f2fe91-023a-443c-b376-b12f0cd5d965.json b/services/AVS/privateClouds/templates/arm/UsageAverage_b9f2fe91-023a-443c-b376-b12f0cd5d965.json
index 2262e70f0..2fa8fba11 100644
--- a/services/AVS/privateClouds/templates/arm/UsageAverage_b9f2fe91-023a-443c-b376-b12f0cd5d965.json
+++ b/services/AVS/privateClouds/templates/arm/UsageAverage_b9f2fe91-023a-443c-b376-b12f0cd5d965.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/AVS/privateClouds/templates/bicep/CPUCritical_bb83ae53-3b91-49ff-a351-9545ea747335.bicep b/services/AVS/privateClouds/templates/bicep/CPUCritical_bb83ae53-3b91-49ff-a351-9545ea747335.bicep
index 0fccc44b2..1d837b800 100644
--- a/services/AVS/privateClouds/templates/bicep/CPUCritical_bb83ae53-3b91-49ff-a351-9545ea747335.bicep
+++ b/services/AVS/privateClouds/templates/bicep/CPUCritical_bb83ae53-3b91-49ff-a351-9545ea747335.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/AVS/privateClouds/templates/bicep/CPU_282cb835-592b-4e49-89c1-ea1aaefb37c4.bicep b/services/AVS/privateClouds/templates/bicep/CPU_282cb835-592b-4e49-89c1-ea1aaefb37c4.bicep
index 353e29373..b0396d85a 100644
--- a/services/AVS/privateClouds/templates/bicep/CPU_282cb835-592b-4e49-89c1-ea1aaefb37c4.bicep
+++ b/services/AVS/privateClouds/templates/bicep/CPU_282cb835-592b-4e49-89c1-ea1aaefb37c4.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/AVS/privateClouds/templates/bicep/DiskUsedPercentage_23ac19cb-5eff-4cfa-9817-93466e1a94f7.bicep b/services/AVS/privateClouds/templates/bicep/DiskUsedPercentage_23ac19cb-5eff-4cfa-9817-93466e1a94f7.bicep
index 7c650daf5..ef605f5f9 100644
--- a/services/AVS/privateClouds/templates/bicep/DiskUsedPercentage_23ac19cb-5eff-4cfa-9817-93466e1a94f7.bicep
+++ b/services/AVS/privateClouds/templates/bicep/DiskUsedPercentage_23ac19cb-5eff-4cfa-9817-93466e1a94f7.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/AVS/privateClouds/templates/bicep/MemoryCritical_a2f5e5a3-ec38-4201-970f-971ad4707b93.bicep b/services/AVS/privateClouds/templates/bicep/MemoryCritical_a2f5e5a3-ec38-4201-970f-971ad4707b93.bicep
index 4c970b8b6..56fb1013c 100644
--- a/services/AVS/privateClouds/templates/bicep/MemoryCritical_a2f5e5a3-ec38-4201-970f-971ad4707b93.bicep
+++ b/services/AVS/privateClouds/templates/bicep/MemoryCritical_a2f5e5a3-ec38-4201-970f-971ad4707b93.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/AVS/privateClouds/templates/bicep/Memory_e840c7a9-e070-4dc9-919b-c75a3679f6b7.bicep b/services/AVS/privateClouds/templates/bicep/Memory_e840c7a9-e070-4dc9-919b-c75a3679f6b7.bicep
index 55c85d4bf..8e139e511 100644
--- a/services/AVS/privateClouds/templates/bicep/Memory_e840c7a9-e070-4dc9-919b-c75a3679f6b7.bicep
+++ b/services/AVS/privateClouds/templates/bicep/Memory_e840c7a9-e070-4dc9-919b-c75a3679f6b7.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/AVS/privateClouds/templates/bicep/Storage_8bafb3d5-d961-49a4-9867-f1cddfd703e0.bicep b/services/AVS/privateClouds/templates/bicep/Storage_8bafb3d5-d961-49a4-9867-f1cddfd703e0.bicep
index d8a5e9640..2e28c79dc 100644
--- a/services/AVS/privateClouds/templates/bicep/Storage_8bafb3d5-d961-49a4-9867-f1cddfd703e0.bicep
+++ b/services/AVS/privateClouds/templates/bicep/Storage_8bafb3d5-d961-49a4-9867-f1cddfd703e0.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/AVS/privateClouds/templates/bicep/UsageAverage_b9f2fe91-023a-443c-b376-b12f0cd5d965.bicep b/services/AVS/privateClouds/templates/bicep/UsageAverage_b9f2fe91-023a-443c-b376-b12f0cd5d965.bicep
index f8bb9864e..55c9ead1e 100644
--- a/services/AVS/privateClouds/templates/bicep/UsageAverage_b9f2fe91-023a-443c-b376-b12f0cd5d965.bicep
+++ b/services/AVS/privateClouds/templates/bicep/UsageAverage_b9f2fe91-023a-443c-b376-b12f0cd5d965.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/AnalysisServices/servers/templates/arm/memorymetric_0289bc11-db65-4a58-91ed-fda8637322ec.json b/services/AnalysisServices/servers/templates/arm/memorymetric_0289bc11-db65-4a58-91ed-fda8637322ec.json
index 76536d42f..6386fc3f4 100644
--- a/services/AnalysisServices/servers/templates/arm/memorymetric_0289bc11-db65-4a58-91ed-fda8637322ec.json
+++ b/services/AnalysisServices/servers/templates/arm/memorymetric_0289bc11-db65-4a58-91ed-fda8637322ec.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/AnalysisServices/servers/templates/bicep/memorymetric_0289bc11-db65-4a58-91ed-fda8637322ec.bicep b/services/AnalysisServices/servers/templates/bicep/memorymetric_0289bc11-db65-4a58-91ed-fda8637322ec.bicep
index 2ec17c1e6..710cbd4e4 100644
--- a/services/AnalysisServices/servers/templates/bicep/memorymetric_0289bc11-db65-4a58-91ed-fda8637322ec.bicep
+++ b/services/AnalysisServices/servers/templates/bicep/memorymetric_0289bc11-db65-4a58-91ed-fda8637322ec.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ApiManagement/service/templates/arm/BackendDuration_fd5d63e0-ab2f-4300-af65-05bf2e490d0e.json b/services/ApiManagement/service/templates/arm/BackendDuration_fd5d63e0-ab2f-4300-af65-05bf2e490d0e.json
index 86845c6dd..45a066806 100644
--- a/services/ApiManagement/service/templates/arm/BackendDuration_fd5d63e0-ab2f-4300-af65-05bf2e490d0e.json
+++ b/services/ApiManagement/service/templates/arm/BackendDuration_fd5d63e0-ab2f-4300-af65-05bf2e490d0e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ApiManagement/service/templates/arm/Capacity_6b1dd1ae-05de-43d2-bdea-7981c49127fc.json b/services/ApiManagement/service/templates/arm/Capacity_6b1dd1ae-05de-43d2-bdea-7981c49127fc.json
index 0fea3f77d..a6bd6dc5b 100644
--- a/services/ApiManagement/service/templates/arm/Capacity_6b1dd1ae-05de-43d2-bdea-7981c49127fc.json
+++ b/services/ApiManagement/service/templates/arm/Capacity_6b1dd1ae-05de-43d2-bdea-7981c49127fc.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ApiManagement/service/templates/arm/Duration_52cd4aba-4ad0-402a-880d-ba625ebcf37f.json b/services/ApiManagement/service/templates/arm/Duration_52cd4aba-4ad0-402a-880d-ba625ebcf37f.json
index 6ec8048d4..3c2cfcbc9 100644
--- a/services/ApiManagement/service/templates/arm/Duration_52cd4aba-4ad0-402a-880d-ba625ebcf37f.json
+++ b/services/ApiManagement/service/templates/arm/Duration_52cd4aba-4ad0-402a-880d-ba625ebcf37f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ApiManagement/service/templates/arm/FailedRequests_1f8626fe-812a-48a7-b237-2f9181a5ea12.json b/services/ApiManagement/service/templates/arm/FailedRequests_1f8626fe-812a-48a7-b237-2f9181a5ea12.json
index 1bf2a4a97..e1586077b 100644
--- a/services/ApiManagement/service/templates/arm/FailedRequests_1f8626fe-812a-48a7-b237-2f9181a5ea12.json
+++ b/services/ApiManagement/service/templates/arm/FailedRequests_1f8626fe-812a-48a7-b237-2f9181a5ea12.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ApiManagement/service/templates/arm/Requests_2e16fd84-d92f-44ee-8191-ff47e90a9526.json b/services/ApiManagement/service/templates/arm/Requests_2e16fd84-d92f-44ee-8191-ff47e90a9526.json
index e63065719..a9658a1f6 100644
--- a/services/ApiManagement/service/templates/arm/Requests_2e16fd84-d92f-44ee-8191-ff47e90a9526.json
+++ b/services/ApiManagement/service/templates/arm/Requests_2e16fd84-d92f-44ee-8191-ff47e90a9526.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ApiManagement/service/templates/arm/TotalRequests_a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.json b/services/ApiManagement/service/templates/arm/TotalRequests_a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.json
index 63bf4d107..3ffc6d003 100644
--- a/services/ApiManagement/service/templates/arm/TotalRequests_a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.json
+++ b/services/ApiManagement/service/templates/arm/TotalRequests_a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ApiManagement/service/templates/arm/UnauthorizedRequests_c0c3e784-f488-43a6-a423-18dbb444d443.json b/services/ApiManagement/service/templates/arm/UnauthorizedRequests_c0c3e784-f488-43a6-a423-18dbb444d443.json
index b8f772010..61ae4e362 100644
--- a/services/ApiManagement/service/templates/arm/UnauthorizedRequests_c0c3e784-f488-43a6-a423-18dbb444d443.json
+++ b/services/ApiManagement/service/templates/arm/UnauthorizedRequests_c0c3e784-f488-43a6-a423-18dbb444d443.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ApiManagement/service/templates/bicep/BackendDuration_fd5d63e0-ab2f-4300-af65-05bf2e490d0e.bicep b/services/ApiManagement/service/templates/bicep/BackendDuration_fd5d63e0-ab2f-4300-af65-05bf2e490d0e.bicep
index 005501f87..8f270596b 100644
--- a/services/ApiManagement/service/templates/bicep/BackendDuration_fd5d63e0-ab2f-4300-af65-05bf2e490d0e.bicep
+++ b/services/ApiManagement/service/templates/bicep/BackendDuration_fd5d63e0-ab2f-4300-af65-05bf2e490d0e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ApiManagement/service/templates/bicep/Capacity_6b1dd1ae-05de-43d2-bdea-7981c49127fc.bicep b/services/ApiManagement/service/templates/bicep/Capacity_6b1dd1ae-05de-43d2-bdea-7981c49127fc.bicep
index f58a6fe0e..33a9f8b3c 100644
--- a/services/ApiManagement/service/templates/bicep/Capacity_6b1dd1ae-05de-43d2-bdea-7981c49127fc.bicep
+++ b/services/ApiManagement/service/templates/bicep/Capacity_6b1dd1ae-05de-43d2-bdea-7981c49127fc.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ApiManagement/service/templates/bicep/Duration_52cd4aba-4ad0-402a-880d-ba625ebcf37f.bicep b/services/ApiManagement/service/templates/bicep/Duration_52cd4aba-4ad0-402a-880d-ba625ebcf37f.bicep
index 4908213f9..e76aa9de7 100644
--- a/services/ApiManagement/service/templates/bicep/Duration_52cd4aba-4ad0-402a-880d-ba625ebcf37f.bicep
+++ b/services/ApiManagement/service/templates/bicep/Duration_52cd4aba-4ad0-402a-880d-ba625ebcf37f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ApiManagement/service/templates/bicep/FailedRequests_1f8626fe-812a-48a7-b237-2f9181a5ea12.bicep b/services/ApiManagement/service/templates/bicep/FailedRequests_1f8626fe-812a-48a7-b237-2f9181a5ea12.bicep
index 7420ad55d..591606205 100644
--- a/services/ApiManagement/service/templates/bicep/FailedRequests_1f8626fe-812a-48a7-b237-2f9181a5ea12.bicep
+++ b/services/ApiManagement/service/templates/bicep/FailedRequests_1f8626fe-812a-48a7-b237-2f9181a5ea12.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ApiManagement/service/templates/bicep/Requests_2e16fd84-d92f-44ee-8191-ff47e90a9526.bicep b/services/ApiManagement/service/templates/bicep/Requests_2e16fd84-d92f-44ee-8191-ff47e90a9526.bicep
index cc85b8bdb..00860694b 100644
--- a/services/ApiManagement/service/templates/bicep/Requests_2e16fd84-d92f-44ee-8191-ff47e90a9526.bicep
+++ b/services/ApiManagement/service/templates/bicep/Requests_2e16fd84-d92f-44ee-8191-ff47e90a9526.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ApiManagement/service/templates/bicep/TotalRequests_a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.bicep b/services/ApiManagement/service/templates/bicep/TotalRequests_a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.bicep
index b2bf6eab4..57a196808 100644
--- a/services/ApiManagement/service/templates/bicep/TotalRequests_a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.bicep
+++ b/services/ApiManagement/service/templates/bicep/TotalRequests_a9480e7f-1cd0-4c46-b5c4-e7f35fe963a5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ApiManagement/service/templates/bicep/UnauthorizedRequests_c0c3e784-f488-43a6-a423-18dbb444d443.bicep b/services/ApiManagement/service/templates/bicep/UnauthorizedRequests_c0c3e784-f488-43a6-a423-18dbb444d443.bicep
index 79dc87608..f71c6ad40 100644
--- a/services/ApiManagement/service/templates/bicep/UnauthorizedRequests_c0c3e784-f488-43a6-a423-18dbb444d443.bicep
+++ b/services/ApiManagement/service/templates/bicep/UnauthorizedRequests_c0c3e784-f488-43a6-a423-18dbb444d443.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/App/containerApps/templates/arm/Replicas_94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.json b/services/App/containerApps/templates/arm/Replicas_94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.json
index e4fd94d75..5048016c2 100644
--- a/services/App/containerApps/templates/arm/Replicas_94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.json
+++ b/services/App/containerApps/templates/arm/Replicas_94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/App/containerApps/templates/arm/RestartCount_b12cad96-7ef2-4223-97f4-53b3dc64ecfa.json b/services/App/containerApps/templates/arm/RestartCount_b12cad96-7ef2-4223-97f4-53b3dc64ecfa.json
index 9adc4cc42..b2a7e8695 100644
--- a/services/App/containerApps/templates/arm/RestartCount_b12cad96-7ef2-4223-97f4-53b3dc64ecfa.json
+++ b/services/App/containerApps/templates/arm/RestartCount_b12cad96-7ef2-4223-97f4-53b3dc64ecfa.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/App/containerApps/templates/arm/UsageNanoCores_a9e1306a-a541-423f-a69e-bd37f8f5013a.json b/services/App/containerApps/templates/arm/UsageNanoCores_a9e1306a-a541-423f-a69e-bd37f8f5013a.json
index 491264079..d0dad702c 100644
--- a/services/App/containerApps/templates/arm/UsageNanoCores_a9e1306a-a541-423f-a69e-bd37f8f5013a.json
+++ b/services/App/containerApps/templates/arm/UsageNanoCores_a9e1306a-a541-423f-a69e-bd37f8f5013a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/App/containerApps/templates/arm/WorkingSetBytes_423b4280-1f68-49d8-b11a-6a816b0d9172.json b/services/App/containerApps/templates/arm/WorkingSetBytes_423b4280-1f68-49d8-b11a-6a816b0d9172.json
index b26bce4e9..f31c529a6 100644
--- a/services/App/containerApps/templates/arm/WorkingSetBytes_423b4280-1f68-49d8-b11a-6a816b0d9172.json
+++ b/services/App/containerApps/templates/arm/WorkingSetBytes_423b4280-1f68-49d8-b11a-6a816b0d9172.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/App/containerApps/templates/bicep/Replicas_94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.bicep b/services/App/containerApps/templates/bicep/Replicas_94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.bicep
index fa95d9d2c..a7a26472f 100644
--- a/services/App/containerApps/templates/bicep/Replicas_94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.bicep
+++ b/services/App/containerApps/templates/bicep/Replicas_94ae53cd-6e3b-47f5-9709-9c2e10eae6d7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/App/containerApps/templates/bicep/RestartCount_b12cad96-7ef2-4223-97f4-53b3dc64ecfa.bicep b/services/App/containerApps/templates/bicep/RestartCount_b12cad96-7ef2-4223-97f4-53b3dc64ecfa.bicep
index 4a45b34c9..a71d96666 100644
--- a/services/App/containerApps/templates/bicep/RestartCount_b12cad96-7ef2-4223-97f4-53b3dc64ecfa.bicep
+++ b/services/App/containerApps/templates/bicep/RestartCount_b12cad96-7ef2-4223-97f4-53b3dc64ecfa.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/App/containerApps/templates/bicep/UsageNanoCores_a9e1306a-a541-423f-a69e-bd37f8f5013a.bicep b/services/App/containerApps/templates/bicep/UsageNanoCores_a9e1306a-a541-423f-a69e-bd37f8f5013a.bicep
index 858461b17..7c842cf40 100644
--- a/services/App/containerApps/templates/bicep/UsageNanoCores_a9e1306a-a541-423f-a69e-bd37f8f5013a.bicep
+++ b/services/App/containerApps/templates/bicep/UsageNanoCores_a9e1306a-a541-423f-a69e-bd37f8f5013a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/App/containerApps/templates/bicep/WorkingSetBytes_423b4280-1f68-49d8-b11a-6a816b0d9172.bicep b/services/App/containerApps/templates/bicep/WorkingSetBytes_423b4280-1f68-49d8-b11a-6a816b0d9172.bicep
index b0869f65f..1429b74a7 100644
--- a/services/App/containerApps/templates/bicep/WorkingSetBytes_423b4280-1f68-49d8-b11a-6a816b0d9172.bicep
+++ b/services/App/containerApps/templates/bicep/WorkingSetBytes_423b4280-1f68-49d8-b11a-6a816b0d9172.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Automation/automationAccounts/templates/arm/TotalJob_74e0e3b4-62aa-4503-b05d-c5c79a029ed6.json b/services/Automation/automationAccounts/templates/arm/TotalJob_74e0e3b4-62aa-4503-b05d-c5c79a029ed6.json
index 5e7687712..e29b49b5e 100644
--- a/services/Automation/automationAccounts/templates/arm/TotalJob_74e0e3b4-62aa-4503-b05d-c5c79a029ed6.json
+++ b/services/Automation/automationAccounts/templates/arm/TotalJob_74e0e3b4-62aa-4503-b05d-c5c79a029ed6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Automation/automationAccounts/templates/arm/TotalUpdateDeploymentMachineRuns_49e7f58f-4910-4d2f-8589-573e8a65c6dd.json b/services/Automation/automationAccounts/templates/arm/TotalUpdateDeploymentMachineRuns_49e7f58f-4910-4d2f-8589-573e8a65c6dd.json
index 346afb95a..0012c3f78 100644
--- a/services/Automation/automationAccounts/templates/arm/TotalUpdateDeploymentMachineRuns_49e7f58f-4910-4d2f-8589-573e8a65c6dd.json
+++ b/services/Automation/automationAccounts/templates/arm/TotalUpdateDeploymentMachineRuns_49e7f58f-4910-4d2f-8589-573e8a65c6dd.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Automation/automationAccounts/templates/arm/TotalUpdateDeploymentRuns_c521bf0d-efec-4d3a-8541-d8749915bfd4.json b/services/Automation/automationAccounts/templates/arm/TotalUpdateDeploymentRuns_c521bf0d-efec-4d3a-8541-d8749915bfd4.json
index bbc43a419..ce93379eb 100644
--- a/services/Automation/automationAccounts/templates/arm/TotalUpdateDeploymentRuns_c521bf0d-efec-4d3a-8541-d8749915bfd4.json
+++ b/services/Automation/automationAccounts/templates/arm/TotalUpdateDeploymentRuns_c521bf0d-efec-4d3a-8541-d8749915bfd4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Automation/automationAccounts/templates/bicep/TotalJob_74e0e3b4-62aa-4503-b05d-c5c79a029ed6.bicep b/services/Automation/automationAccounts/templates/bicep/TotalJob_74e0e3b4-62aa-4503-b05d-c5c79a029ed6.bicep
index 0687b2c5e..7f0ad068c 100644
--- a/services/Automation/automationAccounts/templates/bicep/TotalJob_74e0e3b4-62aa-4503-b05d-c5c79a029ed6.bicep
+++ b/services/Automation/automationAccounts/templates/bicep/TotalJob_74e0e3b4-62aa-4503-b05d-c5c79a029ed6.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Automation/automationAccounts/templates/bicep/TotalUpdateDeploymentMachineRuns_49e7f58f-4910-4d2f-8589-573e8a65c6dd.bicep b/services/Automation/automationAccounts/templates/bicep/TotalUpdateDeploymentMachineRuns_49e7f58f-4910-4d2f-8589-573e8a65c6dd.bicep
index f2024d5d0..62c11a719 100644
--- a/services/Automation/automationAccounts/templates/bicep/TotalUpdateDeploymentMachineRuns_49e7f58f-4910-4d2f-8589-573e8a65c6dd.bicep
+++ b/services/Automation/automationAccounts/templates/bicep/TotalUpdateDeploymentMachineRuns_49e7f58f-4910-4d2f-8589-573e8a65c6dd.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Automation/automationAccounts/templates/bicep/TotalUpdateDeploymentRuns_c521bf0d-efec-4d3a-8541-d8749915bfd4.bicep b/services/Automation/automationAccounts/templates/bicep/TotalUpdateDeploymentRuns_c521bf0d-efec-4d3a-8541-d8749915bfd4.bicep
index 6eca0b37f..4ce7e0f51 100644
--- a/services/Automation/automationAccounts/templates/bicep/TotalUpdateDeploymentRuns_c521bf0d-efec-4d3a-8541-d8749915bfd4.bicep
+++ b/services/Automation/automationAccounts/templates/bicep/TotalUpdateDeploymentRuns_c521bf0d-efec-4d3a-8541-d8749915bfd4.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Batch/batchAccounts/templates/arm/OfflineNodeCount_b40fdb04-cada-4870-80f3-317afc57e5fb.json b/services/Batch/batchAccounts/templates/arm/OfflineNodeCount_b40fdb04-cada-4870-80f3-317afc57e5fb.json
index abc7d81f6..b552e7f97 100644
--- a/services/Batch/batchAccounts/templates/arm/OfflineNodeCount_b40fdb04-cada-4870-80f3-317afc57e5fb.json
+++ b/services/Batch/batchAccounts/templates/arm/OfflineNodeCount_b40fdb04-cada-4870-80f3-317afc57e5fb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Batch/batchAccounts/templates/arm/PreemptedNodeCount_8ce7d791-41a5-4d6a-9516-b009eabbd8f7.json b/services/Batch/batchAccounts/templates/arm/PreemptedNodeCount_8ce7d791-41a5-4d6a-9516-b009eabbd8f7.json
index f5fcc3e21..4f781c70d 100644
--- a/services/Batch/batchAccounts/templates/arm/PreemptedNodeCount_8ce7d791-41a5-4d6a-9516-b009eabbd8f7.json
+++ b/services/Batch/batchAccounts/templates/arm/PreemptedNodeCount_8ce7d791-41a5-4d6a-9516-b009eabbd8f7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Batch/batchAccounts/templates/arm/RebootingNodeCount_f49539ff-35b1-4d83-8541-e3cf49b383e5.json b/services/Batch/batchAccounts/templates/arm/RebootingNodeCount_f49539ff-35b1-4d83-8541-e3cf49b383e5.json
index 31f45c070..328abd794 100644
--- a/services/Batch/batchAccounts/templates/arm/RebootingNodeCount_f49539ff-35b1-4d83-8541-e3cf49b383e5.json
+++ b/services/Batch/batchAccounts/templates/arm/RebootingNodeCount_f49539ff-35b1-4d83-8541-e3cf49b383e5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Batch/batchAccounts/templates/arm/TaskFailEvent_70b8ce6d-0d28-4997-84df-957791877eec.json b/services/Batch/batchAccounts/templates/arm/TaskFailEvent_70b8ce6d-0d28-4997-84df-957791877eec.json
index c7aa6a73b..b66aa8978 100644
--- a/services/Batch/batchAccounts/templates/arm/TaskFailEvent_70b8ce6d-0d28-4997-84df-957791877eec.json
+++ b/services/Batch/batchAccounts/templates/arm/TaskFailEvent_70b8ce6d-0d28-4997-84df-957791877eec.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Batch/batchAccounts/templates/arm/UnusableNodeCount_6c9857e4-7d6b-4384-80da-b88a2e6858ac.json b/services/Batch/batchAccounts/templates/arm/UnusableNodeCount_6c9857e4-7d6b-4384-80da-b88a2e6858ac.json
index 69c999c44..b5e03418e 100644
--- a/services/Batch/batchAccounts/templates/arm/UnusableNodeCount_6c9857e4-7d6b-4384-80da-b88a2e6858ac.json
+++ b/services/Batch/batchAccounts/templates/arm/UnusableNodeCount_6c9857e4-7d6b-4384-80da-b88a2e6858ac.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Batch/batchAccounts/templates/bicep/OfflineNodeCount_b40fdb04-cada-4870-80f3-317afc57e5fb.bicep b/services/Batch/batchAccounts/templates/bicep/OfflineNodeCount_b40fdb04-cada-4870-80f3-317afc57e5fb.bicep
index f958a17c5..6416a4754 100644
--- a/services/Batch/batchAccounts/templates/bicep/OfflineNodeCount_b40fdb04-cada-4870-80f3-317afc57e5fb.bicep
+++ b/services/Batch/batchAccounts/templates/bicep/OfflineNodeCount_b40fdb04-cada-4870-80f3-317afc57e5fb.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Batch/batchAccounts/templates/bicep/PreemptedNodeCount_8ce7d791-41a5-4d6a-9516-b009eabbd8f7.bicep b/services/Batch/batchAccounts/templates/bicep/PreemptedNodeCount_8ce7d791-41a5-4d6a-9516-b009eabbd8f7.bicep
index 43e86b8e0..c193354f0 100644
--- a/services/Batch/batchAccounts/templates/bicep/PreemptedNodeCount_8ce7d791-41a5-4d6a-9516-b009eabbd8f7.bicep
+++ b/services/Batch/batchAccounts/templates/bicep/PreemptedNodeCount_8ce7d791-41a5-4d6a-9516-b009eabbd8f7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Batch/batchAccounts/templates/bicep/RebootingNodeCount_f49539ff-35b1-4d83-8541-e3cf49b383e5.bicep b/services/Batch/batchAccounts/templates/bicep/RebootingNodeCount_f49539ff-35b1-4d83-8541-e3cf49b383e5.bicep
index 354398cc1..b5bef39f7 100644
--- a/services/Batch/batchAccounts/templates/bicep/RebootingNodeCount_f49539ff-35b1-4d83-8541-e3cf49b383e5.bicep
+++ b/services/Batch/batchAccounts/templates/bicep/RebootingNodeCount_f49539ff-35b1-4d83-8541-e3cf49b383e5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Batch/batchAccounts/templates/bicep/TaskFailEvent_70b8ce6d-0d28-4997-84df-957791877eec.bicep b/services/Batch/batchAccounts/templates/bicep/TaskFailEvent_70b8ce6d-0d28-4997-84df-957791877eec.bicep
index 2c4fb56da..4df5e1282 100644
--- a/services/Batch/batchAccounts/templates/bicep/TaskFailEvent_70b8ce6d-0d28-4997-84df-957791877eec.bicep
+++ b/services/Batch/batchAccounts/templates/bicep/TaskFailEvent_70b8ce6d-0d28-4997-84df-957791877eec.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Batch/batchAccounts/templates/bicep/UnusableNodeCount_6c9857e4-7d6b-4384-80da-b88a2e6858ac.bicep b/services/Batch/batchAccounts/templates/bicep/UnusableNodeCount_6c9857e4-7d6b-4384-80da-b88a2e6858ac.bicep
index bc5dac4e0..45194685e 100644
--- a/services/Batch/batchAccounts/templates/bicep/UnusableNodeCount_6c9857e4-7d6b-4384-80da-b88a2e6858ac.bicep
+++ b/services/Batch/batchAccounts/templates/bicep/UnusableNodeCount_6c9857e4-7d6b-4384-80da-b88a2e6858ac.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/arm/allconnectedclients_af750dfc-62e5-4b74-9514-ca419d800590.json b/services/Cache/Redis/templates/arm/allconnectedclients_af750dfc-62e5-4b74-9514-ca419d800590.json
index d6cc08532..817c86611 100644
--- a/services/Cache/Redis/templates/arm/allconnectedclients_af750dfc-62e5-4b74-9514-ca419d800590.json
+++ b/services/Cache/Redis/templates/arm/allconnectedclients_af750dfc-62e5-4b74-9514-ca419d800590.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/allpercentprocessortime_24c5276b-77b1-48ab-a8c1-15844b11e0aa.json b/services/Cache/Redis/templates/arm/allpercentprocessortime_24c5276b-77b1-48ab-a8c1-15844b11e0aa.json
index 33973b5b3..3138d1c09 100644
--- a/services/Cache/Redis/templates/arm/allpercentprocessortime_24c5276b-77b1-48ab-a8c1-15844b11e0aa.json
+++ b/services/Cache/Redis/templates/arm/allpercentprocessortime_24c5276b-77b1-48ab-a8c1-15844b11e0aa.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/allserverLoad_7072ba94-41d2-4584-89ab-a5824ed045f4.json b/services/Cache/Redis/templates/arm/allserverLoad_7072ba94-41d2-4584-89ab-a5824ed045f4.json
index 6a50b802c..f3fb00c46 100644
--- a/services/Cache/Redis/templates/arm/allserverLoad_7072ba94-41d2-4584-89ab-a5824ed045f4.json
+++ b/services/Cache/Redis/templates/arm/allserverLoad_7072ba94-41d2-4584-89ab-a5824ed045f4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/allusedmemorypercentage_b9ffe52a-f430-4605-a2b1-d815eb1bcc56.json b/services/Cache/Redis/templates/arm/allusedmemorypercentage_b9ffe52a-f430-4605-a2b1-d815eb1bcc56.json
index 148d84441..38da5bae1 100644
--- a/services/Cache/Redis/templates/arm/allusedmemorypercentage_b9ffe52a-f430-4605-a2b1-d815eb1bcc56.json
+++ b/services/Cache/Redis/templates/arm/allusedmemorypercentage_b9ffe52a-f430-4605-a2b1-d815eb1bcc56.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/cacheLatency_82cb3ad7-d44f-4131-9078-5aac82d3333a.json b/services/Cache/Redis/templates/arm/cacheLatency_82cb3ad7-d44f-4131-9078-5aac82d3333a.json
index e93506074..c9f031944 100644
--- a/services/Cache/Redis/templates/arm/cacheLatency_82cb3ad7-d44f-4131-9078-5aac82d3333a.json
+++ b/services/Cache/Redis/templates/arm/cacheLatency_82cb3ad7-d44f-4131-9078-5aac82d3333a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/cacheRead_cc764431-e1b0-4455-94b1-b66d32cc54b4.json b/services/Cache/Redis/templates/arm/cacheRead_cc764431-e1b0-4455-94b1-b66d32cc54b4.json
index 326518c76..ecb2223b0 100644
--- a/services/Cache/Redis/templates/arm/cacheRead_cc764431-e1b0-4455-94b1-b66d32cc54b4.json
+++ b/services/Cache/Redis/templates/arm/cacheRead_cc764431-e1b0-4455-94b1-b66d32cc54b4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/connectedclients_f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.json b/services/Cache/Redis/templates/arm/connectedclients_f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.json
index b5114d5fa..ff55f8885 100644
--- a/services/Cache/Redis/templates/arm/connectedclients_f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.json
+++ b/services/Cache/Redis/templates/arm/connectedclients_f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/errors_24b37318-9353-4424-9d8e-ac28450328b6.json b/services/Cache/Redis/templates/arm/errors_24b37318-9353-4424-9d8e-ac28450328b6.json
index eac4a9f68..81550d1b8 100644
--- a/services/Cache/Redis/templates/arm/errors_24b37318-9353-4424-9d8e-ac28450328b6.json
+++ b/services/Cache/Redis/templates/arm/errors_24b37318-9353-4424-9d8e-ac28450328b6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/percentProcessorTime_8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.json b/services/Cache/Redis/templates/arm/percentProcessorTime_8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.json
index 96a31fea1..c3d581e7d 100644
--- a/services/Cache/Redis/templates/arm/percentProcessorTime_8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.json
+++ b/services/Cache/Redis/templates/arm/percentProcessorTime_8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/serverLoad_837ecf42-3f25-41ae-b97d-34193f0669da.json b/services/Cache/Redis/templates/arm/serverLoad_837ecf42-3f25-41ae-b97d-34193f0669da.json
index d349d6790..c61d578f4 100644
--- a/services/Cache/Redis/templates/arm/serverLoad_837ecf42-3f25-41ae-b97d-34193f0669da.json
+++ b/services/Cache/Redis/templates/arm/serverLoad_837ecf42-3f25-41ae-b97d-34193f0669da.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/usedmemoryRss_1b68776d-4d11-4d27-96c5-4d51cf17e1fc.json b/services/Cache/Redis/templates/arm/usedmemoryRss_1b68776d-4d11-4d27-96c5-4d51cf17e1fc.json
index 19cd23c75..23af7afe3 100644
--- a/services/Cache/Redis/templates/arm/usedmemoryRss_1b68776d-4d11-4d27-96c5-4d51cf17e1fc.json
+++ b/services/Cache/Redis/templates/arm/usedmemoryRss_1b68776d-4d11-4d27-96c5-4d51cf17e1fc.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/usedmemory_aecc75bf-f961-4c22-86e9-84c5039a2938.json b/services/Cache/Redis/templates/arm/usedmemory_aecc75bf-f961-4c22-86e9-84c5039a2938.json
index 61c5755ce..f293f421f 100644
--- a/services/Cache/Redis/templates/arm/usedmemory_aecc75bf-f961-4c22-86e9-84c5039a2938.json
+++ b/services/Cache/Redis/templates/arm/usedmemory_aecc75bf-f961-4c22-86e9-84c5039a2938.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/arm/usedmemorypercentage_d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.json b/services/Cache/Redis/templates/arm/usedmemorypercentage_d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.json
index f35ef6c16..ecf88e8ef 100644
--- a/services/Cache/Redis/templates/arm/usedmemorypercentage_d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.json
+++ b/services/Cache/Redis/templates/arm/usedmemorypercentage_d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cache/Redis/templates/bicep/allconnectedclients_af750dfc-62e5-4b74-9514-ca419d800590.bicep b/services/Cache/Redis/templates/bicep/allconnectedclients_af750dfc-62e5-4b74-9514-ca419d800590.bicep
index 57d93af64..321e8b937 100644
--- a/services/Cache/Redis/templates/bicep/allconnectedclients_af750dfc-62e5-4b74-9514-ca419d800590.bicep
+++ b/services/Cache/Redis/templates/bicep/allconnectedclients_af750dfc-62e5-4b74-9514-ca419d800590.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/allpercentprocessortime_24c5276b-77b1-48ab-a8c1-15844b11e0aa.bicep b/services/Cache/Redis/templates/bicep/allpercentprocessortime_24c5276b-77b1-48ab-a8c1-15844b11e0aa.bicep
index 63a973854..a799fcdf1 100644
--- a/services/Cache/Redis/templates/bicep/allpercentprocessortime_24c5276b-77b1-48ab-a8c1-15844b11e0aa.bicep
+++ b/services/Cache/Redis/templates/bicep/allpercentprocessortime_24c5276b-77b1-48ab-a8c1-15844b11e0aa.bicep
@@ -129,7 +129,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/allserverLoad_7072ba94-41d2-4584-89ab-a5824ed045f4.bicep b/services/Cache/Redis/templates/bicep/allserverLoad_7072ba94-41d2-4584-89ab-a5824ed045f4.bicep
index 7dbb4ac25..ea23c374c 100644
--- a/services/Cache/Redis/templates/bicep/allserverLoad_7072ba94-41d2-4584-89ab-a5824ed045f4.bicep
+++ b/services/Cache/Redis/templates/bicep/allserverLoad_7072ba94-41d2-4584-89ab-a5824ed045f4.bicep
@@ -129,7 +129,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/allusedmemorypercentage_b9ffe52a-f430-4605-a2b1-d815eb1bcc56.bicep b/services/Cache/Redis/templates/bicep/allusedmemorypercentage_b9ffe52a-f430-4605-a2b1-d815eb1bcc56.bicep
index 504b70b28..7c08d23cf 100644
--- a/services/Cache/Redis/templates/bicep/allusedmemorypercentage_b9ffe52a-f430-4605-a2b1-d815eb1bcc56.bicep
+++ b/services/Cache/Redis/templates/bicep/allusedmemorypercentage_b9ffe52a-f430-4605-a2b1-d815eb1bcc56.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/cacheLatency_82cb3ad7-d44f-4131-9078-5aac82d3333a.bicep b/services/Cache/Redis/templates/bicep/cacheLatency_82cb3ad7-d44f-4131-9078-5aac82d3333a.bicep
index 684fec388..8de446200 100644
--- a/services/Cache/Redis/templates/bicep/cacheLatency_82cb3ad7-d44f-4131-9078-5aac82d3333a.bicep
+++ b/services/Cache/Redis/templates/bicep/cacheLatency_82cb3ad7-d44f-4131-9078-5aac82d3333a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/cacheRead_cc764431-e1b0-4455-94b1-b66d32cc54b4.bicep b/services/Cache/Redis/templates/bicep/cacheRead_cc764431-e1b0-4455-94b1-b66d32cc54b4.bicep
index 3b86b1e9f..b2f83d580 100644
--- a/services/Cache/Redis/templates/bicep/cacheRead_cc764431-e1b0-4455-94b1-b66d32cc54b4.bicep
+++ b/services/Cache/Redis/templates/bicep/cacheRead_cc764431-e1b0-4455-94b1-b66d32cc54b4.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/connectedclients_f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.bicep b/services/Cache/Redis/templates/bicep/connectedclients_f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.bicep
index 32b4dfafa..4f36bb7ea 100644
--- a/services/Cache/Redis/templates/bicep/connectedclients_f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.bicep
+++ b/services/Cache/Redis/templates/bicep/connectedclients_f0c2ec92-15bc-47b1-8edb-d0c5d10aaddc.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/errors_24b37318-9353-4424-9d8e-ac28450328b6.bicep b/services/Cache/Redis/templates/bicep/errors_24b37318-9353-4424-9d8e-ac28450328b6.bicep
index 0a8e298b4..de32f14ae 100644
--- a/services/Cache/Redis/templates/bicep/errors_24b37318-9353-4424-9d8e-ac28450328b6.bicep
+++ b/services/Cache/Redis/templates/bicep/errors_24b37318-9353-4424-9d8e-ac28450328b6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/percentProcessorTime_8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.bicep b/services/Cache/Redis/templates/bicep/percentProcessorTime_8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.bicep
index 9143c17a6..064e9d830 100644
--- a/services/Cache/Redis/templates/bicep/percentProcessorTime_8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.bicep
+++ b/services/Cache/Redis/templates/bicep/percentProcessorTime_8d5df17c-a5b7-4cf1-a01e-f9d8625297a6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/serverLoad_837ecf42-3f25-41ae-b97d-34193f0669da.bicep b/services/Cache/Redis/templates/bicep/serverLoad_837ecf42-3f25-41ae-b97d-34193f0669da.bicep
index 4aade8188..35fe23572 100644
--- a/services/Cache/Redis/templates/bicep/serverLoad_837ecf42-3f25-41ae-b97d-34193f0669da.bicep
+++ b/services/Cache/Redis/templates/bicep/serverLoad_837ecf42-3f25-41ae-b97d-34193f0669da.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/usedmemoryRss_1b68776d-4d11-4d27-96c5-4d51cf17e1fc.bicep b/services/Cache/Redis/templates/bicep/usedmemoryRss_1b68776d-4d11-4d27-96c5-4d51cf17e1fc.bicep
index 522239a26..e14fb7f05 100644
--- a/services/Cache/Redis/templates/bicep/usedmemoryRss_1b68776d-4d11-4d27-96c5-4d51cf17e1fc.bicep
+++ b/services/Cache/Redis/templates/bicep/usedmemoryRss_1b68776d-4d11-4d27-96c5-4d51cf17e1fc.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/usedmemory_aecc75bf-f961-4c22-86e9-84c5039a2938.bicep b/services/Cache/Redis/templates/bicep/usedmemory_aecc75bf-f961-4c22-86e9-84c5039a2938.bicep
index eab3379cb..01cbe2a7a 100644
--- a/services/Cache/Redis/templates/bicep/usedmemory_aecc75bf-f961-4c22-86e9-84c5039a2938.bicep
+++ b/services/Cache/Redis/templates/bicep/usedmemory_aecc75bf-f961-4c22-86e9-84c5039a2938.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cache/Redis/templates/bicep/usedmemorypercentage_d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.bicep b/services/Cache/Redis/templates/bicep/usedmemorypercentage_d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.bicep
index 09503653f..215725662 100644
--- a/services/Cache/Redis/templates/bicep/usedmemorypercentage_d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.bicep
+++ b/services/Cache/Redis/templates/bicep/usedmemorypercentage_d6c4011c-f4e6-4b12-b6e6-9486eab0fecc.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cdn/profiles/templates/arm/ByteHitRatio_5e8aaa27-e5b3-4774-9807-af61ec96b001.json b/services/Cdn/profiles/templates/arm/ByteHitRatio_5e8aaa27-e5b3-4774-9807-af61ec96b001.json
index 6321868cb..8cc551645 100644
--- a/services/Cdn/profiles/templates/arm/ByteHitRatio_5e8aaa27-e5b3-4774-9807-af61ec96b001.json
+++ b/services/Cdn/profiles/templates/arm/ByteHitRatio_5e8aaa27-e5b3-4774-9807-af61ec96b001.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cdn/profiles/templates/arm/OriginHealthPercentage_c42138d4-bb4c-4171-8802-ba44d671d72f.json b/services/Cdn/profiles/templates/arm/OriginHealthPercentage_c42138d4-bb4c-4171-8802-ba44d671d72f.json
index 78487461f..731729ffd 100644
--- a/services/Cdn/profiles/templates/arm/OriginHealthPercentage_c42138d4-bb4c-4171-8802-ba44d671d72f.json
+++ b/services/Cdn/profiles/templates/arm/OriginHealthPercentage_c42138d4-bb4c-4171-8802-ba44d671d72f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cdn/profiles/templates/arm/Percentage5XX_c47441d4-7061-4acd-8ad8-69e52d00557c.json b/services/Cdn/profiles/templates/arm/Percentage5XX_c47441d4-7061-4acd-8ad8-69e52d00557c.json
index 03d55822c..17414b82c 100644
--- a/services/Cdn/profiles/templates/arm/Percentage5XX_c47441d4-7061-4acd-8ad8-69e52d00557c.json
+++ b/services/Cdn/profiles/templates/arm/Percentage5XX_c47441d4-7061-4acd-8ad8-69e52d00557c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cdn/profiles/templates/arm/RequestCount_cf6babc2-f623-4f12-a352-c30a02bcb6c6.json b/services/Cdn/profiles/templates/arm/RequestCount_cf6babc2-f623-4f12-a352-c30a02bcb6c6.json
index 91bfbc757..ea7dcc833 100644
--- a/services/Cdn/profiles/templates/arm/RequestCount_cf6babc2-f623-4f12-a352-c30a02bcb6c6.json
+++ b/services/Cdn/profiles/templates/arm/RequestCount_cf6babc2-f623-4f12-a352-c30a02bcb6c6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cdn/profiles/templates/arm/TotalLatency_5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.json b/services/Cdn/profiles/templates/arm/TotalLatency_5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.json
index 672afd623..90b42444d 100644
--- a/services/Cdn/profiles/templates/arm/TotalLatency_5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.json
+++ b/services/Cdn/profiles/templates/arm/TotalLatency_5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Cdn/profiles/templates/bicep/ByteHitRatio_5e8aaa27-e5b3-4774-9807-af61ec96b001.bicep b/services/Cdn/profiles/templates/bicep/ByteHitRatio_5e8aaa27-e5b3-4774-9807-af61ec96b001.bicep
index 1a7bd6253..128ea5752 100644
--- a/services/Cdn/profiles/templates/bicep/ByteHitRatio_5e8aaa27-e5b3-4774-9807-af61ec96b001.bicep
+++ b/services/Cdn/profiles/templates/bicep/ByteHitRatio_5e8aaa27-e5b3-4774-9807-af61ec96b001.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cdn/profiles/templates/bicep/OriginHealthPercentage_c42138d4-bb4c-4171-8802-ba44d671d72f.bicep b/services/Cdn/profiles/templates/bicep/OriginHealthPercentage_c42138d4-bb4c-4171-8802-ba44d671d72f.bicep
index e65b7f5f5..595cb0449 100644
--- a/services/Cdn/profiles/templates/bicep/OriginHealthPercentage_c42138d4-bb4c-4171-8802-ba44d671d72f.bicep
+++ b/services/Cdn/profiles/templates/bicep/OriginHealthPercentage_c42138d4-bb4c-4171-8802-ba44d671d72f.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cdn/profiles/templates/bicep/Percentage5XX_c47441d4-7061-4acd-8ad8-69e52d00557c.bicep b/services/Cdn/profiles/templates/bicep/Percentage5XX_c47441d4-7061-4acd-8ad8-69e52d00557c.bicep
index 80beff7b4..afbbe4711 100644
--- a/services/Cdn/profiles/templates/bicep/Percentage5XX_c47441d4-7061-4acd-8ad8-69e52d00557c.bicep
+++ b/services/Cdn/profiles/templates/bicep/Percentage5XX_c47441d4-7061-4acd-8ad8-69e52d00557c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cdn/profiles/templates/bicep/RequestCount_cf6babc2-f623-4f12-a352-c30a02bcb6c6.bicep b/services/Cdn/profiles/templates/bicep/RequestCount_cf6babc2-f623-4f12-a352-c30a02bcb6c6.bicep
index bb90066e1..ec5697089 100644
--- a/services/Cdn/profiles/templates/bicep/RequestCount_cf6babc2-f623-4f12-a352-c30a02bcb6c6.bicep
+++ b/services/Cdn/profiles/templates/bicep/RequestCount_cf6babc2-f623-4f12-a352-c30a02bcb6c6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Cdn/profiles/templates/bicep/TotalLatency_5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.bicep b/services/Cdn/profiles/templates/bicep/TotalLatency_5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.bicep
index 845753c2b..ef1754cd6 100644
--- a/services/Cdn/profiles/templates/bicep/TotalLatency_5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.bicep
+++ b/services/Cdn/profiles/templates/bicep/TotalLatency_5fb9c4bf-3799-44e0-bd75-656d1cfa26d2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/CognitiveServices/accounts/templates/arm/AzureOpenAIContextTokensCacheMatchRate_81f8369c-65bf-4194-bfd2-ffdfa2470577.json b/services/CognitiveServices/accounts/templates/arm/AzureOpenAIContextTokensCacheMatchRate_81f8369c-65bf-4194-bfd2-ffdfa2470577.json
index a08c4b025..cc36c5566 100644
--- a/services/CognitiveServices/accounts/templates/arm/AzureOpenAIContextTokensCacheMatchRate_81f8369c-65bf-4194-bfd2-ffdfa2470577.json
+++ b/services/CognitiveServices/accounts/templates/arm/AzureOpenAIContextTokensCacheMatchRate_81f8369c-65bf-4194-bfd2-ffdfa2470577.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/CognitiveServices/accounts/templates/arm/AzureOpenAIProvisionedManagedUtilizationV2_693a3b37-1e2a-42d1-aaed-b1f374276d1c.json b/services/CognitiveServices/accounts/templates/arm/AzureOpenAIProvisionedManagedUtilizationV2_693a3b37-1e2a-42d1-aaed-b1f374276d1c.json
index f4a66fc03..41da18995 100644
--- a/services/CognitiveServices/accounts/templates/arm/AzureOpenAIProvisionedManagedUtilizationV2_693a3b37-1e2a-42d1-aaed-b1f374276d1c.json
+++ b/services/CognitiveServices/accounts/templates/arm/AzureOpenAIProvisionedManagedUtilizationV2_693a3b37-1e2a-42d1-aaed-b1f374276d1c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/CognitiveServices/accounts/templates/arm/AzureOpenAITimeToResponse_995cc12a-1887-4669-92c5-70a6ca8bfe70.json b/services/CognitiveServices/accounts/templates/arm/AzureOpenAITimeToResponse_995cc12a-1887-4669-92c5-70a6ca8bfe70.json
index a3b462e45..b238d6c5e 100644
--- a/services/CognitiveServices/accounts/templates/arm/AzureOpenAITimeToResponse_995cc12a-1887-4669-92c5-70a6ca8bfe70.json
+++ b/services/CognitiveServices/accounts/templates/arm/AzureOpenAITimeToResponse_995cc12a-1887-4669-92c5-70a6ca8bfe70.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/loadBalancers/templates/arm/SYNCount_94c90db6-8fd7-460c-b704-c2a429913376.json b/services/CognitiveServices/accounts/templates/arm/BlockedCalls_87fe8679-655d-4acb-a37c-b7faebe26d47.json
similarity index 95%
rename from services/Network/loadBalancers/templates/arm/SYNCount_94c90db6-8fd7-460c-b704-c2a429913376.json
rename to services/CognitiveServices/accounts/templates/arm/BlockedCalls_87fe8679-655d-4acb-a37c-b7faebe26d47.json
index e84c46775..abffe07a0 100644
--- a/services/Network/loadBalancers/templates/arm/SYNCount_94c90db6-8fd7-460c-b704-c2a429913376.json
+++ b/services/CognitiveServices/accounts/templates/arm/BlockedCalls_87fe8679-655d-4acb-a37c-b7faebe26d47.json
@@ -11,7 +11,7 @@
     },
     "alertDescription": {
       "type": "string",
-      "defaultValue": "number of syn packet which represent an attempt to establish tcp connection.",
+      "defaultValue": "Number of calls that exceeded rate or quota limit.",
       "metadata": {
         "description": "Description of alert"
       }
@@ -45,7 +45,7 @@
     },
     "alertSeverity": {
       "type": "int",
-      "defaultValue": 1,
+      "defaultValue": 2,
       "allowedValues": [
         0,
         1,
@@ -59,7 +59,7 @@
     },
     "operator": {
       "type": "string",
-      "defaultValue": "",
+      "defaultValue": "GreaterThan",
       "allowedValues": [
         "Equals",
         "GreaterThan",
@@ -73,7 +73,7 @@
     },
     "threshold": {
       "type": "string",
-      "defaultValue": "",
+      "defaultValue": "0",
       "metadata": {
         "description": "The threshold value at which the alert is activated."
       }
@@ -170,7 +170,7 @@
           "allOf": [
             {
               "name": "1st criterion",
-              "metricName": "SYNCount",
+              "metricName": "BlockedCalls",
               "dimensions": [],
               "operator": "[parameters('operator')]",
               "threshold": "[parameters('threshold')]",
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/loadBalancers/templates/arm/PacketCount_d766dc3e-42cc-42a7-ba4f-3c1d7fa295c5.json b/services/CognitiveServices/accounts/templates/arm/ClientErrors_ec8c928a-5206-4059-8aea-8486004dd30d.json
similarity index 96%
rename from services/Network/loadBalancers/templates/arm/PacketCount_d766dc3e-42cc-42a7-ba4f-3c1d7fa295c5.json
rename to services/CognitiveServices/accounts/templates/arm/ClientErrors_ec8c928a-5206-4059-8aea-8486004dd30d.json
index 99b1b2fa7..44c0d20b7 100644
--- a/services/Network/loadBalancers/templates/arm/PacketCount_d766dc3e-42cc-42a7-ba4f-3c1d7fa295c5.json
+++ b/services/CognitiveServices/accounts/templates/arm/ClientErrors_ec8c928a-5206-4059-8aea-8486004dd30d.json
@@ -11,7 +11,7 @@
     },
     "alertDescription": {
       "type": "string",
-      "defaultValue": "total number of packet passing through load balancer",
+      "defaultValue": "Number of calls with client side error (HTTP response code 4xx).",
       "metadata": {
         "description": "Description of alert"
       }
@@ -59,7 +59,7 @@
     },
     "operator": {
       "type": "string",
-      "defaultValue": "",
+      "defaultValue": "GreaterThan",
       "allowedValues": [
         "Equals",
         "GreaterThan",
@@ -73,7 +73,7 @@
     },
     "threshold": {
       "type": "string",
-      "defaultValue": "",
+      "defaultValue": "0",
       "metadata": {
         "description": "The threshold value at which the alert is activated."
       }
@@ -170,7 +170,7 @@
           "allOf": [
             {
               "name": "1st criterion",
-              "metricName": "PacketCount",
+              "metricName": "ClientErrors",
               "dimensions": [],
               "operator": "[parameters('operator')]",
               "threshold": "[parameters('threshold')]",
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/loadBalancers/templates/arm/AllocatedSnartPorts_5b64d91c-54de-4f8c-a5d6-054967f4ceaf.json b/services/CognitiveServices/accounts/templates/arm/Latency_d76ab40a-2831-4fa2-b476-5fdcda3d7c4c.json
similarity index 96%
rename from services/Network/loadBalancers/templates/arm/AllocatedSnartPorts_5b64d91c-54de-4f8c-a5d6-054967f4ceaf.json
rename to services/CognitiveServices/accounts/templates/arm/Latency_d76ab40a-2831-4fa2-b476-5fdcda3d7c4c.json
index 2c850d3e3..a33b06311 100644
--- a/services/Network/loadBalancers/templates/arm/AllocatedSnartPorts_5b64d91c-54de-4f8c-a5d6-054967f4ceaf.json
+++ b/services/CognitiveServices/accounts/templates/arm/Latency_d76ab40a-2831-4fa2-b476-5fdcda3d7c4c.json
@@ -11,7 +11,7 @@
     },
     "alertDescription": {
       "type": "string",
-      "defaultValue": "total number of port allocated for SNAT",
+      "defaultValue": "Latency in milliseconds.",
       "metadata": {
         "description": "Description of alert"
       }
@@ -45,7 +45,7 @@
     },
     "alertSeverity": {
       "type": "int",
-      "defaultValue": 1,
+      "defaultValue": 2,
       "allowedValues": [
         0,
         1,
@@ -59,7 +59,7 @@
     },
     "operator": {
       "type": "string",
-      "defaultValue": "",
+      "defaultValue": "GreaterThan",
       "allowedValues": [
         "Equals",
         "GreaterThan",
@@ -73,7 +73,7 @@
     },
     "threshold": {
       "type": "string",
-      "defaultValue": "",
+      "defaultValue": "90",
       "metadata": {
         "description": "The threshold value at which the alert is activated."
       }
@@ -170,7 +170,7 @@
           "allOf": [
             {
               "name": "1st criterion",
-              "metricName": "AllocatedSnartPorts",
+              "metricName": "Latency",
               "dimensions": [],
               "operator": "[parameters('operator')]",
               "threshold": "[parameters('threshold')]",
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/CognitiveServices/accounts/templates/arm/ServerErrors_3c550d9c-8276-4a61-b0cf-ef437a55e299.json b/services/CognitiveServices/accounts/templates/arm/ServerErrors_3c550d9c-8276-4a61-b0cf-ef437a55e299.json
new file mode 100644
index 000000000..645418465
--- /dev/null
+++ b/services/CognitiveServices/accounts/templates/arm/ServerErrors_3c550d9c-8276-4a61-b0cf-ef437a55e299.json
@@ -0,0 +1,199 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "alertName": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Name of the alert"
+      }
+    },
+    "alertDescription": {
+      "type": "string",
+      "defaultValue": "Number of calls with service internal error (HTTP response code 5xx).",
+      "metadata": {
+        "description": "Description of alert"
+      }
+    },
+    "targetResourceId": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "List of Azure resource Ids seperated by a comma. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name"
+      }
+    },
+    "targetResourceRegion": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure region in which target resources to be monitored are in (without spaces). For example: EastUS"
+      }
+    },
+    "targetResourceType": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Resource type of target resources to be monitored."
+      }
+    },
+    "isEnabled": {
+      "type": "bool",
+      "defaultValue": true,
+      "metadata": {
+        "description": "Specifies whether the alert is enabled"
+      }
+    },
+    "alertSeverity": {
+      "type": "int",
+      "defaultValue": 3,
+      "allowedValues": [
+        0,
+        1,
+        2,
+        3,
+        4
+      ],
+      "metadata": {
+        "description": "Severity of alert {0,1,2,3,4}"
+      }
+    },
+    "operator": {
+      "type": "string",
+      "defaultValue": "GreaterThan",
+      "allowedValues": [
+        "Equals",
+        "GreaterThan",
+        "GreaterThanOrEqual",
+        "LessThan",
+        "LessThanOrEqual"
+      ],
+      "metadata": {
+        "description": "Operator comparing the current value with the threshold value."
+      }
+    },
+    "threshold": {
+      "type": "string",
+      "defaultValue": "0",
+      "metadata": {
+        "description": "The threshold value at which the alert is activated."
+      }
+    },
+    "timeAggregation": {
+      "type": "string",
+      "defaultValue": "Total",
+      "allowedValues": [
+        "Average",
+        "Minimum",
+        "Maximum",
+        "Total",
+        "Count"
+      ],
+      "metadata": {
+        "description": "How the data that is collected should be combined over time."
+      }
+    },
+    "windowSize": {
+      "type": "string",
+      "defaultValue": "PT5M",
+      "allowedValues": [
+        "PT1M",
+        "PT5M",
+        "PT15M",
+        "PT30M",
+        "PT1H",
+        "PT6H",
+        "PT12H",
+        "PT24H",
+        "PT1D"
+      ],
+      "metadata": {
+        "description": "Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format."
+      }
+    },
+    "evaluationFrequency": {
+      "type": "string",
+      "defaultValue": "PT1M",
+      "allowedValues": [
+        "PT1M",
+        "PT5M",
+        "PT15M",
+        "PT30M",
+        "PT1H"
+      ],
+      "metadata": {
+        "description": "how often the metric alert is evaluated represented in ISO 8601 duration format"
+      }
+    },
+    "currentDateTimeUtcNow": {
+      "type": "string",
+      "defaultValue": "[utcNow()]",
+      "metadata": {
+          "description": "The current date and time using the utcNow function. Used for deployment name uniqueness"
+      }
+    },
+    "telemetryOptOut": {
+      "type": "string",
+      "defaultValue": "No",
+      "allowedValues": [
+          "Yes",
+          "No"
+      ],
+      "metadata": {
+          "description": "The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry."
+      }
+    }
+  },
+  "variables": {
+    "pidDeploymentName": "[take(concat('pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-', uniqueString(resourceGroup().id, parameters('alertName'), parameters('currentDateTimeUtcNow'))), 64)]",
+    "varTargetResourceId": "[split(parameters('targetResourceId'), ',')]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Insights/metricAlerts",
+      "apiVersion": "2018-03-01",
+      "name": "[parameters('alertName')]",
+      "location": "global",
+      "tags": {
+        "_deployed_by_amba": true
+      },
+      "properties": {
+        "description": "[parameters('alertDescription')]",
+        "scopes": "[variables('varTargetResourceId')]",
+        "targetResourceType": "[parameters('targetResourceType')]",
+        "targetResourceRegion": "[parameters('targetResourceRegion')]",
+        "severity": "[parameters('alertSeverity')]",
+        "enabled": "[parameters('isEnabled')]",
+        "evaluationFrequency": "[parameters('evaluationFrequency')]",
+        "windowSize": "[parameters('windowSize')]",
+        "criteria": {
+          "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria",
+          "allOf": [
+            {
+              "name": "1st criterion",
+              "metricName": "ServerErrors",
+              "dimensions": [],
+              "operator": "[parameters('operator')]",
+              "threshold": "[parameters('threshold')]",
+              "timeAggregation": "[parameters('timeAggregation')]",
+              "criterionType": "StaticThresholdCriterion"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
+      "apiVersion": "2023-07-01",
+      "name": "[variables('pidDeploymentName')]",
+      "type": "Microsoft.Resources/deployments",
+      "properties": {
+          "mode": "Incremental",
+          "template": {
+              "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+              "contentVersion": "1.0.0.0",
+              "resources": []
+          }
+      }
+    }
+  ]
+}
diff --git a/services/CognitiveServices/accounts/templates/arm/SuccessRate_80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.json b/services/CognitiveServices/accounts/templates/arm/SuccessRate_80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.json
new file mode 100644
index 000000000..550a1494d
--- /dev/null
+++ b/services/CognitiveServices/accounts/templates/arm/SuccessRate_80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.json
@@ -0,0 +1,199 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "alertName": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Name of the alert"
+      }
+    },
+    "alertDescription": {
+      "type": "string",
+      "defaultValue": "Availability percentage with the following calculation: (Total Calls - Server Errors)/Total Calls. Server Errors include any HTTP responses >=500.",
+      "metadata": {
+        "description": "Description of alert"
+      }
+    },
+    "targetResourceId": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "List of Azure resource Ids seperated by a comma. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name"
+      }
+    },
+    "targetResourceRegion": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure region in which target resources to be monitored are in (without spaces). For example: EastUS"
+      }
+    },
+    "targetResourceType": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Resource type of target resources to be monitored."
+      }
+    },
+    "isEnabled": {
+      "type": "bool",
+      "defaultValue": true,
+      "metadata": {
+        "description": "Specifies whether the alert is enabled"
+      }
+    },
+    "alertSeverity": {
+      "type": "int",
+      "defaultValue": 3,
+      "allowedValues": [
+        0,
+        1,
+        2,
+        3,
+        4
+      ],
+      "metadata": {
+        "description": "Severity of alert {0,1,2,3,4}"
+      }
+    },
+    "operator": {
+      "type": "string",
+      "defaultValue": "LessThan",
+      "allowedValues": [
+        "Equals",
+        "GreaterThan",
+        "GreaterThanOrEqual",
+        "LessThan",
+        "LessThanOrEqual"
+      ],
+      "metadata": {
+        "description": "Operator comparing the current value with the threshold value."
+      }
+    },
+    "threshold": {
+      "type": "string",
+      "defaultValue": "100",
+      "metadata": {
+        "description": "The threshold value at which the alert is activated."
+      }
+    },
+    "timeAggregation": {
+      "type": "string",
+      "defaultValue": "Average",
+      "allowedValues": [
+        "Average",
+        "Minimum",
+        "Maximum",
+        "Total",
+        "Count"
+      ],
+      "metadata": {
+        "description": "How the data that is collected should be combined over time."
+      }
+    },
+    "windowSize": {
+      "type": "string",
+      "defaultValue": "PT5M",
+      "allowedValues": [
+        "PT1M",
+        "PT5M",
+        "PT15M",
+        "PT30M",
+        "PT1H",
+        "PT6H",
+        "PT12H",
+        "PT24H",
+        "PT1D"
+      ],
+      "metadata": {
+        "description": "Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format."
+      }
+    },
+    "evaluationFrequency": {
+      "type": "string",
+      "defaultValue": "PT1M",
+      "allowedValues": [
+        "PT1M",
+        "PT5M",
+        "PT15M",
+        "PT30M",
+        "PT1H"
+      ],
+      "metadata": {
+        "description": "how often the metric alert is evaluated represented in ISO 8601 duration format"
+      }
+    },
+    "currentDateTimeUtcNow": {
+      "type": "string",
+      "defaultValue": "[utcNow()]",
+      "metadata": {
+          "description": "The current date and time using the utcNow function. Used for deployment name uniqueness"
+      }
+    },
+    "telemetryOptOut": {
+      "type": "string",
+      "defaultValue": "No",
+      "allowedValues": [
+          "Yes",
+          "No"
+      ],
+      "metadata": {
+          "description": "The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry."
+      }
+    }
+  },
+  "variables": {
+    "pidDeploymentName": "[take(concat('pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-', uniqueString(resourceGroup().id, parameters('alertName'), parameters('currentDateTimeUtcNow'))), 64)]",
+    "varTargetResourceId": "[split(parameters('targetResourceId'), ',')]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Insights/metricAlerts",
+      "apiVersion": "2018-03-01",
+      "name": "[parameters('alertName')]",
+      "location": "global",
+      "tags": {
+        "_deployed_by_amba": true
+      },
+      "properties": {
+        "description": "[parameters('alertDescription')]",
+        "scopes": "[variables('varTargetResourceId')]",
+        "targetResourceType": "[parameters('targetResourceType')]",
+        "targetResourceRegion": "[parameters('targetResourceRegion')]",
+        "severity": "[parameters('alertSeverity')]",
+        "enabled": "[parameters('isEnabled')]",
+        "evaluationFrequency": "[parameters('evaluationFrequency')]",
+        "windowSize": "[parameters('windowSize')]",
+        "criteria": {
+          "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria",
+          "allOf": [
+            {
+              "name": "1st criterion",
+              "metricName": "SuccessRate",
+              "dimensions": [],
+              "operator": "[parameters('operator')]",
+              "threshold": "[parameters('threshold')]",
+              "timeAggregation": "[parameters('timeAggregation')]",
+              "criterionType": "StaticThresholdCriterion"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
+      "apiVersion": "2023-07-01",
+      "name": "[variables('pidDeploymentName')]",
+      "type": "Microsoft.Resources/deployments",
+      "properties": {
+          "mode": "Incremental",
+          "template": {
+              "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+              "contentVersion": "1.0.0.0",
+              "resources": []
+          }
+      }
+    }
+  ]
+}
diff --git a/services/CognitiveServices/accounts/templates/arm/TokenTransaction_287a29bf-097d-4c4a-9ac5-df70a10f6903.json b/services/CognitiveServices/accounts/templates/arm/TokenTransaction_287a29bf-097d-4c4a-9ac5-df70a10f6903.json
new file mode 100644
index 000000000..35f497512
--- /dev/null
+++ b/services/CognitiveServices/accounts/templates/arm/TokenTransaction_287a29bf-097d-4c4a-9ac5-df70a10f6903.json
@@ -0,0 +1,199 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "alertName": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Name of the alert"
+      }
+    },
+    "alertDescription": {
+      "type": "string",
+      "defaultValue": "Number of Inference Tokens Processed on an OpenAI Model",
+      "metadata": {
+        "description": "Description of alert"
+      }
+    },
+    "targetResourceId": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "List of Azure resource Ids seperated by a comma. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name"
+      }
+    },
+    "targetResourceRegion": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure region in which target resources to be monitored are in (without spaces). For example: EastUS"
+      }
+    },
+    "targetResourceType": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Resource type of target resources to be monitored."
+      }
+    },
+    "isEnabled": {
+      "type": "bool",
+      "defaultValue": true,
+      "metadata": {
+        "description": "Specifies whether the alert is enabled"
+      }
+    },
+    "alertSeverity": {
+      "type": "int",
+      "defaultValue": 2,
+      "allowedValues": [
+        0,
+        1,
+        2,
+        3,
+        4
+      ],
+      "metadata": {
+        "description": "Severity of alert {0,1,2,3,4}"
+      }
+    },
+    "operator": {
+      "type": "string",
+      "defaultValue": "GreaterThan",
+      "allowedValues": [
+        "Equals",
+        "GreaterThan",
+        "GreaterThanOrEqual",
+        "LessThan",
+        "LessThanOrEqual"
+      ],
+      "metadata": {
+        "description": "Operator comparing the current value with the threshold value."
+      }
+    },
+    "threshold": {
+      "type": "string",
+      "defaultValue": "180000",
+      "metadata": {
+        "description": "The threshold value at which the alert is activated."
+      }
+    },
+    "timeAggregation": {
+      "type": "string",
+      "defaultValue": "Total",
+      "allowedValues": [
+        "Average",
+        "Minimum",
+        "Maximum",
+        "Total",
+        "Count"
+      ],
+      "metadata": {
+        "description": "How the data that is collected should be combined over time."
+      }
+    },
+    "windowSize": {
+      "type": "string",
+      "defaultValue": "PT5M",
+      "allowedValues": [
+        "PT1M",
+        "PT5M",
+        "PT15M",
+        "PT30M",
+        "PT1H",
+        "PT6H",
+        "PT12H",
+        "PT24H",
+        "PT1D"
+      ],
+      "metadata": {
+        "description": "Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format."
+      }
+    },
+    "evaluationFrequency": {
+      "type": "string",
+      "defaultValue": "PT1M",
+      "allowedValues": [
+        "PT1M",
+        "PT5M",
+        "PT15M",
+        "PT30M",
+        "PT1H"
+      ],
+      "metadata": {
+        "description": "how often the metric alert is evaluated represented in ISO 8601 duration format"
+      }
+    },
+    "currentDateTimeUtcNow": {
+      "type": "string",
+      "defaultValue": "[utcNow()]",
+      "metadata": {
+          "description": "The current date and time using the utcNow function. Used for deployment name uniqueness"
+      }
+    },
+    "telemetryOptOut": {
+      "type": "string",
+      "defaultValue": "No",
+      "allowedValues": [
+          "Yes",
+          "No"
+      ],
+      "metadata": {
+          "description": "The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry."
+      }
+    }
+  },
+  "variables": {
+    "pidDeploymentName": "[take(concat('pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-', uniqueString(resourceGroup().id, parameters('alertName'), parameters('currentDateTimeUtcNow'))), 64)]",
+    "varTargetResourceId": "[split(parameters('targetResourceId'), ',')]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Insights/metricAlerts",
+      "apiVersion": "2018-03-01",
+      "name": "[parameters('alertName')]",
+      "location": "global",
+      "tags": {
+        "_deployed_by_amba": true
+      },
+      "properties": {
+        "description": "[parameters('alertDescription')]",
+        "scopes": "[variables('varTargetResourceId')]",
+        "targetResourceType": "[parameters('targetResourceType')]",
+        "targetResourceRegion": "[parameters('targetResourceRegion')]",
+        "severity": "[parameters('alertSeverity')]",
+        "enabled": "[parameters('isEnabled')]",
+        "evaluationFrequency": "[parameters('evaluationFrequency')]",
+        "windowSize": "[parameters('windowSize')]",
+        "criteria": {
+          "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria",
+          "allOf": [
+            {
+              "name": "1st criterion",
+              "metricName": "TokenTransaction",
+              "dimensions": [],
+              "operator": "[parameters('operator')]",
+              "threshold": "[parameters('threshold')]",
+              "timeAggregation": "[parameters('timeAggregation')]",
+              "criterionType": "StaticThresholdCriterion"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
+      "apiVersion": "2023-07-01",
+      "name": "[variables('pidDeploymentName')]",
+      "type": "Microsoft.Resources/deployments",
+      "properties": {
+          "mode": "Incremental",
+          "template": {
+              "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+              "contentVersion": "1.0.0.0",
+              "resources": []
+          }
+      }
+    }
+  ]
+}
diff --git a/services/Network/loadBalancers/templates/arm/ByteCount_d15179b2-4b57-41e4-997b-dc7c380963d9.json b/services/CognitiveServices/accounts/templates/arm/TotalCalls_07f1ae0a-94f3-41da-b3a6-ca9188e416cb.json
similarity index 96%
rename from services/Network/loadBalancers/templates/arm/ByteCount_d15179b2-4b57-41e4-997b-dc7c380963d9.json
rename to services/CognitiveServices/accounts/templates/arm/TotalCalls_07f1ae0a-94f3-41da-b3a6-ca9188e416cb.json
index c29225301..586203f03 100644
--- a/services/Network/loadBalancers/templates/arm/ByteCount_d15179b2-4b57-41e4-997b-dc7c380963d9.json
+++ b/services/CognitiveServices/accounts/templates/arm/TotalCalls_07f1ae0a-94f3-41da-b3a6-ca9188e416cb.json
@@ -11,7 +11,7 @@
     },
     "alertDescription": {
       "type": "string",
-      "defaultValue": "Total number of bytes passing through load balancer",
+      "defaultValue": "Total number of calls.",
       "metadata": {
         "description": "Description of alert"
       }
@@ -45,7 +45,7 @@
     },
     "alertSeverity": {
       "type": "int",
-      "defaultValue": 1,
+      "defaultValue": 3,
       "allowedValues": [
         0,
         1,
@@ -59,7 +59,7 @@
     },
     "operator": {
       "type": "string",
-      "defaultValue": "",
+      "defaultValue": "GreaterThan",
       "allowedValues": [
         "Equals",
         "GreaterThan",
@@ -73,7 +73,7 @@
     },
     "threshold": {
       "type": "string",
-      "defaultValue": "",
+      "defaultValue": "5000",
       "metadata": {
         "description": "The threshold value at which the alert is activated."
       }
@@ -170,7 +170,7 @@
           "allOf": [
             {
               "name": "1st criterion",
-              "metricName": "Bytecount",
+              "metricName": "TotalCalls",
               "dimensions": [],
               "operator": "[parameters('operator')]",
               "threshold": "[parameters('threshold')]",
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/CognitiveServices/accounts/templates/arm/TotalErrors_e228ad2d-7f9f-4843-88e2-57f6d44c59e9.json b/services/CognitiveServices/accounts/templates/arm/TotalErrors_e228ad2d-7f9f-4843-88e2-57f6d44c59e9.json
new file mode 100644
index 000000000..1b7c06ddd
--- /dev/null
+++ b/services/CognitiveServices/accounts/templates/arm/TotalErrors_e228ad2d-7f9f-4843-88e2-57f6d44c59e9.json
@@ -0,0 +1,199 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "alertName": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Name of the alert"
+      }
+    },
+    "alertDescription": {
+      "type": "string",
+      "defaultValue": "Total number of calls with error response (HTTP response code 4xx or 5xx).",
+      "metadata": {
+        "description": "Description of alert"
+      }
+    },
+    "targetResourceId": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "List of Azure resource Ids seperated by a comma. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name"
+      }
+    },
+    "targetResourceRegion": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure region in which target resources to be monitored are in (without spaces). For example: EastUS"
+      }
+    },
+    "targetResourceType": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Resource type of target resources to be monitored."
+      }
+    },
+    "isEnabled": {
+      "type": "bool",
+      "defaultValue": true,
+      "metadata": {
+        "description": "Specifies whether the alert is enabled"
+      }
+    },
+    "alertSeverity": {
+      "type": "int",
+      "defaultValue": 2,
+      "allowedValues": [
+        0,
+        1,
+        2,
+        3,
+        4
+      ],
+      "metadata": {
+        "description": "Severity of alert {0,1,2,3,4}"
+      }
+    },
+    "operator": {
+      "type": "string",
+      "defaultValue": "GreaterThan",
+      "allowedValues": [
+        "Equals",
+        "GreaterThan",
+        "GreaterThanOrEqual",
+        "LessThan",
+        "LessThanOrEqual"
+      ],
+      "metadata": {
+        "description": "Operator comparing the current value with the threshold value."
+      }
+    },
+    "threshold": {
+      "type": "string",
+      "defaultValue": "5",
+      "metadata": {
+        "description": "The threshold value at which the alert is activated."
+      }
+    },
+    "timeAggregation": {
+      "type": "string",
+      "defaultValue": "Total",
+      "allowedValues": [
+        "Average",
+        "Minimum",
+        "Maximum",
+        "Total",
+        "Count"
+      ],
+      "metadata": {
+        "description": "How the data that is collected should be combined over time."
+      }
+    },
+    "windowSize": {
+      "type": "string",
+      "defaultValue": "PT5M",
+      "allowedValues": [
+        "PT1M",
+        "PT5M",
+        "PT15M",
+        "PT30M",
+        "PT1H",
+        "PT6H",
+        "PT12H",
+        "PT24H",
+        "PT1D"
+      ],
+      "metadata": {
+        "description": "Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format."
+      }
+    },
+    "evaluationFrequency": {
+      "type": "string",
+      "defaultValue": "PT1M",
+      "allowedValues": [
+        "PT1M",
+        "PT5M",
+        "PT15M",
+        "PT30M",
+        "PT1H"
+      ],
+      "metadata": {
+        "description": "how often the metric alert is evaluated represented in ISO 8601 duration format"
+      }
+    },
+    "currentDateTimeUtcNow": {
+      "type": "string",
+      "defaultValue": "[utcNow()]",
+      "metadata": {
+          "description": "The current date and time using the utcNow function. Used for deployment name uniqueness"
+      }
+    },
+    "telemetryOptOut": {
+      "type": "string",
+      "defaultValue": "No",
+      "allowedValues": [
+          "Yes",
+          "No"
+      ],
+      "metadata": {
+          "description": "The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry."
+      }
+    }
+  },
+  "variables": {
+    "pidDeploymentName": "[take(concat('pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-', uniqueString(resourceGroup().id, parameters('alertName'), parameters('currentDateTimeUtcNow'))), 64)]",
+    "varTargetResourceId": "[split(parameters('targetResourceId'), ',')]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Insights/metricAlerts",
+      "apiVersion": "2018-03-01",
+      "name": "[parameters('alertName')]",
+      "location": "global",
+      "tags": {
+        "_deployed_by_amba": true
+      },
+      "properties": {
+        "description": "[parameters('alertDescription')]",
+        "scopes": "[variables('varTargetResourceId')]",
+        "targetResourceType": "[parameters('targetResourceType')]",
+        "targetResourceRegion": "[parameters('targetResourceRegion')]",
+        "severity": "[parameters('alertSeverity')]",
+        "enabled": "[parameters('isEnabled')]",
+        "evaluationFrequency": "[parameters('evaluationFrequency')]",
+        "windowSize": "[parameters('windowSize')]",
+        "criteria": {
+          "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria",
+          "allOf": [
+            {
+              "name": "1st criterion",
+              "metricName": "TotalErrors",
+              "dimensions": [],
+              "operator": "[parameters('operator')]",
+              "threshold": "[parameters('threshold')]",
+              "timeAggregation": "[parameters('timeAggregation')]",
+              "criterionType": "StaticThresholdCriterion"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
+      "apiVersion": "2023-07-01",
+      "name": "[variables('pidDeploymentName')]",
+      "type": "Microsoft.Resources/deployments",
+      "properties": {
+          "mode": "Incremental",
+          "template": {
+              "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+              "contentVersion": "1.0.0.0",
+              "resources": []
+          }
+      }
+    }
+  ]
+}
diff --git a/services/CognitiveServices/accounts/templates/bicep/AzureOpenAIContextTokensCacheMatchRate_81f8369c-65bf-4194-bfd2-ffdfa2470577.bicep b/services/CognitiveServices/accounts/templates/bicep/AzureOpenAIContextTokensCacheMatchRate_81f8369c-65bf-4194-bfd2-ffdfa2470577.bicep
index 393addddd..d44c48f14 100644
--- a/services/CognitiveServices/accounts/templates/bicep/AzureOpenAIContextTokensCacheMatchRate_81f8369c-65bf-4194-bfd2-ffdfa2470577.bicep
+++ b/services/CognitiveServices/accounts/templates/bicep/AzureOpenAIContextTokensCacheMatchRate_81f8369c-65bf-4194-bfd2-ffdfa2470577.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/CognitiveServices/accounts/templates/bicep/AzureOpenAIProvisionedManagedUtilizationV2_693a3b37-1e2a-42d1-aaed-b1f374276d1c.bicep b/services/CognitiveServices/accounts/templates/bicep/AzureOpenAIProvisionedManagedUtilizationV2_693a3b37-1e2a-42d1-aaed-b1f374276d1c.bicep
index c425de20b..158448263 100644
--- a/services/CognitiveServices/accounts/templates/bicep/AzureOpenAIProvisionedManagedUtilizationV2_693a3b37-1e2a-42d1-aaed-b1f374276d1c.bicep
+++ b/services/CognitiveServices/accounts/templates/bicep/AzureOpenAIProvisionedManagedUtilizationV2_693a3b37-1e2a-42d1-aaed-b1f374276d1c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/CognitiveServices/accounts/templates/bicep/AzureOpenAITimeToResponse_995cc12a-1887-4669-92c5-70a6ca8bfe70.bicep b/services/CognitiveServices/accounts/templates/bicep/AzureOpenAITimeToResponse_995cc12a-1887-4669-92c5-70a6ca8bfe70.bicep
index 74758b96b..32b35327a 100644
--- a/services/CognitiveServices/accounts/templates/bicep/AzureOpenAITimeToResponse_995cc12a-1887-4669-92c5-70a6ca8bfe70.bicep
+++ b/services/CognitiveServices/accounts/templates/bicep/AzureOpenAITimeToResponse_995cc12a-1887-4669-92c5-70a6ca8bfe70.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/loadBalancers/templates/bicep/SYNCount_94c90db6-8fd7-460c-b704-c2a429913376.bicep b/services/CognitiveServices/accounts/templates/bicep/BlockedCalls_87fe8679-655d-4acb-a37c-b7faebe26d47.bicep
similarity index 91%
rename from services/Network/loadBalancers/templates/bicep/SYNCount_94c90db6-8fd7-460c-b704-c2a429913376.bicep
rename to services/CognitiveServices/accounts/templates/bicep/BlockedCalls_87fe8679-655d-4acb-a37c-b7faebe26d47.bicep
index aa0d6db2a..8d7c1b1a9 100644
--- a/services/Network/loadBalancers/templates/bicep/SYNCount_94c90db6-8fd7-460c-b704-c2a429913376.bicep
+++ b/services/CognitiveServices/accounts/templates/bicep/BlockedCalls_87fe8679-655d-4acb-a37c-b7faebe26d47.bicep
@@ -3,7 +3,7 @@
 param alertName string
 
 @description('Description of alert')
-param alertDescription string = 'number of syn packet which represent an attempt to establish tcp connection.'
+param alertDescription string = 'Number of calls that exceeded rate or quota limit.'
 
 @description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
 @minLength(1)
@@ -27,7 +27,7 @@ param isEnabled bool = true
   3
   4
 ])
-param alertSeverity int = 1
+param alertSeverity int = 2
 
 @description('Operator comparing the current value with the threshold value.')
 @allowed([
@@ -37,10 +37,10 @@ param alertSeverity int = 1
   'LessThan'
   'LessThanOrEqual'
 ])
-param operator string = ''
+param operator string = 'GreaterThan'
 
 @description('The threshold value at which the alert is activated.')
-param threshold int = 
+param threshold int = 0
 
 @description('How the data that is collected should be combined over time.')
 @allowed([
@@ -106,7 +106,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
       allOf: [
         {
           name: '1st criterion'
-          metricName: 'SYNCount'
+          metricName: 'BlockedCalls'
           dimensions: [[]]
           operator: operator
           threshold: threshold
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/loadBalancers/templates/bicep/ByteCount_d15179b2-4b57-41e4-997b-dc7c380963d9.bicep b/services/CognitiveServices/accounts/templates/bicep/ClientErrors_ec8c928a-5206-4059-8aea-8486004dd30d.bicep
similarity index 91%
rename from services/Network/loadBalancers/templates/bicep/ByteCount_d15179b2-4b57-41e4-997b-dc7c380963d9.bicep
rename to services/CognitiveServices/accounts/templates/bicep/ClientErrors_ec8c928a-5206-4059-8aea-8486004dd30d.bicep
index 8708c4470..827425a78 100644
--- a/services/Network/loadBalancers/templates/bicep/ByteCount_d15179b2-4b57-41e4-997b-dc7c380963d9.bicep
+++ b/services/CognitiveServices/accounts/templates/bicep/ClientErrors_ec8c928a-5206-4059-8aea-8486004dd30d.bicep
@@ -3,7 +3,7 @@
 param alertName string
 
 @description('Description of alert')
-param alertDescription string = 'Total number of bytes passing through load balancer'
+param alertDescription string = 'Number of calls with client side error (HTTP response code 4xx).'
 
 @description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
 @minLength(1)
@@ -37,10 +37,10 @@ param alertSeverity int = 1
   'LessThan'
   'LessThanOrEqual'
 ])
-param operator string = ''
+param operator string = 'GreaterThan'
 
 @description('The threshold value at which the alert is activated.')
-param threshold int = 
+param threshold int = 0
 
 @description('How the data that is collected should be combined over time.')
 @allowed([
@@ -106,7 +106,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
       allOf: [
         {
           name: '1st criterion'
-          metricName: 'Bytecount'
+          metricName: 'ClientErrors'
           dimensions: [[]]
           operator: operator
           threshold: threshold
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/loadBalancers/templates/bicep/AllocatedSnartPorts_5b64d91c-54de-4f8c-a5d6-054967f4ceaf.bicep b/services/CognitiveServices/accounts/templates/bicep/Latency_d76ab40a-2831-4fa2-b476-5fdcda3d7c4c.bicep
similarity index 91%
rename from services/Network/loadBalancers/templates/bicep/AllocatedSnartPorts_5b64d91c-54de-4f8c-a5d6-054967f4ceaf.bicep
rename to services/CognitiveServices/accounts/templates/bicep/Latency_d76ab40a-2831-4fa2-b476-5fdcda3d7c4c.bicep
index af803b806..ebd869ee5 100644
--- a/services/Network/loadBalancers/templates/bicep/AllocatedSnartPorts_5b64d91c-54de-4f8c-a5d6-054967f4ceaf.bicep
+++ b/services/CognitiveServices/accounts/templates/bicep/Latency_d76ab40a-2831-4fa2-b476-5fdcda3d7c4c.bicep
@@ -3,7 +3,7 @@
 param alertName string
 
 @description('Description of alert')
-param alertDescription string = 'total number of port allocated for SNAT'
+param alertDescription string = 'Latency in milliseconds.'
 
 @description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
 @minLength(1)
@@ -27,7 +27,7 @@ param isEnabled bool = true
   3
   4
 ])
-param alertSeverity int = 1
+param alertSeverity int = 2
 
 @description('Operator comparing the current value with the threshold value.')
 @allowed([
@@ -37,10 +37,10 @@ param alertSeverity int = 1
   'LessThan'
   'LessThanOrEqual'
 ])
-param operator string = ''
+param operator string = 'GreaterThan'
 
 @description('The threshold value at which the alert is activated.')
-param threshold int = 
+param threshold int = 90
 
 @description('How the data that is collected should be combined over time.')
 @allowed([
@@ -106,7 +106,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
       allOf: [
         {
           name: '1st criterion'
-          metricName: 'AllocatedSnartPorts'
+          metricName: 'Latency'
           dimensions: [[]]
           operator: operator
           threshold: threshold
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/CognitiveServices/accounts/templates/bicep/ServerErrors_3c550d9c-8276-4a61-b0cf-ef437a55e299.bicep b/services/CognitiveServices/accounts/templates/bicep/ServerErrors_3c550d9c-8276-4a61-b0cf-ef437a55e299.bicep
new file mode 100644
index 000000000..48af9c833
--- /dev/null
+++ b/services/CognitiveServices/accounts/templates/bicep/ServerErrors_3c550d9c-8276-4a61-b0cf-ef437a55e299.bicep
@@ -0,0 +1,135 @@
+@description('Name of the alert')
+@minLength(1)
+param alertName string
+
+@description('Description of alert')
+param alertDescription string = 'Number of calls with service internal error (HTTP response code 5xx).'
+
+@description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
+@minLength(1)
+param targetResourceId array
+
+@description('Azure region in which target resources to be monitored are in (without spaces). For example: EastUS')
+param targetResourceRegion string
+
+@description('Resource type of target resources to be monitored.')
+@minLength(1)
+param targetResourceType string
+
+@description('Specifies whether the alert is enabled')
+param isEnabled bool = true
+
+@description('Severity of alert {0,1,2,3,4}')
+@allowed([
+  0
+  1
+  2
+  3
+  4
+])
+param alertSeverity int = 3
+
+@description('Operator comparing the current value with the threshold value.')
+@allowed([
+  'Equals'
+  'GreaterThan'
+  'GreaterThanOrEqual'
+  'LessThan'
+  'LessThanOrEqual'
+])
+param operator string = 'GreaterThan'
+
+@description('The threshold value at which the alert is activated.')
+param threshold int = 0
+
+@description('How the data that is collected should be combined over time.')
+@allowed([
+  'Average'
+  'Minimum'
+  'Maximum'
+  'Total'
+  'Count'
+])
+param timeAggregation string = 'Total'
+
+@description('Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format.')
+@allowed([
+  'PT1M'
+  'PT5M'
+  'PT15M'
+  'PT30M'
+  'PT1H'
+  'PT6H'
+  'PT12H'
+  'PT24H'
+  'P1D'
+])
+param windowSize string = 'PT5M'
+
+@description('how often the metric alert is evaluated represented in ISO 8601 duration format')
+@allowed([
+  'PT1M'
+  'PT5M'
+  'PT15M'
+  'PT30M'
+  'PT1H'
+])
+param evaluationFrequency string = 'PT1M'
+
+@description('"The current date and time using the utcNow function. Used for deployment name uniqueness')
+param currentDateTimeUtcNow string = utcNow()
+
+@description('The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry.')
+@allowed([
+  'Yes'
+  'No'
+])
+param telemetryOptOut string = 'No'
+
+resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
+  name: alertName
+  location: 'global'
+  tags: {
+    _deployed_by_amba: 'true'
+  }
+  properties: {
+    description: alertDescription
+    scopes: targetResourceId
+    targetResourceType: targetResourceType
+    targetResourceRegion: targetResourceRegion
+    severity: alertSeverity
+    enabled: isEnabled
+    evaluationFrequency: evaluationFrequency
+    windowSize: windowSize
+    criteria: {
+      'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria'
+      allOf: [
+        {
+          name: '1st criterion'
+          metricName: 'ServerErrors'
+          dimensions: [[]]
+          operator: operator
+          threshold: threshold
+          timeAggregation: timeAggregation
+          criterionType: 'StaticThresholdCriterion'
+        }
+      ]
+    }
+  }
+}
+
+var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
+  name: ambaTelemetryPidName
+  tags: {
+    _deployed_by_amba: 'true'
+  }
+  properties: {
+    mode: 'Incremental'
+    template: {
+      '$schema': 'https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#'
+      contentVersion: '1.0.0.0'
+      resources: []
+    }
+  }
+}
diff --git a/services/CognitiveServices/accounts/templates/bicep/SuccessRate_80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.bicep b/services/CognitiveServices/accounts/templates/bicep/SuccessRate_80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.bicep
new file mode 100644
index 000000000..78d94fff7
--- /dev/null
+++ b/services/CognitiveServices/accounts/templates/bicep/SuccessRate_80f3c9ae-7da9-462f-ab44-2ff80d27c8f1.bicep
@@ -0,0 +1,135 @@
+@description('Name of the alert')
+@minLength(1)
+param alertName string
+
+@description('Description of alert')
+param alertDescription string = 'Availability percentage with the following calculation: (Total Calls - Server Errors)/Total Calls. Server Errors include any HTTP responses >=500.'
+
+@description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
+@minLength(1)
+param targetResourceId array
+
+@description('Azure region in which target resources to be monitored are in (without spaces). For example: EastUS')
+param targetResourceRegion string
+
+@description('Resource type of target resources to be monitored.')
+@minLength(1)
+param targetResourceType string
+
+@description('Specifies whether the alert is enabled')
+param isEnabled bool = true
+
+@description('Severity of alert {0,1,2,3,4}')
+@allowed([
+  0
+  1
+  2
+  3
+  4
+])
+param alertSeverity int = 3
+
+@description('Operator comparing the current value with the threshold value.')
+@allowed([
+  'Equals'
+  'GreaterThan'
+  'GreaterThanOrEqual'
+  'LessThan'
+  'LessThanOrEqual'
+])
+param operator string = 'LessThan'
+
+@description('The threshold value at which the alert is activated.')
+param threshold int = 100
+
+@description('How the data that is collected should be combined over time.')
+@allowed([
+  'Average'
+  'Minimum'
+  'Maximum'
+  'Total'
+  'Count'
+])
+param timeAggregation string = 'Average'
+
+@description('Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format.')
+@allowed([
+  'PT1M'
+  'PT5M'
+  'PT15M'
+  'PT30M'
+  'PT1H'
+  'PT6H'
+  'PT12H'
+  'PT24H'
+  'P1D'
+])
+param windowSize string = 'PT5M'
+
+@description('how often the metric alert is evaluated represented in ISO 8601 duration format')
+@allowed([
+  'PT1M'
+  'PT5M'
+  'PT15M'
+  'PT30M'
+  'PT1H'
+])
+param evaluationFrequency string = 'PT1M'
+
+@description('"The current date and time using the utcNow function. Used for deployment name uniqueness')
+param currentDateTimeUtcNow string = utcNow()
+
+@description('The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry.')
+@allowed([
+  'Yes'
+  'No'
+])
+param telemetryOptOut string = 'No'
+
+resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
+  name: alertName
+  location: 'global'
+  tags: {
+    _deployed_by_amba: 'true'
+  }
+  properties: {
+    description: alertDescription
+    scopes: targetResourceId
+    targetResourceType: targetResourceType
+    targetResourceRegion: targetResourceRegion
+    severity: alertSeverity
+    enabled: isEnabled
+    evaluationFrequency: evaluationFrequency
+    windowSize: windowSize
+    criteria: {
+      'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria'
+      allOf: [
+        {
+          name: '1st criterion'
+          metricName: 'SuccessRate'
+          dimensions: [[]]
+          operator: operator
+          threshold: threshold
+          timeAggregation: timeAggregation
+          criterionType: 'StaticThresholdCriterion'
+        }
+      ]
+    }
+  }
+}
+
+var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
+  name: ambaTelemetryPidName
+  tags: {
+    _deployed_by_amba: 'true'
+  }
+  properties: {
+    mode: 'Incremental'
+    template: {
+      '$schema': 'https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#'
+      contentVersion: '1.0.0.0'
+      resources: []
+    }
+  }
+}
diff --git a/services/CognitiveServices/accounts/templates/bicep/TokenTransaction_287a29bf-097d-4c4a-9ac5-df70a10f6903.bicep b/services/CognitiveServices/accounts/templates/bicep/TokenTransaction_287a29bf-097d-4c4a-9ac5-df70a10f6903.bicep
new file mode 100644
index 000000000..00727cc3f
--- /dev/null
+++ b/services/CognitiveServices/accounts/templates/bicep/TokenTransaction_287a29bf-097d-4c4a-9ac5-df70a10f6903.bicep
@@ -0,0 +1,135 @@
+@description('Name of the alert')
+@minLength(1)
+param alertName string
+
+@description('Description of alert')
+param alertDescription string = 'Number of Inference Tokens Processed on an OpenAI Model'
+
+@description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
+@minLength(1)
+param targetResourceId array
+
+@description('Azure region in which target resources to be monitored are in (without spaces). For example: EastUS')
+param targetResourceRegion string
+
+@description('Resource type of target resources to be monitored.')
+@minLength(1)
+param targetResourceType string
+
+@description('Specifies whether the alert is enabled')
+param isEnabled bool = true
+
+@description('Severity of alert {0,1,2,3,4}')
+@allowed([
+  0
+  1
+  2
+  3
+  4
+])
+param alertSeverity int = 2
+
+@description('Operator comparing the current value with the threshold value.')
+@allowed([
+  'Equals'
+  'GreaterThan'
+  'GreaterThanOrEqual'
+  'LessThan'
+  'LessThanOrEqual'
+])
+param operator string = 'GreaterThan'
+
+@description('The threshold value at which the alert is activated.')
+param threshold int = 180000
+
+@description('How the data that is collected should be combined over time.')
+@allowed([
+  'Average'
+  'Minimum'
+  'Maximum'
+  'Total'
+  'Count'
+])
+param timeAggregation string = 'Total'
+
+@description('Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format.')
+@allowed([
+  'PT1M'
+  'PT5M'
+  'PT15M'
+  'PT30M'
+  'PT1H'
+  'PT6H'
+  'PT12H'
+  'PT24H'
+  'P1D'
+])
+param windowSize string = 'PT5M'
+
+@description('how often the metric alert is evaluated represented in ISO 8601 duration format')
+@allowed([
+  'PT1M'
+  'PT5M'
+  'PT15M'
+  'PT30M'
+  'PT1H'
+])
+param evaluationFrequency string = 'PT1M'
+
+@description('"The current date and time using the utcNow function. Used for deployment name uniqueness')
+param currentDateTimeUtcNow string = utcNow()
+
+@description('The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry.')
+@allowed([
+  'Yes'
+  'No'
+])
+param telemetryOptOut string = 'No'
+
+resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
+  name: alertName
+  location: 'global'
+  tags: {
+    _deployed_by_amba: 'true'
+  }
+  properties: {
+    description: alertDescription
+    scopes: targetResourceId
+    targetResourceType: targetResourceType
+    targetResourceRegion: targetResourceRegion
+    severity: alertSeverity
+    enabled: isEnabled
+    evaluationFrequency: evaluationFrequency
+    windowSize: windowSize
+    criteria: {
+      'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria'
+      allOf: [
+        {
+          name: '1st criterion'
+          metricName: 'TokenTransaction'
+          dimensions: [[]]
+          operator: operator
+          threshold: threshold
+          timeAggregation: timeAggregation
+          criterionType: 'StaticThresholdCriterion'
+        }
+      ]
+    }
+  }
+}
+
+var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
+  name: ambaTelemetryPidName
+  tags: {
+    _deployed_by_amba: 'true'
+  }
+  properties: {
+    mode: 'Incremental'
+    template: {
+      '$schema': 'https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#'
+      contentVersion: '1.0.0.0'
+      resources: []
+    }
+  }
+}
diff --git a/services/Network/loadBalancers/templates/bicep/PacketCount_d766dc3e-42cc-42a7-ba4f-3c1d7fa295c5.bicep b/services/CognitiveServices/accounts/templates/bicep/TotalCalls_07f1ae0a-94f3-41da-b3a6-ca9188e416cb.bicep
similarity index 91%
rename from services/Network/loadBalancers/templates/bicep/PacketCount_d766dc3e-42cc-42a7-ba4f-3c1d7fa295c5.bicep
rename to services/CognitiveServices/accounts/templates/bicep/TotalCalls_07f1ae0a-94f3-41da-b3a6-ca9188e416cb.bicep
index c5954623a..933c838ed 100644
--- a/services/Network/loadBalancers/templates/bicep/PacketCount_d766dc3e-42cc-42a7-ba4f-3c1d7fa295c5.bicep
+++ b/services/CognitiveServices/accounts/templates/bicep/TotalCalls_07f1ae0a-94f3-41da-b3a6-ca9188e416cb.bicep
@@ -3,7 +3,7 @@
 param alertName string
 
 @description('Description of alert')
-param alertDescription string = 'total number of packet passing through load balancer'
+param alertDescription string = 'Total number of calls.'
 
 @description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
 @minLength(1)
@@ -27,7 +27,7 @@ param isEnabled bool = true
   3
   4
 ])
-param alertSeverity int = 1
+param alertSeverity int = 3
 
 @description('Operator comparing the current value with the threshold value.')
 @allowed([
@@ -37,10 +37,10 @@ param alertSeverity int = 1
   'LessThan'
   'LessThanOrEqual'
 ])
-param operator string = ''
+param operator string = 'GreaterThan'
 
 @description('The threshold value at which the alert is activated.')
-param threshold int = 
+param threshold int = 5000
 
 @description('How the data that is collected should be combined over time.')
 @allowed([
@@ -106,7 +106,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
       allOf: [
         {
           name: '1st criterion'
-          metricName: 'PacketCount'
+          metricName: 'TotalCalls'
           dimensions: [[]]
           operator: operator
           threshold: threshold
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/CognitiveServices/accounts/templates/bicep/TotalErrors_e228ad2d-7f9f-4843-88e2-57f6d44c59e9.bicep b/services/CognitiveServices/accounts/templates/bicep/TotalErrors_e228ad2d-7f9f-4843-88e2-57f6d44c59e9.bicep
new file mode 100644
index 000000000..dbdaa3705
--- /dev/null
+++ b/services/CognitiveServices/accounts/templates/bicep/TotalErrors_e228ad2d-7f9f-4843-88e2-57f6d44c59e9.bicep
@@ -0,0 +1,135 @@
+@description('Name of the alert')
+@minLength(1)
+param alertName string
+
+@description('Description of alert')
+param alertDescription string = 'Total number of calls with error response (HTTP response code 4xx or 5xx).'
+
+@description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
+@minLength(1)
+param targetResourceId array
+
+@description('Azure region in which target resources to be monitored are in (without spaces). For example: EastUS')
+param targetResourceRegion string
+
+@description('Resource type of target resources to be monitored.')
+@minLength(1)
+param targetResourceType string
+
+@description('Specifies whether the alert is enabled')
+param isEnabled bool = true
+
+@description('Severity of alert {0,1,2,3,4}')
+@allowed([
+  0
+  1
+  2
+  3
+  4
+])
+param alertSeverity int = 2
+
+@description('Operator comparing the current value with the threshold value.')
+@allowed([
+  'Equals'
+  'GreaterThan'
+  'GreaterThanOrEqual'
+  'LessThan'
+  'LessThanOrEqual'
+])
+param operator string = 'GreaterThan'
+
+@description('The threshold value at which the alert is activated.')
+param threshold int = 5
+
+@description('How the data that is collected should be combined over time.')
+@allowed([
+  'Average'
+  'Minimum'
+  'Maximum'
+  'Total'
+  'Count'
+])
+param timeAggregation string = 'Total'
+
+@description('Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format.')
+@allowed([
+  'PT1M'
+  'PT5M'
+  'PT15M'
+  'PT30M'
+  'PT1H'
+  'PT6H'
+  'PT12H'
+  'PT24H'
+  'P1D'
+])
+param windowSize string = 'PT5M'
+
+@description('how often the metric alert is evaluated represented in ISO 8601 duration format')
+@allowed([
+  'PT1M'
+  'PT5M'
+  'PT15M'
+  'PT30M'
+  'PT1H'
+])
+param evaluationFrequency string = 'PT1M'
+
+@description('"The current date and time using the utcNow function. Used for deployment name uniqueness')
+param currentDateTimeUtcNow string = utcNow()
+
+@description('The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry.')
+@allowed([
+  'Yes'
+  'No'
+])
+param telemetryOptOut string = 'No'
+
+resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
+  name: alertName
+  location: 'global'
+  tags: {
+    _deployed_by_amba: 'true'
+  }
+  properties: {
+    description: alertDescription
+    scopes: targetResourceId
+    targetResourceType: targetResourceType
+    targetResourceRegion: targetResourceRegion
+    severity: alertSeverity
+    enabled: isEnabled
+    evaluationFrequency: evaluationFrequency
+    windowSize: windowSize
+    criteria: {
+      'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria'
+      allOf: [
+        {
+          name: '1st criterion'
+          metricName: 'TotalErrors'
+          dimensions: [[]]
+          operator: operator
+          threshold: threshold
+          timeAggregation: timeAggregation
+          criterionType: 'StaticThresholdCriterion'
+        }
+      ]
+    }
+  }
+}
+
+var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
+  name: ambaTelemetryPidName
+  tags: {
+    _deployed_by_amba: 'true'
+  }
+  properties: {
+    mode: 'Incremental'
+    template: {
+      '$schema': 'https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#'
+      contentVersion: '1.0.0.0'
+      resources: []
+    }
+  }
+}
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/AvailableMemoryBytes_d9089d09-ddec-4f6a-8dc1-e2544e5765cb.json b/services/Compute/virtualMachineScaleSets/templates/arm/AvailableMemoryBytes_d9089d09-ddec-4f6a-8dc1-e2544e5765cb.json
index de27c3f30..caa4e47e7 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/AvailableMemoryBytes_d9089d09-ddec-4f6a-8dc1-e2544e5765cb.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/AvailableMemoryBytes_d9089d09-ddec-4f6a-8dc1-e2544e5765cb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/DataDiskIOPSConsumedPercentage_a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.json b/services/Compute/virtualMachineScaleSets/templates/arm/DataDiskIOPSConsumedPercentage_a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.json
index 1ae1eca7e..d29220096 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/DataDiskIOPSConsumedPercentage_a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/DataDiskIOPSConsumedPercentage_a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/DiskReadOperationsSec_ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.json b/services/Compute/virtualMachineScaleSets/templates/arm/DiskReadOperationsSec_ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.json
index fc2d75709..ae155c602 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/DiskReadOperationsSec_ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/DiskReadOperationsSec_ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/DiskWriteOperationsSec_dce1cda8-1dab-4941-b607-1d5d449709d5.json b/services/Compute/virtualMachineScaleSets/templates/arm/DiskWriteOperationsSec_dce1cda8-1dab-4941-b607-1d5d449709d5.json
index 03ea02c44..f7c07351a 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/DiskWriteOperationsSec_dce1cda8-1dab-4941-b607-1d5d449709d5.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/DiskWriteOperationsSec_dce1cda8-1dab-4941-b607-1d5d449709d5.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/InboundFlows_86991e6e-efc9-4898-adf8-4e8e3a60c57e.json b/services/Compute/virtualMachineScaleSets/templates/arm/InboundFlows_86991e6e-efc9-4898-adf8-4e8e3a60c57e.json
index 935ca2eee..84a387ccb 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/InboundFlows_86991e6e-efc9-4898-adf8-4e8e3a60c57e.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/InboundFlows_86991e6e-efc9-4898-adf8-4e8e3a60c57e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/NetworkInTotal_f0e94112-5509-47b6-8def-91fb5ca5d0cd.json b/services/Compute/virtualMachineScaleSets/templates/arm/NetworkInTotal_f0e94112-5509-47b6-8def-91fb5ca5d0cd.json
index afb774db9..801b854d8 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/NetworkInTotal_f0e94112-5509-47b6-8def-91fb5ca5d0cd.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/NetworkInTotal_f0e94112-5509-47b6-8def-91fb5ca5d0cd.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/NetworkIn_87dfe717-217f-4447-b59a-7ea39160b83a.json b/services/Compute/virtualMachineScaleSets/templates/arm/NetworkIn_87dfe717-217f-4447-b59a-7ea39160b83a.json
index 7ead520a1..ece2d0cf2 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/NetworkIn_87dfe717-217f-4447-b59a-7ea39160b83a.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/NetworkIn_87dfe717-217f-4447-b59a-7ea39160b83a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/NetworkOutTotal_98de2aed-3493-4e65-919b-b1f8e6995819.json b/services/Compute/virtualMachineScaleSets/templates/arm/NetworkOutTotal_98de2aed-3493-4e65-919b-b1f8e6995819.json
index 6db0c0511..1f4ddcbbb 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/NetworkOutTotal_98de2aed-3493-4e65-919b-b1f8e6995819.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/NetworkOutTotal_98de2aed-3493-4e65-919b-b1f8e6995819.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/OSDiskIOPSConsumedPercentage_55dc79f4-5666-420f-8c53-141d73e01fee.json b/services/Compute/virtualMachineScaleSets/templates/arm/OSDiskIOPSConsumedPercentage_55dc79f4-5666-420f-8c53-141d73e01fee.json
index 184f32dac..e95281f48 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/OSDiskIOPSConsumedPercentage_55dc79f4-5666-420f-8c53-141d73e01fee.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/OSDiskIOPSConsumedPercentage_55dc79f4-5666-420f-8c53-141d73e01fee.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/OutboundFlows_d336cfa2-724e-419a-809d-c716741d5279.json b/services/Compute/virtualMachineScaleSets/templates/arm/OutboundFlows_d336cfa2-724e-419a-809d-c716741d5279.json
index 20a010862..b8248c021 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/OutboundFlows_d336cfa2-724e-419a-809d-c716741d5279.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/OutboundFlows_d336cfa2-724e-419a-809d-c716741d5279.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/PercentageCPU_310c2a27-8933-434e-a366-cb35831cde44.json b/services/Compute/virtualMachineScaleSets/templates/arm/PercentageCPU_310c2a27-8933-434e-a366-cb35831cde44.json
index 1e06a7381..9ee61b399 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/PercentageCPU_310c2a27-8933-434e-a366-cb35831cde44.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/PercentageCPU_310c2a27-8933-434e-a366-cb35831cde44.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/arm/VmAvailabilityMetric_6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.json b/services/Compute/virtualMachineScaleSets/templates/arm/VmAvailabilityMetric_6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.json
index b13cadae9..4ffd44839 100644
--- a/services/Compute/virtualMachineScaleSets/templates/arm/VmAvailabilityMetric_6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.json
+++ b/services/Compute/virtualMachineScaleSets/templates/arm/VmAvailabilityMetric_6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/AvailableMemoryBytes_d9089d09-ddec-4f6a-8dc1-e2544e5765cb.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/AvailableMemoryBytes_d9089d09-ddec-4f6a-8dc1-e2544e5765cb.bicep
index 1505cb214..afada6362 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/AvailableMemoryBytes_d9089d09-ddec-4f6a-8dc1-e2544e5765cb.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/AvailableMemoryBytes_d9089d09-ddec-4f6a-8dc1-e2544e5765cb.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/DataDiskIOPSConsumedPercentage_a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/DataDiskIOPSConsumedPercentage_a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.bicep
index d8e90b32e..61f54c865 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/DataDiskIOPSConsumedPercentage_a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/DataDiskIOPSConsumedPercentage_a8c08a0f-fcd7-4b97-8a6e-06b34bac0b9f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/DiskReadOperationsSec_ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/DiskReadOperationsSec_ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.bicep
index 8437165fc..b635c8cf3 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/DiskReadOperationsSec_ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/DiskReadOperationsSec_ea8be16a-f5e9-4a8b-a1df-a8c5efff039b.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/DiskWriteOperationsSec_dce1cda8-1dab-4941-b607-1d5d449709d5.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/DiskWriteOperationsSec_dce1cda8-1dab-4941-b607-1d5d449709d5.bicep
index 886a66205..2cd955039 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/DiskWriteOperationsSec_dce1cda8-1dab-4941-b607-1d5d449709d5.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/DiskWriteOperationsSec_dce1cda8-1dab-4941-b607-1d5d449709d5.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/InboundFlows_86991e6e-efc9-4898-adf8-4e8e3a60c57e.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/InboundFlows_86991e6e-efc9-4898-adf8-4e8e3a60c57e.bicep
index 4a8a29c06..4bd99c55a 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/InboundFlows_86991e6e-efc9-4898-adf8-4e8e3a60c57e.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/InboundFlows_86991e6e-efc9-4898-adf8-4e8e3a60c57e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkInTotal_f0e94112-5509-47b6-8def-91fb5ca5d0cd.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkInTotal_f0e94112-5509-47b6-8def-91fb5ca5d0cd.bicep
index 3a64e570c..0d6da4b7a 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkInTotal_f0e94112-5509-47b6-8def-91fb5ca5d0cd.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkInTotal_f0e94112-5509-47b6-8def-91fb5ca5d0cd.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkIn_87dfe717-217f-4447-b59a-7ea39160b83a.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkIn_87dfe717-217f-4447-b59a-7ea39160b83a.bicep
index 1ce1f2e60..117e42767 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkIn_87dfe717-217f-4447-b59a-7ea39160b83a.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkIn_87dfe717-217f-4447-b59a-7ea39160b83a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkOutTotal_98de2aed-3493-4e65-919b-b1f8e6995819.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkOutTotal_98de2aed-3493-4e65-919b-b1f8e6995819.bicep
index 641ba5791..eb48f4acb 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkOutTotal_98de2aed-3493-4e65-919b-b1f8e6995819.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/NetworkOutTotal_98de2aed-3493-4e65-919b-b1f8e6995819.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/OSDiskIOPSConsumedPercentage_55dc79f4-5666-420f-8c53-141d73e01fee.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/OSDiskIOPSConsumedPercentage_55dc79f4-5666-420f-8c53-141d73e01fee.bicep
index 987675ae5..7898d5b72 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/OSDiskIOPSConsumedPercentage_55dc79f4-5666-420f-8c53-141d73e01fee.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/OSDiskIOPSConsumedPercentage_55dc79f4-5666-420f-8c53-141d73e01fee.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/OutboundFlows_d336cfa2-724e-419a-809d-c716741d5279.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/OutboundFlows_d336cfa2-724e-419a-809d-c716741d5279.bicep
index 0d346fc06..915db92bc 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/OutboundFlows_d336cfa2-724e-419a-809d-c716741d5279.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/OutboundFlows_d336cfa2-724e-419a-809d-c716741d5279.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/PercentageCPU_310c2a27-8933-434e-a366-cb35831cde44.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/PercentageCPU_310c2a27-8933-434e-a366-cb35831cde44.bicep
index 8d024cd43..a9a8d23e1 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/PercentageCPU_310c2a27-8933-434e-a366-cb35831cde44.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/PercentageCPU_310c2a27-8933-434e-a366-cb35831cde44.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachineScaleSets/templates/bicep/VmAvailabilityMetric_6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.bicep b/services/Compute/virtualMachineScaleSets/templates/bicep/VmAvailabilityMetric_6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.bicep
index 549415f82..4a856d446 100644
--- a/services/Compute/virtualMachineScaleSets/templates/bicep/VmAvailabilityMetric_6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.bicep
+++ b/services/Compute/virtualMachineScaleSets/templates/bicep/VmAvailabilityMetric_6cf11f1e-273a-4f42-bf9b-9310b26c1c4f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/arm/AvailableMemoryBytes_bf1e0006-6089-4f92-a115-fc83aa0fbdd5.json b/services/Compute/virtualMachines/templates/arm/AvailableMemoryBytes_bf1e0006-6089-4f92-a115-fc83aa0fbdd5.json
index 4b3a7ced7..542b35c91 100644
--- a/services/Compute/virtualMachines/templates/arm/AvailableMemoryBytes_bf1e0006-6089-4f92-a115-fc83aa0fbdd5.json
+++ b/services/Compute/virtualMachines/templates/arm/AvailableMemoryBytes_bf1e0006-6089-4f92-a115-fc83aa0fbdd5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/AvailableMemoryPercentage_69912da3-8d8d-4d57-884a-97c2bdd03bdd.json b/services/Compute/virtualMachines/templates/arm/AvailableMemoryPercentage_69912da3-8d8d-4d57-884a-97c2bdd03bdd.json
index b7595b42c..2ed94bfa7 100644
--- a/services/Compute/virtualMachines/templates/arm/AvailableMemoryPercentage_69912da3-8d8d-4d57-884a-97c2bdd03bdd.json
+++ b/services/Compute/virtualMachines/templates/arm/AvailableMemoryPercentage_69912da3-8d8d-4d57-884a-97c2bdd03bdd.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/CPUCreditsConsumed_a407ae10-6263-449c-81b9-172760d6dc6d.json b/services/Compute/virtualMachines/templates/arm/CPUCreditsConsumed_a407ae10-6263-449c-81b9-172760d6dc6d.json
index 9b4d742ab..9f2a54b1a 100644
--- a/services/Compute/virtualMachines/templates/arm/CPUCreditsConsumed_a407ae10-6263-449c-81b9-172760d6dc6d.json
+++ b/services/Compute/virtualMachines/templates/arm/CPUCreditsConsumed_a407ae10-6263-449c-81b9-172760d6dc6d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/CPUCreditsRemaining_821888a1-6490-4a2d-8850-bdc45057a853.json b/services/Compute/virtualMachines/templates/arm/CPUCreditsRemaining_821888a1-6490-4a2d-8850-bdc45057a853.json
index ba2c51b1f..68e898328 100644
--- a/services/Compute/virtualMachines/templates/arm/CPUCreditsRemaining_821888a1-6490-4a2d-8850-bdc45057a853.json
+++ b/services/Compute/virtualMachines/templates/arm/CPUCreditsRemaining_821888a1-6490-4a2d-8850-bdc45057a853.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskBandwidthConsumedPercentage_b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.json b/services/Compute/virtualMachines/templates/arm/DataDiskBandwidthConsumedPercentage_b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.json
index c0a0c9bb1..b5005f268 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskBandwidthConsumedPercentage_b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskBandwidthConsumedPercentage_b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskFreeSpacePercentage_5dbf3a3d-7f08-4deb-a153-129c3485da84.json b/services/Compute/virtualMachines/templates/arm/DataDiskFreeSpacePercentage_5dbf3a3d-7f08-4deb-a153-129c3485da84.json
index 5269ea9e1..764df167c 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskFreeSpacePercentage_5dbf3a3d-7f08-4deb-a153-129c3485da84.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskFreeSpacePercentage_5dbf3a3d-7f08-4deb-a153-129c3485da84.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskIOPSConsumedPercentage_b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.json b/services/Compute/virtualMachines/templates/arm/DataDiskIOPSConsumedPercentage_b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.json
index cbcbc9f49..714095cd4 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskIOPSConsumedPercentage_b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskIOPSConsumedPercentage_b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskMaxBurstIOPS_9b0f41af-1c52-4890-a23a-3bfebfee1154.json b/services/Compute/virtualMachines/templates/arm/DataDiskMaxBurstIOPS_9b0f41af-1c52-4890-a23a-3bfebfee1154.json
index f003e9889..6b25a6f8e 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskMaxBurstIOPS_9b0f41af-1c52-4890-a23a-3bfebfee1154.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskMaxBurstIOPS_9b0f41af-1c52-4890-a23a-3bfebfee1154.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskQueueDepth_040bc9c3-da5c-4fd0-b160-979ce89364ae.json b/services/Compute/virtualMachines/templates/arm/DataDiskQueueDepth_040bc9c3-da5c-4fd0-b160-979ce89364ae.json
index 193bfef45..9730904cc 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskQueueDepth_040bc9c3-da5c-4fd0-b160-979ce89364ae.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskQueueDepth_040bc9c3-da5c-4fd0-b160-979ce89364ae.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.json b/services/Compute/virtualMachines/templates/arm/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.json
index a26bf11cf..76e44f565 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskReadOperationsSec_3c5518ea-9a0f-44ff-b197-47b3d6db060b.json b/services/Compute/virtualMachines/templates/arm/DataDiskReadOperationsSec_3c5518ea-9a0f-44ff-b197-47b3d6db060b.json
index c0138ef95..c21073163 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskReadOperationsSec_3c5518ea-9a0f-44ff-b197-47b3d6db060b.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskReadOperationsSec_3c5518ea-9a0f-44ff-b197-47b3d6db060b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskWriteBytessec_e45d685d-14c4-4422-8096-6f11d628fb20.json b/services/Compute/virtualMachines/templates/arm/DataDiskWriteBytessec_e45d685d-14c4-4422-8096-6f11d628fb20.json
index 62f857291..21f96b5db 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskWriteBytessec_e45d685d-14c4-4422-8096-6f11d628fb20.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskWriteBytessec_e45d685d-14c4-4422-8096-6f11d628fb20.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.json b/services/Compute/virtualMachines/templates/arm/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.json
index ed6ee255b..52b04bc3a 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskWriteOperationsSec_326b359d-e0a2-4055-8e1f-f9c5f9df5599.json b/services/Compute/virtualMachines/templates/arm/DataDiskWriteOperationsSec_326b359d-e0a2-4055-8e1f-f9c5f9df5599.json
index be585785e..0a2501b6a 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskWriteOperationsSec_326b359d-e0a2-4055-8e1f-f9c5f9df5599.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskWriteOperationsSec_326b359d-e0a2-4055-8e1f-f9c5f9df5599.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DiskReadBytes_b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.json b/services/Compute/virtualMachines/templates/arm/DiskReadBytes_b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.json
index adb94865f..3988ad23b 100644
--- a/services/Compute/virtualMachines/templates/arm/DiskReadBytes_b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.json
+++ b/services/Compute/virtualMachines/templates/arm/DiskReadBytes_b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DiskReadOperationsSec_8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.json b/services/Compute/virtualMachines/templates/arm/DiskReadOperationsSec_8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.json
index d487e080a..6c78fc930 100644
--- a/services/Compute/virtualMachines/templates/arm/DiskReadOperationsSec_8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.json
+++ b/services/Compute/virtualMachines/templates/arm/DiskReadOperationsSec_8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DiskWriteBytes_b1cc650c-24fe-4f9e-a2ec-5757816526c0.json b/services/Compute/virtualMachines/templates/arm/DiskWriteBytes_b1cc650c-24fe-4f9e-a2ec-5757816526c0.json
index 09c762f02..6440fbfdc 100644
--- a/services/Compute/virtualMachines/templates/arm/DiskWriteBytes_b1cc650c-24fe-4f9e-a2ec-5757816526c0.json
+++ b/services/Compute/virtualMachines/templates/arm/DiskWriteBytes_b1cc650c-24fe-4f9e-a2ec-5757816526c0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/DiskWriteOperationsSec_edff41cb-d9b8-46ba-ba39-42747c1a4c4b.json b/services/Compute/virtualMachines/templates/arm/DiskWriteOperationsSec_edff41cb-d9b8-46ba-ba39-42747c1a4c4b.json
index 2ec99daf8..449aa05de 100644
--- a/services/Compute/virtualMachines/templates/arm/DiskWriteOperationsSec_edff41cb-d9b8-46ba-ba39-42747c1a4c4b.json
+++ b/services/Compute/virtualMachines/templates/arm/DiskWriteOperationsSec_edff41cb-d9b8-46ba-ba39-42747c1a4c4b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/Heartbeat_b3a5f580-77a6-4161-9a1e-7370ce783e67.json b/services/Compute/virtualMachines/templates/arm/Heartbeat_b3a5f580-77a6-4161-9a1e-7370ce783e67.json
index 788598e9c..48d910e90 100644
--- a/services/Compute/virtualMachines/templates/arm/Heartbeat_b3a5f580-77a6-4161-9a1e-7370ce783e67.json
+++ b/services/Compute/virtualMachines/templates/arm/Heartbeat_b3a5f580-77a6-4161-9a1e-7370ce783e67.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/InboundFlows_6de4e570-4270-4e9b-949e-5680b061e7fd.json b/services/Compute/virtualMachines/templates/arm/InboundFlows_6de4e570-4270-4e9b-949e-5680b061e7fd.json
index 935ca2eee..84a387ccb 100644
--- a/services/Compute/virtualMachines/templates/arm/InboundFlows_6de4e570-4270-4e9b-949e-5680b061e7fd.json
+++ b/services/Compute/virtualMachines/templates/arm/InboundFlows_6de4e570-4270-4e9b-949e-5680b061e7fd.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/NetworkInTotal_ea4501a3-1e77-4df1-ab61-3ee28ae529eb.json b/services/Compute/virtualMachines/templates/arm/NetworkInTotal_ea4501a3-1e77-4df1-ab61-3ee28ae529eb.json
index a7260735c..633ceec0c 100644
--- a/services/Compute/virtualMachines/templates/arm/NetworkInTotal_ea4501a3-1e77-4df1-ab61-3ee28ae529eb.json
+++ b/services/Compute/virtualMachines/templates/arm/NetworkInTotal_ea4501a3-1e77-4df1-ab61-3ee28ae529eb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/NetworkOutTotal_e2028144-b142-445c-b544-3bb438537c8f.json b/services/Compute/virtualMachines/templates/arm/NetworkOutTotal_e2028144-b142-445c-b544-3bb438537c8f.json
index f6c168d6a..51b837ab6 100644
--- a/services/Compute/virtualMachines/templates/arm/NetworkOutTotal_e2028144-b142-445c-b544-3bb438537c8f.json
+++ b/services/Compute/virtualMachines/templates/arm/NetworkOutTotal_e2028144-b142-445c-b544-3bb438537c8f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/NetworkReadbytessec_b565e73f-71c8-4bb3-a792-903b67775497.json b/services/Compute/virtualMachines/templates/arm/NetworkReadbytessec_b565e73f-71c8-4bb3-a792-903b67775497.json
index 68ae6797e..c9c15c1e5 100644
--- a/services/Compute/virtualMachines/templates/arm/NetworkReadbytessec_b565e73f-71c8-4bb3-a792-903b67775497.json
+++ b/services/Compute/virtualMachines/templates/arm/NetworkReadbytessec_b565e73f-71c8-4bb3-a792-903b67775497.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/NetworkWritebytessec_552ca1f1-d69d-4bc2-b044-19f81b225fd4.json b/services/Compute/virtualMachines/templates/arm/NetworkWritebytessec_552ca1f1-d69d-4bc2-b044-19f81b225fd4.json
index 7d86b09b0..e7a6c4515 100644
--- a/services/Compute/virtualMachines/templates/arm/NetworkWritebytessec_552ca1f1-d69d-4bc2-b044-19f81b225fd4.json
+++ b/services/Compute/virtualMachines/templates/arm/NetworkWritebytessec_552ca1f1-d69d-4bc2-b044-19f81b225fd4.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskBandwidthConsumedPercentage_f7e19635-0118-4040-83d5-2f4c2150aef1.json b/services/Compute/virtualMachines/templates/arm/OSDiskBandwidthConsumedPercentage_f7e19635-0118-4040-83d5-2f4c2150aef1.json
index 11b42c682..70569b636 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskBandwidthConsumedPercentage_f7e19635-0118-4040-83d5-2f4c2150aef1.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskBandwidthConsumedPercentage_f7e19635-0118-4040-83d5-2f4c2150aef1.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.json b/services/Compute/virtualMachines/templates/arm/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.json
index 212e11fb7..aab8633e0 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskIOPSConsumedPercentage_a2bf3c43-d327-473b-9204-f77e2a0fe398.json b/services/Compute/virtualMachines/templates/arm/OSDiskIOPSConsumedPercentage_a2bf3c43-d327-473b-9204-f77e2a0fe398.json
index a9a39613f..7633032da 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskIOPSConsumedPercentage_a2bf3c43-d327-473b-9204-f77e2a0fe398.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskIOPSConsumedPercentage_a2bf3c43-d327-473b-9204-f77e2a0fe398.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskMaxBurstIOPS_916dc60b-b2d2-4708-9fa4-6a36b244f499.json b/services/Compute/virtualMachines/templates/arm/OSDiskMaxBurstIOPS_916dc60b-b2d2-4708-9fa4-6a36b244f499.json
index 6ba361bf3..7eadb0d9b 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskMaxBurstIOPS_916dc60b-b2d2-4708-9fa4-6a36b244f499.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskMaxBurstIOPS_916dc60b-b2d2-4708-9fa4-6a36b244f499.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskQueueDepth_36262245-4c8a-4143-9ab4-68e9c23ae19a.json b/services/Compute/virtualMachines/templates/arm/OSDiskQueueDepth_36262245-4c8a-4143-9ab4-68e9c23ae19a.json
index 26e00e231..177aab8c3 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskQueueDepth_36262245-4c8a-4143-9ab4-68e9c23ae19a.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskQueueDepth_36262245-4c8a-4143-9ab4-68e9c23ae19a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.json b/services/Compute/virtualMachines/templates/arm/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.json
index ff71914be..1994f48b1 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskWriteBytessec_929b095e-5ea1-48b4-bf4e-bfc1a941a908.json b/services/Compute/virtualMachines/templates/arm/OSDiskWriteBytessec_929b095e-5ea1-48b4-bf4e-bfc1a941a908.json
index 1d1b5de21..b2def8e49 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskWriteBytessec_929b095e-5ea1-48b4-bf4e-bfc1a941a908.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskWriteBytessec_929b095e-5ea1-48b4-bf4e-bfc1a941a908.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.json b/services/Compute/virtualMachines/templates/arm/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.json
index 16126afa7..a1945bae4 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskWriteOperationsSec_3be4037a-c692-402d-843d-b3fe43053edf.json b/services/Compute/virtualMachines/templates/arm/OSDiskWriteOperationsSec_3be4037a-c692-402d-843d-b3fe43053edf.json
index 4213eac4e..706d648c0 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskWriteOperationsSec_3be4037a-c692-402d-843d-b3fe43053edf.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskWriteOperationsSec_3be4037a-c692-402d-843d-b3fe43053edf.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/OutboundFlows_a477bf96-4b0f-471c-b5d3-0acdb59612e6.json b/services/Compute/virtualMachines/templates/arm/OutboundFlows_a477bf96-4b0f-471c-b5d3-0acdb59612e6.json
index 20a010862..b8248c021 100644
--- a/services/Compute/virtualMachines/templates/arm/OutboundFlows_a477bf96-4b0f-471c-b5d3-0acdb59612e6.json
+++ b/services/Compute/virtualMachines/templates/arm/OutboundFlows_a477bf96-4b0f-471c-b5d3-0acdb59612e6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/PercentageCPU_a9bac9fd-2382-4ce1-b68b-8898caf45038.json b/services/Compute/virtualMachines/templates/arm/PercentageCPU_a9bac9fd-2382-4ce1-b68b-8898caf45038.json
index a90ff5d7a..dd1f256c6 100644
--- a/services/Compute/virtualMachines/templates/arm/PercentageCPU_a9bac9fd-2382-4ce1-b68b-8898caf45038.json
+++ b/services/Compute/virtualMachines/templates/arm/PercentageCPU_a9bac9fd-2382-4ce1-b68b-8898caf45038.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/ProcessorUtilizationPercentage_56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.json b/services/Compute/virtualMachines/templates/arm/ProcessorUtilizationPercentage_56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.json
index e467eb2c3..b67021cc1 100644
--- a/services/Compute/virtualMachines/templates/arm/ProcessorUtilizationPercentage_56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.json
+++ b/services/Compute/virtualMachines/templates/arm/ProcessorUtilizationPercentage_56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/VMCachedBandwidthConsumedPercentage_eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.json b/services/Compute/virtualMachines/templates/arm/VMCachedBandwidthConsumedPercentage_eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.json
index 6fc03afe4..d1f759dd3 100644
--- a/services/Compute/virtualMachines/templates/arm/VMCachedBandwidthConsumedPercentage_eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.json
+++ b/services/Compute/virtualMachines/templates/arm/VMCachedBandwidthConsumedPercentage_eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/VMCachedIOPSConsumedPercentage_c878115f-2a89-446e-8980-ef4f152120c5.json b/services/Compute/virtualMachines/templates/arm/VMCachedIOPSConsumedPercentage_c878115f-2a89-446e-8980-ef4f152120c5.json
index 791cb34c7..86ef0f0f5 100644
--- a/services/Compute/virtualMachines/templates/arm/VMCachedIOPSConsumedPercentage_c878115f-2a89-446e-8980-ef4f152120c5.json
+++ b/services/Compute/virtualMachines/templates/arm/VMCachedIOPSConsumedPercentage_c878115f-2a89-446e-8980-ef4f152120c5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/VMUncachedBandwidthConsumedPercentage_e3981e7b-fd8b-4e07-bb68-d598c020c12d.json b/services/Compute/virtualMachines/templates/arm/VMUncachedBandwidthConsumedPercentage_e3981e7b-fd8b-4e07-bb68-d598c020c12d.json
index b8db6f677..45df9386f 100644
--- a/services/Compute/virtualMachines/templates/arm/VMUncachedBandwidthConsumedPercentage_e3981e7b-fd8b-4e07-bb68-d598c020c12d.json
+++ b/services/Compute/virtualMachines/templates/arm/VMUncachedBandwidthConsumedPercentage_e3981e7b-fd8b-4e07-bb68-d598c020c12d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/VMUncachedIOPSConsumedPercentage_765ceb5b-ec1d-44d7-b94d-bb139030df81.json b/services/Compute/virtualMachines/templates/arm/VMUncachedIOPSConsumedPercentage_765ceb5b-ec1d-44d7-b94d-bb139030df81.json
index 41ff451bc..bae3ba386 100644
--- a/services/Compute/virtualMachines/templates/arm/VMUncachedIOPSConsumedPercentage_765ceb5b-ec1d-44d7-b94d-bb139030df81.json
+++ b/services/Compute/virtualMachines/templates/arm/VMUncachedIOPSConsumedPercentage_765ceb5b-ec1d-44d7-b94d-bb139030df81.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/arm/VmAvailabilityMetric_3fa5376a-705a-48e4-b314-6282a74c9f7c.json b/services/Compute/virtualMachines/templates/arm/VmAvailabilityMetric_3fa5376a-705a-48e4-b314-6282a74c9f7c.json
index b433d54f1..8ea1167f7 100644
--- a/services/Compute/virtualMachines/templates/arm/VmAvailabilityMetric_3fa5376a-705a-48e4-b314-6282a74c9f7c.json
+++ b/services/Compute/virtualMachines/templates/arm/VmAvailabilityMetric_3fa5376a-705a-48e4-b314-6282a74c9f7c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Compute/virtualMachines/templates/bicep/AvailableMemoryBytes_bf1e0006-6089-4f92-a115-fc83aa0fbdd5.bicep b/services/Compute/virtualMachines/templates/bicep/AvailableMemoryBytes_bf1e0006-6089-4f92-a115-fc83aa0fbdd5.bicep
index 85bf09148..839882712 100644
--- a/services/Compute/virtualMachines/templates/bicep/AvailableMemoryBytes_bf1e0006-6089-4f92-a115-fc83aa0fbdd5.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/AvailableMemoryBytes_bf1e0006-6089-4f92-a115-fc83aa0fbdd5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/AvailableMemoryPercentage_69912da3-8d8d-4d57-884a-97c2bdd03bdd.bicep b/services/Compute/virtualMachines/templates/bicep/AvailableMemoryPercentage_69912da3-8d8d-4d57-884a-97c2bdd03bdd.bicep
index eea463bf2..1e533d14b 100644
--- a/services/Compute/virtualMachines/templates/bicep/AvailableMemoryPercentage_69912da3-8d8d-4d57-884a-97c2bdd03bdd.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/AvailableMemoryPercentage_69912da3-8d8d-4d57-884a-97c2bdd03bdd.bicep
@@ -157,7 +157,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/CPUCreditsConsumed_a407ae10-6263-449c-81b9-172760d6dc6d.bicep b/services/Compute/virtualMachines/templates/bicep/CPUCreditsConsumed_a407ae10-6263-449c-81b9-172760d6dc6d.bicep
index 1fbe60a77..cd84bf80b 100644
--- a/services/Compute/virtualMachines/templates/bicep/CPUCreditsConsumed_a407ae10-6263-449c-81b9-172760d6dc6d.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/CPUCreditsConsumed_a407ae10-6263-449c-81b9-172760d6dc6d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/CPUCreditsRemaining_821888a1-6490-4a2d-8850-bdc45057a853.bicep b/services/Compute/virtualMachines/templates/bicep/CPUCreditsRemaining_821888a1-6490-4a2d-8850-bdc45057a853.bicep
index 640211704..54c4f796f 100644
--- a/services/Compute/virtualMachines/templates/bicep/CPUCreditsRemaining_821888a1-6490-4a2d-8850-bdc45057a853.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/CPUCreditsRemaining_821888a1-6490-4a2d-8850-bdc45057a853.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskBandwidthConsumedPercentage_b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskBandwidthConsumedPercentage_b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.bicep
index e15ff9297..462624cc9 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskBandwidthConsumedPercentage_b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskBandwidthConsumedPercentage_b57b0749-f851-4c3d-b7fb-7cf26f3bf16a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskFreeSpacePercentage_5dbf3a3d-7f08-4deb-a153-129c3485da84.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskFreeSpacePercentage_5dbf3a3d-7f08-4deb-a153-129c3485da84.bicep
index df6806016..479a8678e 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskFreeSpacePercentage_5dbf3a3d-7f08-4deb-a153-129c3485da84.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskFreeSpacePercentage_5dbf3a3d-7f08-4deb-a153-129c3485da84.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskIOPSConsumedPercentage_b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskIOPSConsumedPercentage_b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.bicep
index 229d6a198..354e4ecca 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskIOPSConsumedPercentage_b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskIOPSConsumedPercentage_b0cbb9f8-cc67-4e7d-95a8-5a058c6de7e0.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskMaxBurstIOPS_9b0f41af-1c52-4890-a23a-3bfebfee1154.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskMaxBurstIOPS_9b0f41af-1c52-4890-a23a-3bfebfee1154.bicep
index 3ea158408..958efdc16 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskMaxBurstIOPS_9b0f41af-1c52-4890-a23a-3bfebfee1154.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskMaxBurstIOPS_9b0f41af-1c52-4890-a23a-3bfebfee1154.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskQueueDepth_040bc9c3-da5c-4fd0-b160-979ce89364ae.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskQueueDepth_040bc9c3-da5c-4fd0-b160-979ce89364ae.bicep
index 8319e57c6..34adc35c7 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskQueueDepth_040bc9c3-da5c-4fd0-b160-979ce89364ae.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskQueueDepth_040bc9c3-da5c-4fd0-b160-979ce89364ae.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.bicep
index e7665f494..2c288e5bf 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskReadOperationsSec_3c5518ea-9a0f-44ff-b197-47b3d6db060b.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskReadOperationsSec_3c5518ea-9a0f-44ff-b197-47b3d6db060b.bicep
index 65ab67959..ce2d10745 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskReadOperationsSec_3c5518ea-9a0f-44ff-b197-47b3d6db060b.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskReadOperationsSec_3c5518ea-9a0f-44ff-b197-47b3d6db060b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskWriteBytessec_e45d685d-14c4-4422-8096-6f11d628fb20.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskWriteBytessec_e45d685d-14c4-4422-8096-6f11d628fb20.bicep
index 77b307729..3bca1e46d 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskWriteBytessec_e45d685d-14c4-4422-8096-6f11d628fb20.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskWriteBytessec_e45d685d-14c4-4422-8096-6f11d628fb20.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.bicep
index 5e732ee39..db7a96ef8 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskWriteOperationsSec_326b359d-e0a2-4055-8e1f-f9c5f9df5599.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskWriteOperationsSec_326b359d-e0a2-4055-8e1f-f9c5f9df5599.bicep
index b838f6148..7cc0d44a1 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskWriteOperationsSec_326b359d-e0a2-4055-8e1f-f9c5f9df5599.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskWriteOperationsSec_326b359d-e0a2-4055-8e1f-f9c5f9df5599.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DiskReadBytes_b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.bicep b/services/Compute/virtualMachines/templates/bicep/DiskReadBytes_b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.bicep
index 9e2382c08..088096e04 100644
--- a/services/Compute/virtualMachines/templates/bicep/DiskReadBytes_b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DiskReadBytes_b9221998-f2bb-4ae8-b2c8-f9c4750e06f7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DiskReadOperationsSec_8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.bicep b/services/Compute/virtualMachines/templates/bicep/DiskReadOperationsSec_8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.bicep
index 5d552a3fc..f6e30dff7 100644
--- a/services/Compute/virtualMachines/templates/bicep/DiskReadOperationsSec_8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DiskReadOperationsSec_8bc489c0-d2f7-43c1-9bb7-478c9503fb2e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DiskWriteBytes_b1cc650c-24fe-4f9e-a2ec-5757816526c0.bicep b/services/Compute/virtualMachines/templates/bicep/DiskWriteBytes_b1cc650c-24fe-4f9e-a2ec-5757816526c0.bicep
index 139e8c0f7..224a4f2c7 100644
--- a/services/Compute/virtualMachines/templates/bicep/DiskWriteBytes_b1cc650c-24fe-4f9e-a2ec-5757816526c0.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DiskWriteBytes_b1cc650c-24fe-4f9e-a2ec-5757816526c0.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/DiskWriteOperationsSec_edff41cb-d9b8-46ba-ba39-42747c1a4c4b.bicep b/services/Compute/virtualMachines/templates/bicep/DiskWriteOperationsSec_edff41cb-d9b8-46ba-ba39-42747c1a4c4b.bicep
index 9e4f98b0c..4d3eb7782 100644
--- a/services/Compute/virtualMachines/templates/bicep/DiskWriteOperationsSec_edff41cb-d9b8-46ba-ba39-42747c1a4c4b.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DiskWriteOperationsSec_edff41cb-d9b8-46ba-ba39-42747c1a4c4b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/Heartbeat_b3a5f580-77a6-4161-9a1e-7370ce783e67.bicep b/services/Compute/virtualMachines/templates/bicep/Heartbeat_b3a5f580-77a6-4161-9a1e-7370ce783e67.bicep
index 64df0a63a..1d1b2a951 100644
--- a/services/Compute/virtualMachines/templates/bicep/Heartbeat_b3a5f580-77a6-4161-9a1e-7370ce783e67.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/Heartbeat_b3a5f580-77a6-4161-9a1e-7370ce783e67.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/InboundFlows_6de4e570-4270-4e9b-949e-5680b061e7fd.bicep b/services/Compute/virtualMachines/templates/bicep/InboundFlows_6de4e570-4270-4e9b-949e-5680b061e7fd.bicep
index 4a8a29c06..4bd99c55a 100644
--- a/services/Compute/virtualMachines/templates/bicep/InboundFlows_6de4e570-4270-4e9b-949e-5680b061e7fd.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/InboundFlows_6de4e570-4270-4e9b-949e-5680b061e7fd.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/NetworkInTotal_ea4501a3-1e77-4df1-ab61-3ee28ae529eb.bicep b/services/Compute/virtualMachines/templates/bicep/NetworkInTotal_ea4501a3-1e77-4df1-ab61-3ee28ae529eb.bicep
index ba4db5db6..5d6c99bbc 100644
--- a/services/Compute/virtualMachines/templates/bicep/NetworkInTotal_ea4501a3-1e77-4df1-ab61-3ee28ae529eb.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/NetworkInTotal_ea4501a3-1e77-4df1-ab61-3ee28ae529eb.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/NetworkOutTotal_e2028144-b142-445c-b544-3bb438537c8f.bicep b/services/Compute/virtualMachines/templates/bicep/NetworkOutTotal_e2028144-b142-445c-b544-3bb438537c8f.bicep
index 1f5af94a7..e7d21b085 100644
--- a/services/Compute/virtualMachines/templates/bicep/NetworkOutTotal_e2028144-b142-445c-b544-3bb438537c8f.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/NetworkOutTotal_e2028144-b142-445c-b544-3bb438537c8f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/NetworkReadbytessec_b565e73f-71c8-4bb3-a792-903b67775497.bicep b/services/Compute/virtualMachines/templates/bicep/NetworkReadbytessec_b565e73f-71c8-4bb3-a792-903b67775497.bicep
index 00074b25f..c66dfdab4 100644
--- a/services/Compute/virtualMachines/templates/bicep/NetworkReadbytessec_b565e73f-71c8-4bb3-a792-903b67775497.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/NetworkReadbytessec_b565e73f-71c8-4bb3-a792-903b67775497.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/NetworkWritebytessec_552ca1f1-d69d-4bc2-b044-19f81b225fd4.bicep b/services/Compute/virtualMachines/templates/bicep/NetworkWritebytessec_552ca1f1-d69d-4bc2-b044-19f81b225fd4.bicep
index 6fd5d1e9b..a234bb69f 100644
--- a/services/Compute/virtualMachines/templates/bicep/NetworkWritebytessec_552ca1f1-d69d-4bc2-b044-19f81b225fd4.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/NetworkWritebytessec_552ca1f1-d69d-4bc2-b044-19f81b225fd4.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskBandwidthConsumedPercentage_f7e19635-0118-4040-83d5-2f4c2150aef1.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskBandwidthConsumedPercentage_f7e19635-0118-4040-83d5-2f4c2150aef1.bicep
index 8dcf25dc8..0be400b47 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskBandwidthConsumedPercentage_f7e19635-0118-4040-83d5-2f4c2150aef1.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskBandwidthConsumedPercentage_f7e19635-0118-4040-83d5-2f4c2150aef1.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.bicep
index 13e60d976..5877a1477 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskIOPSConsumedPercentage_a2bf3c43-d327-473b-9204-f77e2a0fe398.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskIOPSConsumedPercentage_a2bf3c43-d327-473b-9204-f77e2a0fe398.bicep
index 764d504ad..f95fe6d5a 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskIOPSConsumedPercentage_a2bf3c43-d327-473b-9204-f77e2a0fe398.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskIOPSConsumedPercentage_a2bf3c43-d327-473b-9204-f77e2a0fe398.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskMaxBurstIOPS_916dc60b-b2d2-4708-9fa4-6a36b244f499.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskMaxBurstIOPS_916dc60b-b2d2-4708-9fa4-6a36b244f499.bicep
index 8907d2e24..c127f506c 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskMaxBurstIOPS_916dc60b-b2d2-4708-9fa4-6a36b244f499.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskMaxBurstIOPS_916dc60b-b2d2-4708-9fa4-6a36b244f499.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskQueueDepth_36262245-4c8a-4143-9ab4-68e9c23ae19a.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskQueueDepth_36262245-4c8a-4143-9ab4-68e9c23ae19a.bicep
index f598cbb9b..3a5323335 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskQueueDepth_36262245-4c8a-4143-9ab4-68e9c23ae19a.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskQueueDepth_36262245-4c8a-4143-9ab4-68e9c23ae19a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.bicep
index 949a4619b..6b939f2ad 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskWriteBytessec_929b095e-5ea1-48b4-bf4e-bfc1a941a908.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskWriteBytessec_929b095e-5ea1-48b4-bf4e-bfc1a941a908.bicep
index a02975443..bb1c3f55e 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskWriteBytessec_929b095e-5ea1-48b4-bf4e-bfc1a941a908.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskWriteBytessec_929b095e-5ea1-48b4-bf4e-bfc1a941a908.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.bicep
index 4ea7f5fd2..a8294494b 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskWriteOperationsSec_3be4037a-c692-402d-843d-b3fe43053edf.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskWriteOperationsSec_3be4037a-c692-402d-843d-b3fe43053edf.bicep
index 9c882ece5..c348957b5 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskWriteOperationsSec_3be4037a-c692-402d-843d-b3fe43053edf.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskWriteOperationsSec_3be4037a-c692-402d-843d-b3fe43053edf.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/OutboundFlows_a477bf96-4b0f-471c-b5d3-0acdb59612e6.bicep b/services/Compute/virtualMachines/templates/bicep/OutboundFlows_a477bf96-4b0f-471c-b5d3-0acdb59612e6.bicep
index 0d346fc06..915db92bc 100644
--- a/services/Compute/virtualMachines/templates/bicep/OutboundFlows_a477bf96-4b0f-471c-b5d3-0acdb59612e6.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OutboundFlows_a477bf96-4b0f-471c-b5d3-0acdb59612e6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/PercentageCPU_a9bac9fd-2382-4ce1-b68b-8898caf45038.bicep b/services/Compute/virtualMachines/templates/bicep/PercentageCPU_a9bac9fd-2382-4ce1-b68b-8898caf45038.bicep
index d57625f22..b59d0086e 100644
--- a/services/Compute/virtualMachines/templates/bicep/PercentageCPU_a9bac9fd-2382-4ce1-b68b-8898caf45038.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/PercentageCPU_a9bac9fd-2382-4ce1-b68b-8898caf45038.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/ProcessorUtilizationPercentage_56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.bicep b/services/Compute/virtualMachines/templates/bicep/ProcessorUtilizationPercentage_56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.bicep
index c61bd1912..ff0581f28 100644
--- a/services/Compute/virtualMachines/templates/bicep/ProcessorUtilizationPercentage_56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/ProcessorUtilizationPercentage_56d57b79-b7c3-4a17-a96b-3fc7152d9c5c.bicep
@@ -157,7 +157,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/VMCachedBandwidthConsumedPercentage_eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.bicep b/services/Compute/virtualMachines/templates/bicep/VMCachedBandwidthConsumedPercentage_eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.bicep
index cd5b9d747..65c9ac0d4 100644
--- a/services/Compute/virtualMachines/templates/bicep/VMCachedBandwidthConsumedPercentage_eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/VMCachedBandwidthConsumedPercentage_eb85f15b-b705-418f-b8ed-93d8cc7a9a6c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/VMCachedIOPSConsumedPercentage_c878115f-2a89-446e-8980-ef4f152120c5.bicep b/services/Compute/virtualMachines/templates/bicep/VMCachedIOPSConsumedPercentage_c878115f-2a89-446e-8980-ef4f152120c5.bicep
index ce11b1ac3..3c30d1b26 100644
--- a/services/Compute/virtualMachines/templates/bicep/VMCachedIOPSConsumedPercentage_c878115f-2a89-446e-8980-ef4f152120c5.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/VMCachedIOPSConsumedPercentage_c878115f-2a89-446e-8980-ef4f152120c5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/VMUncachedBandwidthConsumedPercentage_e3981e7b-fd8b-4e07-bb68-d598c020c12d.bicep b/services/Compute/virtualMachines/templates/bicep/VMUncachedBandwidthConsumedPercentage_e3981e7b-fd8b-4e07-bb68-d598c020c12d.bicep
index b163843a5..e04dcb0f1 100644
--- a/services/Compute/virtualMachines/templates/bicep/VMUncachedBandwidthConsumedPercentage_e3981e7b-fd8b-4e07-bb68-d598c020c12d.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/VMUncachedBandwidthConsumedPercentage_e3981e7b-fd8b-4e07-bb68-d598c020c12d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/VMUncachedIOPSConsumedPercentage_765ceb5b-ec1d-44d7-b94d-bb139030df81.bicep b/services/Compute/virtualMachines/templates/bicep/VMUncachedIOPSConsumedPercentage_765ceb5b-ec1d-44d7-b94d-bb139030df81.bicep
index 0115276f3..a7d837a22 100644
--- a/services/Compute/virtualMachines/templates/bicep/VMUncachedIOPSConsumedPercentage_765ceb5b-ec1d-44d7-b94d-bb139030df81.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/VMUncachedIOPSConsumedPercentage_765ceb5b-ec1d-44d7-b94d-bb139030df81.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Compute/virtualMachines/templates/bicep/VmAvailabilityMetric_3fa5376a-705a-48e4-b314-6282a74c9f7c.bicep b/services/Compute/virtualMachines/templates/bicep/VmAvailabilityMetric_3fa5376a-705a-48e4-b314-6282a74c9f7c.bicep
index f67cf7e88..3d585dc21 100644
--- a/services/Compute/virtualMachines/templates/bicep/VmAvailabilityMetric_3fa5376a-705a-48e4-b314-6282a74c9f7c.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/VmAvailabilityMetric_3fa5376a-705a-48e4-b314-6282a74c9f7c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerInstance/containerGroups/templates/arm/CpuUsage_970af9d6-9212-420d-af7b-4fbd790a2596.json b/services/ContainerInstance/containerGroups/templates/arm/CpuUsage_970af9d6-9212-420d-af7b-4fbd790a2596.json
index 11d7bdf82..1064cd941 100644
--- a/services/ContainerInstance/containerGroups/templates/arm/CpuUsage_970af9d6-9212-420d-af7b-4fbd790a2596.json
+++ b/services/ContainerInstance/containerGroups/templates/arm/CpuUsage_970af9d6-9212-420d-af7b-4fbd790a2596.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerInstance/containerGroups/templates/arm/MemoryUsage_4758386e-12ee-411a-9e49-445b5c5c3051.json b/services/ContainerInstance/containerGroups/templates/arm/MemoryUsage_4758386e-12ee-411a-9e49-445b5c5c3051.json
index 431874cd9..ffbadeae8 100644
--- a/services/ContainerInstance/containerGroups/templates/arm/MemoryUsage_4758386e-12ee-411a-9e49-445b5c5c3051.json
+++ b/services/ContainerInstance/containerGroups/templates/arm/MemoryUsage_4758386e-12ee-411a-9e49-445b5c5c3051.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerInstance/containerGroups/templates/arm/NetworkBytesReceivedPerSecond_8beff742-9cd8-43ed-9680-57ae35bee6e8.json b/services/ContainerInstance/containerGroups/templates/arm/NetworkBytesReceivedPerSecond_8beff742-9cd8-43ed-9680-57ae35bee6e8.json
index 7f7c28ecd..9dbb3fcc5 100644
--- a/services/ContainerInstance/containerGroups/templates/arm/NetworkBytesReceivedPerSecond_8beff742-9cd8-43ed-9680-57ae35bee6e8.json
+++ b/services/ContainerInstance/containerGroups/templates/arm/NetworkBytesReceivedPerSecond_8beff742-9cd8-43ed-9680-57ae35bee6e8.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerInstance/containerGroups/templates/arm/NetworkBytesTransmittedPerSecond_5b26b965-2662-4a89-9d7e-771486357f39.json b/services/ContainerInstance/containerGroups/templates/arm/NetworkBytesTransmittedPerSecond_5b26b965-2662-4a89-9d7e-771486357f39.json
index 995ce0e99..2ef213b31 100644
--- a/services/ContainerInstance/containerGroups/templates/arm/NetworkBytesTransmittedPerSecond_5b26b965-2662-4a89-9d7e-771486357f39.json
+++ b/services/ContainerInstance/containerGroups/templates/arm/NetworkBytesTransmittedPerSecond_5b26b965-2662-4a89-9d7e-771486357f39.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerInstance/containerGroups/templates/bicep/CpuUsage_970af9d6-9212-420d-af7b-4fbd790a2596.bicep b/services/ContainerInstance/containerGroups/templates/bicep/CpuUsage_970af9d6-9212-420d-af7b-4fbd790a2596.bicep
index 1e9d595ec..7dba01118 100644
--- a/services/ContainerInstance/containerGroups/templates/bicep/CpuUsage_970af9d6-9212-420d-af7b-4fbd790a2596.bicep
+++ b/services/ContainerInstance/containerGroups/templates/bicep/CpuUsage_970af9d6-9212-420d-af7b-4fbd790a2596.bicep
@@ -136,7 +136,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerInstance/containerGroups/templates/bicep/MemoryUsage_4758386e-12ee-411a-9e49-445b5c5c3051.bicep b/services/ContainerInstance/containerGroups/templates/bicep/MemoryUsage_4758386e-12ee-411a-9e49-445b5c5c3051.bicep
index 4b02975cf..7b734dbb0 100644
--- a/services/ContainerInstance/containerGroups/templates/bicep/MemoryUsage_4758386e-12ee-411a-9e49-445b5c5c3051.bicep
+++ b/services/ContainerInstance/containerGroups/templates/bicep/MemoryUsage_4758386e-12ee-411a-9e49-445b5c5c3051.bicep
@@ -136,7 +136,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerInstance/containerGroups/templates/bicep/NetworkBytesReceivedPerSecond_8beff742-9cd8-43ed-9680-57ae35bee6e8.bicep b/services/ContainerInstance/containerGroups/templates/bicep/NetworkBytesReceivedPerSecond_8beff742-9cd8-43ed-9680-57ae35bee6e8.bicep
index 9b2c62289..4c141f343 100644
--- a/services/ContainerInstance/containerGroups/templates/bicep/NetworkBytesReceivedPerSecond_8beff742-9cd8-43ed-9680-57ae35bee6e8.bicep
+++ b/services/ContainerInstance/containerGroups/templates/bicep/NetworkBytesReceivedPerSecond_8beff742-9cd8-43ed-9680-57ae35bee6e8.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerInstance/containerGroups/templates/bicep/NetworkBytesTransmittedPerSecond_5b26b965-2662-4a89-9d7e-771486357f39.bicep b/services/ContainerInstance/containerGroups/templates/bicep/NetworkBytesTransmittedPerSecond_5b26b965-2662-4a89-9d7e-771486357f39.bicep
index 546ea0ab9..2853238f0 100644
--- a/services/ContainerInstance/containerGroups/templates/bicep/NetworkBytesTransmittedPerSecond_5b26b965-2662-4a89-9d7e-771486357f39.bicep
+++ b/services/ContainerInstance/containerGroups/templates/bicep/NetworkBytesTransmittedPerSecond_5b26b965-2662-4a89-9d7e-771486357f39.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerRegistry/registries/templates/arm/StorageUsed_fa9efde4-3586-4595-a442-b7e97f70fe91.json b/services/ContainerRegistry/registries/templates/arm/StorageUsed_fa9efde4-3586-4595-a442-b7e97f70fe91.json
index 48229bba0..6df080e4c 100644
--- a/services/ContainerRegistry/registries/templates/arm/StorageUsed_fa9efde4-3586-4595-a442-b7e97f70fe91.json
+++ b/services/ContainerRegistry/registries/templates/arm/StorageUsed_fa9efde4-3586-4595-a442-b7e97f70fe91.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerRegistry/registries/templates/arm/StorageUsedforStandardPricingPlan_42995506-5bd2-4687-9316-d9399919990b.json b/services/ContainerRegistry/registries/templates/arm/StorageUsedforStandardPricingPlan_42995506-5bd2-4687-9316-d9399919990b.json
index 34e0dee7c..40563e756 100644
--- a/services/ContainerRegistry/registries/templates/arm/StorageUsedforStandardPricingPlan_42995506-5bd2-4687-9316-d9399919990b.json
+++ b/services/ContainerRegistry/registries/templates/arm/StorageUsedforStandardPricingPlan_42995506-5bd2-4687-9316-d9399919990b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerRegistry/registries/templates/arm/SuccessfulPullCount_b8c8a846-a8d0-4e8f-b854-030955a20135.json b/services/ContainerRegistry/registries/templates/arm/SuccessfulPullCount_b8c8a846-a8d0-4e8f-b854-030955a20135.json
index de3e916ec..ea8569ef8 100644
--- a/services/ContainerRegistry/registries/templates/arm/SuccessfulPullCount_b8c8a846-a8d0-4e8f-b854-030955a20135.json
+++ b/services/ContainerRegistry/registries/templates/arm/SuccessfulPullCount_b8c8a846-a8d0-4e8f-b854-030955a20135.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerRegistry/registries/templates/arm/SuccessfulPushCount_9dca87c2-de00-40fd-b0bb-c8335e5f978a.json b/services/ContainerRegistry/registries/templates/arm/SuccessfulPushCount_9dca87c2-de00-40fd-b0bb-c8335e5f978a.json
index 786875805..b6a791795 100644
--- a/services/ContainerRegistry/registries/templates/arm/SuccessfulPushCount_9dca87c2-de00-40fd-b0bb-c8335e5f978a.json
+++ b/services/ContainerRegistry/registries/templates/arm/SuccessfulPushCount_9dca87c2-de00-40fd-b0bb-c8335e5f978a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerRegistry/registries/templates/bicep/StorageUsed_fa9efde4-3586-4595-a442-b7e97f70fe91.bicep b/services/ContainerRegistry/registries/templates/bicep/StorageUsed_fa9efde4-3586-4595-a442-b7e97f70fe91.bicep
index 262c081de..0b2f2c40e 100644
--- a/services/ContainerRegistry/registries/templates/bicep/StorageUsed_fa9efde4-3586-4595-a442-b7e97f70fe91.bicep
+++ b/services/ContainerRegistry/registries/templates/bicep/StorageUsed_fa9efde4-3586-4595-a442-b7e97f70fe91.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerRegistry/registries/templates/bicep/StorageUsedforStandardPricingPlan_42995506-5bd2-4687-9316-d9399919990b.bicep b/services/ContainerRegistry/registries/templates/bicep/StorageUsedforStandardPricingPlan_42995506-5bd2-4687-9316-d9399919990b.bicep
index 0896332f7..2c7db8098 100644
--- a/services/ContainerRegistry/registries/templates/bicep/StorageUsedforStandardPricingPlan_42995506-5bd2-4687-9316-d9399919990b.bicep
+++ b/services/ContainerRegistry/registries/templates/bicep/StorageUsedforStandardPricingPlan_42995506-5bd2-4687-9316-d9399919990b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerRegistry/registries/templates/bicep/SuccessfulPullCount_b8c8a846-a8d0-4e8f-b854-030955a20135.bicep b/services/ContainerRegistry/registries/templates/bicep/SuccessfulPullCount_b8c8a846-a8d0-4e8f-b854-030955a20135.bicep
index 709f4f9df..150837fd4 100644
--- a/services/ContainerRegistry/registries/templates/bicep/SuccessfulPullCount_b8c8a846-a8d0-4e8f-b854-030955a20135.bicep
+++ b/services/ContainerRegistry/registries/templates/bicep/SuccessfulPullCount_b8c8a846-a8d0-4e8f-b854-030955a20135.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerRegistry/registries/templates/bicep/SuccessfulPushCount_9dca87c2-de00-40fd-b0bb-c8335e5f978a.bicep b/services/ContainerRegistry/registries/templates/bicep/SuccessfulPushCount_9dca87c2-de00-40fd-b0bb-c8335e5f978a.bicep
index ab0016cc0..e05875372 100644
--- a/services/ContainerRegistry/registries/templates/bicep/SuccessfulPushCount_9dca87c2-de00-40fd-b0bb-c8335e5f978a.bicep
+++ b/services/ContainerRegistry/registries/templates/bicep/SuccessfulPushCount_9dca87c2-de00-40fd-b0bb-c8335e5f978a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/arm/clusterautoscalerclustersafetoautoscale_49fd8bac-d061-459d-8d80-a048c4c8ba56.json b/services/ContainerService/managedClusters/templates/arm/clusterautoscalerclustersafetoautoscale_49fd8bac-d061-459d-8d80-a048c4c8ba56.json
index d99ad7dbd..789a4953d 100644
--- a/services/ContainerService/managedClusters/templates/arm/clusterautoscalerclustersafetoautoscale_49fd8bac-d061-459d-8d80-a048c4c8ba56.json
+++ b/services/ContainerService/managedClusters/templates/arm/clusterautoscalerclustersafetoautoscale_49fd8bac-d061-459d-8d80-a048c4c8ba56.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/clusterautoscalerunschedulablepodscount_301ca0e3-fc88-4285-be99-a2a587c412f5.json b/services/ContainerService/managedClusters/templates/arm/clusterautoscalerunschedulablepodscount_301ca0e3-fc88-4285-be99-a2a587c412f5.json
index d01e56323..c0130705b 100644
--- a/services/ContainerService/managedClusters/templates/arm/clusterautoscalerunschedulablepodscount_301ca0e3-fc88-4285-be99-a2a587c412f5.json
+++ b/services/ContainerService/managedClusters/templates/arm/clusterautoscalerunschedulablepodscount_301ca0e3-fc88-4285-be99-a2a587c412f5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/kubenodestatusallocatablecpucores_64a872f9-5ec6-4121-acad-edd12f4c3466.json b/services/ContainerService/managedClusters/templates/arm/kubenodestatusallocatablecpucores_64a872f9-5ec6-4121-acad-edd12f4c3466.json
index 7ea45b346..8194d69fc 100644
--- a/services/ContainerService/managedClusters/templates/arm/kubenodestatusallocatablecpucores_64a872f9-5ec6-4121-acad-edd12f4c3466.json
+++ b/services/ContainerService/managedClusters/templates/arm/kubenodestatusallocatablecpucores_64a872f9-5ec6-4121-acad-edd12f4c3466.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/kubenodestatusallocatablememorybytes_14fa63fb-7da9-4d2e-9de9-203c4a3e0401.json b/services/ContainerService/managedClusters/templates/arm/kubenodestatusallocatablememorybytes_14fa63fb-7da9-4d2e-9de9-203c4a3e0401.json
index 55b4ab322..b1fb711c9 100644
--- a/services/ContainerService/managedClusters/templates/arm/kubenodestatusallocatablememorybytes_14fa63fb-7da9-4d2e-9de9-203c4a3e0401.json
+++ b/services/ContainerService/managedClusters/templates/arm/kubenodestatusallocatablememorybytes_14fa63fb-7da9-4d2e-9de9-203c4a3e0401.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/kubenodestatuscondition_ebbbbb92-5208-4d52-b407-6bea8e4473b9.json b/services/ContainerService/managedClusters/templates/arm/kubenodestatuscondition_ebbbbb92-5208-4d52-b407-6bea8e4473b9.json
index d4d20beb8..817ea15ce 100644
--- a/services/ContainerService/managedClusters/templates/arm/kubenodestatuscondition_ebbbbb92-5208-4d52-b407-6bea8e4473b9.json
+++ b/services/ContainerService/managedClusters/templates/arm/kubenodestatuscondition_ebbbbb92-5208-4d52-b407-6bea8e4473b9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/kubepodstatusphase_e38e6e11-ac88-4014-98c8-8e64f70b832a.json b/services/ContainerService/managedClusters/templates/arm/kubepodstatusphase_e38e6e11-ac88-4014-98c8-8e64f70b832a.json
index a0c16bc02..e89332777 100644
--- a/services/ContainerService/managedClusters/templates/arm/kubepodstatusphase_e38e6e11-ac88-4014-98c8-8e64f70b832a.json
+++ b/services/ContainerService/managedClusters/templates/arm/kubepodstatusphase_e38e6e11-ac88-4014-98c8-8e64f70b832a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/kubepodstatusready_cebf00b7-7294-4cf7-bc50-108f999d0c67.json b/services/ContainerService/managedClusters/templates/arm/kubepodstatusready_cebf00b7-7294-4cf7-bc50-108f999d0c67.json
index 582f79aab..8a889a923 100644
--- a/services/ContainerService/managedClusters/templates/arm/kubepodstatusready_cebf00b7-7294-4cf7-bc50-108f999d0c67.json
+++ b/services/ContainerService/managedClusters/templates/arm/kubepodstatusready_cebf00b7-7294-4cf7-bc50-108f999d0c67.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/nodecpuusagepercentage_1303e91d-bc80-4ec2-937e-1d179fc32b43.json b/services/ContainerService/managedClusters/templates/arm/nodecpuusagepercentage_1303e91d-bc80-4ec2-937e-1d179fc32b43.json
index 3b924bc3b..0efd1fb5c 100644
--- a/services/ContainerService/managedClusters/templates/arm/nodecpuusagepercentage_1303e91d-bc80-4ec2-937e-1d179fc32b43.json
+++ b/services/ContainerService/managedClusters/templates/arm/nodecpuusagepercentage_1303e91d-bc80-4ec2-937e-1d179fc32b43.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/nodediskusagepercentage_aa3c5697-5cca-4c16-a37e-94f1d580701e.json b/services/ContainerService/managedClusters/templates/arm/nodediskusagepercentage_aa3c5697-5cca-4c16-a37e-94f1d580701e.json
index 3ab99c40a..e5571d052 100644
--- a/services/ContainerService/managedClusters/templates/arm/nodediskusagepercentage_aa3c5697-5cca-4c16-a37e-94f1d580701e.json
+++ b/services/ContainerService/managedClusters/templates/arm/nodediskusagepercentage_aa3c5697-5cca-4c16-a37e-94f1d580701e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/nodememoryrsspercentage_e89e023e-117b-4db4-bfb2-853849e273f5.json b/services/ContainerService/managedClusters/templates/arm/nodememoryrsspercentage_e89e023e-117b-4db4-bfb2-853849e273f5.json
index d4dab79c6..8b1d12f18 100644
--- a/services/ContainerService/managedClusters/templates/arm/nodememoryrsspercentage_e89e023e-117b-4db4-bfb2-853849e273f5.json
+++ b/services/ContainerService/managedClusters/templates/arm/nodememoryrsspercentage_e89e023e-117b-4db4-bfb2-853849e273f5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/arm/nodememoryworkingsetpercentage_9ae2dfbf-d69b-4802-8497-8b7836bef5e9.json b/services/ContainerService/managedClusters/templates/arm/nodememoryworkingsetpercentage_9ae2dfbf-d69b-4802-8497-8b7836bef5e9.json
index 68e595f98..118270dc7 100644
--- a/services/ContainerService/managedClusters/templates/arm/nodememoryworkingsetpercentage_9ae2dfbf-d69b-4802-8497-8b7836bef5e9.json
+++ b/services/ContainerService/managedClusters/templates/arm/nodememoryworkingsetpercentage_9ae2dfbf-d69b-4802-8497-8b7836bef5e9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ContainerService/managedClusters/templates/bicep/clusterautoscalerclustersafetoautoscale_49fd8bac-d061-459d-8d80-a048c4c8ba56.bicep b/services/ContainerService/managedClusters/templates/bicep/clusterautoscalerclustersafetoautoscale_49fd8bac-d061-459d-8d80-a048c4c8ba56.bicep
index ef9b82dbd..a453da701 100644
--- a/services/ContainerService/managedClusters/templates/bicep/clusterautoscalerclustersafetoautoscale_49fd8bac-d061-459d-8d80-a048c4c8ba56.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/clusterautoscalerclustersafetoautoscale_49fd8bac-d061-459d-8d80-a048c4c8ba56.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/clusterautoscalerunschedulablepodscount_301ca0e3-fc88-4285-be99-a2a587c412f5.bicep b/services/ContainerService/managedClusters/templates/bicep/clusterautoscalerunschedulablepodscount_301ca0e3-fc88-4285-be99-a2a587c412f5.bicep
index 1b78abd48..65d8eb0f7 100644
--- a/services/ContainerService/managedClusters/templates/bicep/clusterautoscalerunschedulablepodscount_301ca0e3-fc88-4285-be99-a2a587c412f5.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/clusterautoscalerunschedulablepodscount_301ca0e3-fc88-4285-be99-a2a587c412f5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/kubenodestatusallocatablecpucores_64a872f9-5ec6-4121-acad-edd12f4c3466.bicep b/services/ContainerService/managedClusters/templates/bicep/kubenodestatusallocatablecpucores_64a872f9-5ec6-4121-acad-edd12f4c3466.bicep
index 7d03ff7d5..11ca893ae 100644
--- a/services/ContainerService/managedClusters/templates/bicep/kubenodestatusallocatablecpucores_64a872f9-5ec6-4121-acad-edd12f4c3466.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/kubenodestatusallocatablecpucores_64a872f9-5ec6-4121-acad-edd12f4c3466.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/kubenodestatusallocatablememorybytes_14fa63fb-7da9-4d2e-9de9-203c4a3e0401.bicep b/services/ContainerService/managedClusters/templates/bicep/kubenodestatusallocatablememorybytes_14fa63fb-7da9-4d2e-9de9-203c4a3e0401.bicep
index 229e5e7b5..708b27d4a 100644
--- a/services/ContainerService/managedClusters/templates/bicep/kubenodestatusallocatablememorybytes_14fa63fb-7da9-4d2e-9de9-203c4a3e0401.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/kubenodestatusallocatablememorybytes_14fa63fb-7da9-4d2e-9de9-203c4a3e0401.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/kubenodestatuscondition_ebbbbb92-5208-4d52-b407-6bea8e4473b9.bicep b/services/ContainerService/managedClusters/templates/bicep/kubenodestatuscondition_ebbbbb92-5208-4d52-b407-6bea8e4473b9.bicep
index 515450740..8ebfe525c 100644
--- a/services/ContainerService/managedClusters/templates/bicep/kubenodestatuscondition_ebbbbb92-5208-4d52-b407-6bea8e4473b9.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/kubenodestatuscondition_ebbbbb92-5208-4d52-b407-6bea8e4473b9.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/kubepodstatusphase_e38e6e11-ac88-4014-98c8-8e64f70b832a.bicep b/services/ContainerService/managedClusters/templates/bicep/kubepodstatusphase_e38e6e11-ac88-4014-98c8-8e64f70b832a.bicep
index 03561c475..287f772fa 100644
--- a/services/ContainerService/managedClusters/templates/bicep/kubepodstatusphase_e38e6e11-ac88-4014-98c8-8e64f70b832a.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/kubepodstatusphase_e38e6e11-ac88-4014-98c8-8e64f70b832a.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/kubepodstatusready_cebf00b7-7294-4cf7-bc50-108f999d0c67.bicep b/services/ContainerService/managedClusters/templates/bicep/kubepodstatusready_cebf00b7-7294-4cf7-bc50-108f999d0c67.bicep
index f44acfdc7..05257c53a 100644
--- a/services/ContainerService/managedClusters/templates/bicep/kubepodstatusready_cebf00b7-7294-4cf7-bc50-108f999d0c67.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/kubepodstatusready_cebf00b7-7294-4cf7-bc50-108f999d0c67.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/nodecpuusagepercentage_1303e91d-bc80-4ec2-937e-1d179fc32b43.bicep b/services/ContainerService/managedClusters/templates/bicep/nodecpuusagepercentage_1303e91d-bc80-4ec2-937e-1d179fc32b43.bicep
index c597b64d5..70a83a877 100644
--- a/services/ContainerService/managedClusters/templates/bicep/nodecpuusagepercentage_1303e91d-bc80-4ec2-937e-1d179fc32b43.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/nodecpuusagepercentage_1303e91d-bc80-4ec2-937e-1d179fc32b43.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/nodediskusagepercentage_aa3c5697-5cca-4c16-a37e-94f1d580701e.bicep b/services/ContainerService/managedClusters/templates/bicep/nodediskusagepercentage_aa3c5697-5cca-4c16-a37e-94f1d580701e.bicep
index a3aae2d4e..cfcde393c 100644
--- a/services/ContainerService/managedClusters/templates/bicep/nodediskusagepercentage_aa3c5697-5cca-4c16-a37e-94f1d580701e.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/nodediskusagepercentage_aa3c5697-5cca-4c16-a37e-94f1d580701e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/nodememoryrsspercentage_e89e023e-117b-4db4-bfb2-853849e273f5.bicep b/services/ContainerService/managedClusters/templates/bicep/nodememoryrsspercentage_e89e023e-117b-4db4-bfb2-853849e273f5.bicep
index a0bc907fa..f999627e0 100644
--- a/services/ContainerService/managedClusters/templates/bicep/nodememoryrsspercentage_e89e023e-117b-4db4-bfb2-853849e273f5.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/nodememoryrsspercentage_e89e023e-117b-4db4-bfb2-853849e273f5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ContainerService/managedClusters/templates/bicep/nodememoryworkingsetpercentage_9ae2dfbf-d69b-4802-8497-8b7836bef5e9.bicep b/services/ContainerService/managedClusters/templates/bicep/nodememoryworkingsetpercentage_9ae2dfbf-d69b-4802-8497-8b7836bef5e9.bicep
index b0fd75db1..a7bbf6b8a 100644
--- a/services/ContainerService/managedClusters/templates/bicep/nodememoryworkingsetpercentage_9ae2dfbf-d69b-4802-8497-8b7836bef5e9.bicep
+++ b/services/ContainerService/managedClusters/templates/bicep/nodememoryworkingsetpercentage_9ae2dfbf-d69b-4802-8497-8b7836bef5e9.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMariaDB/servers/templates/arm/cpupercent_0f19979d-9dc2-4636-8e15-435bbfa1f0f9.json b/services/DBforMariaDB/servers/templates/arm/cpupercent_0f19979d-9dc2-4636-8e15-435bbfa1f0f9.json
index 3ad80248d..623c32af4 100644
--- a/services/DBforMariaDB/servers/templates/arm/cpupercent_0f19979d-9dc2-4636-8e15-435bbfa1f0f9.json
+++ b/services/DBforMariaDB/servers/templates/arm/cpupercent_0f19979d-9dc2-4636-8e15-435bbfa1f0f9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMariaDB/servers/templates/arm/ioconsumptionpercent_13bbfe6e-3b65-4940-9344-6d1cc78e7d54.json b/services/DBforMariaDB/servers/templates/arm/ioconsumptionpercent_13bbfe6e-3b65-4940-9344-6d1cc78e7d54.json
index a2593750d..e1b6e96b8 100644
--- a/services/DBforMariaDB/servers/templates/arm/ioconsumptionpercent_13bbfe6e-3b65-4940-9344-6d1cc78e7d54.json
+++ b/services/DBforMariaDB/servers/templates/arm/ioconsumptionpercent_13bbfe6e-3b65-4940-9344-6d1cc78e7d54.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMariaDB/servers/templates/arm/memorypercent_faf01668-c98a-4755-ae74-9dd4151f4c39.json b/services/DBforMariaDB/servers/templates/arm/memorypercent_faf01668-c98a-4755-ae74-9dd4151f4c39.json
index 4049f2a80..37c2a8829 100644
--- a/services/DBforMariaDB/servers/templates/arm/memorypercent_faf01668-c98a-4755-ae74-9dd4151f4c39.json
+++ b/services/DBforMariaDB/servers/templates/arm/memorypercent_faf01668-c98a-4755-ae74-9dd4151f4c39.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMariaDB/servers/templates/arm/storagepercent_ef38051a-d9e3-4705-b208-29a421e729be.json b/services/DBforMariaDB/servers/templates/arm/storagepercent_ef38051a-d9e3-4705-b208-29a421e729be.json
index 45e23a253..56cf34cb7 100644
--- a/services/DBforMariaDB/servers/templates/arm/storagepercent_ef38051a-d9e3-4705-b208-29a421e729be.json
+++ b/services/DBforMariaDB/servers/templates/arm/storagepercent_ef38051a-d9e3-4705-b208-29a421e729be.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMariaDB/servers/templates/bicep/cpupercent_0f19979d-9dc2-4636-8e15-435bbfa1f0f9.bicep b/services/DBforMariaDB/servers/templates/bicep/cpupercent_0f19979d-9dc2-4636-8e15-435bbfa1f0f9.bicep
index 85037e236..b1e043348 100644
--- a/services/DBforMariaDB/servers/templates/bicep/cpupercent_0f19979d-9dc2-4636-8e15-435bbfa1f0f9.bicep
+++ b/services/DBforMariaDB/servers/templates/bicep/cpupercent_0f19979d-9dc2-4636-8e15-435bbfa1f0f9.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMariaDB/servers/templates/bicep/ioconsumptionpercent_13bbfe6e-3b65-4940-9344-6d1cc78e7d54.bicep b/services/DBforMariaDB/servers/templates/bicep/ioconsumptionpercent_13bbfe6e-3b65-4940-9344-6d1cc78e7d54.bicep
index 082b5e712..644183703 100644
--- a/services/DBforMariaDB/servers/templates/bicep/ioconsumptionpercent_13bbfe6e-3b65-4940-9344-6d1cc78e7d54.bicep
+++ b/services/DBforMariaDB/servers/templates/bicep/ioconsumptionpercent_13bbfe6e-3b65-4940-9344-6d1cc78e7d54.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMariaDB/servers/templates/bicep/memorypercent_faf01668-c98a-4755-ae74-9dd4151f4c39.bicep b/services/DBforMariaDB/servers/templates/bicep/memorypercent_faf01668-c98a-4755-ae74-9dd4151f4c39.bicep
index 327251236..b91e5113c 100644
--- a/services/DBforMariaDB/servers/templates/bicep/memorypercent_faf01668-c98a-4755-ae74-9dd4151f4c39.bicep
+++ b/services/DBforMariaDB/servers/templates/bicep/memorypercent_faf01668-c98a-4755-ae74-9dd4151f4c39.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMariaDB/servers/templates/bicep/storagepercent_ef38051a-d9e3-4705-b208-29a421e729be.bicep b/services/DBforMariaDB/servers/templates/bicep/storagepercent_ef38051a-d9e3-4705-b208-29a421e729be.bicep
index b4dcfaf55..3733573e9 100644
--- a/services/DBforMariaDB/servers/templates/bicep/storagepercent_ef38051a-d9e3-4705-b208-29a421e729be.bicep
+++ b/services/DBforMariaDB/servers/templates/bicep/storagepercent_ef38051a-d9e3-4705-b208-29a421e729be.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/flexibleServers/templates/arm/abortedconnections_269d640c-b6ba-45e1-a52f-67708f9f99d7.json b/services/DBforMySQL/flexibleServers/templates/arm/abortedconnections_269d640c-b6ba-45e1-a52f-67708f9f99d7.json
index 20a9b07cb..d27e5086c 100644
--- a/services/DBforMySQL/flexibleServers/templates/arm/abortedconnections_269d640c-b6ba-45e1-a52f-67708f9f99d7.json
+++ b/services/DBforMySQL/flexibleServers/templates/arm/abortedconnections_269d640c-b6ba-45e1-a52f-67708f9f99d7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/flexibleServers/templates/arm/activeconnections_347674ce-8534-403d-8281-cac9ea6f412a.json b/services/DBforMySQL/flexibleServers/templates/arm/activeconnections_347674ce-8534-403d-8281-cac9ea6f412a.json
index d7352ca3b..f28d986ad 100644
--- a/services/DBforMySQL/flexibleServers/templates/arm/activeconnections_347674ce-8534-403d-8281-cac9ea6f412a.json
+++ b/services/DBforMySQL/flexibleServers/templates/arm/activeconnections_347674ce-8534-403d-8281-cac9ea6f412a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/flexibleServers/templates/arm/cpupercent_218161be-4952-495b-aed1-03cccda3d42f.json b/services/DBforMySQL/flexibleServers/templates/arm/cpupercent_218161be-4952-495b-aed1-03cccda3d42f.json
index 72664503d..77a45f41a 100644
--- a/services/DBforMySQL/flexibleServers/templates/arm/cpupercent_218161be-4952-495b-aed1-03cccda3d42f.json
+++ b/services/DBforMySQL/flexibleServers/templates/arm/cpupercent_218161be-4952-495b-aed1-03cccda3d42f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/flexibleServers/templates/arm/ioconsumptionpercent_a3601973-f48c-4bf2-8384-90d250702a79.json b/services/DBforMySQL/flexibleServers/templates/arm/ioconsumptionpercent_a3601973-f48c-4bf2-8384-90d250702a79.json
index 4a557cfa5..630c43bc2 100644
--- a/services/DBforMySQL/flexibleServers/templates/arm/ioconsumptionpercent_a3601973-f48c-4bf2-8384-90d250702a79.json
+++ b/services/DBforMySQL/flexibleServers/templates/arm/ioconsumptionpercent_a3601973-f48c-4bf2-8384-90d250702a79.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/flexibleServers/templates/arm/memorypercent_757e2adf-60b8-4688-ae8f-03dd7dcd5226.json b/services/DBforMySQL/flexibleServers/templates/arm/memorypercent_757e2adf-60b8-4688-ae8f-03dd7dcd5226.json
index 6ad82ac93..d0a53f45b 100644
--- a/services/DBforMySQL/flexibleServers/templates/arm/memorypercent_757e2adf-60b8-4688-ae8f-03dd7dcd5226.json
+++ b/services/DBforMySQL/flexibleServers/templates/arm/memorypercent_757e2adf-60b8-4688-ae8f-03dd7dcd5226.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/flexibleServers/templates/arm/replicationlag_dfe563fc-0ec1-401d-a362-8d293a06d02b.json b/services/DBforMySQL/flexibleServers/templates/arm/replicationlag_dfe563fc-0ec1-401d-a362-8d293a06d02b.json
index dd565d33c..1f77c231e 100644
--- a/services/DBforMySQL/flexibleServers/templates/arm/replicationlag_dfe563fc-0ec1-401d-a362-8d293a06d02b.json
+++ b/services/DBforMySQL/flexibleServers/templates/arm/replicationlag_dfe563fc-0ec1-401d-a362-8d293a06d02b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/flexibleServers/templates/arm/storagelimit_f285c23f-3b8e-428a-b289-8ff38a3c0e4b.json b/services/DBforMySQL/flexibleServers/templates/arm/storagelimit_f285c23f-3b8e-428a-b289-8ff38a3c0e4b.json
index c2b81ea54..eb062b181 100644
--- a/services/DBforMySQL/flexibleServers/templates/arm/storagelimit_f285c23f-3b8e-428a-b289-8ff38a3c0e4b.json
+++ b/services/DBforMySQL/flexibleServers/templates/arm/storagelimit_f285c23f-3b8e-428a-b289-8ff38a3c0e4b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/flexibleServers/templates/arm/storagepercent_e6771f44-f6d3-4a27-a9e4-b402a79c2891.json b/services/DBforMySQL/flexibleServers/templates/arm/storagepercent_e6771f44-f6d3-4a27-a9e4-b402a79c2891.json
index 1a090bc7c..10b8f839d 100644
--- a/services/DBforMySQL/flexibleServers/templates/arm/storagepercent_e6771f44-f6d3-4a27-a9e4-b402a79c2891.json
+++ b/services/DBforMySQL/flexibleServers/templates/arm/storagepercent_e6771f44-f6d3-4a27-a9e4-b402a79c2891.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/flexibleServers/templates/bicep/abortedconnections_269d640c-b6ba-45e1-a52f-67708f9f99d7.bicep b/services/DBforMySQL/flexibleServers/templates/bicep/abortedconnections_269d640c-b6ba-45e1-a52f-67708f9f99d7.bicep
index d0e48406f..7c8cbad81 100644
--- a/services/DBforMySQL/flexibleServers/templates/bicep/abortedconnections_269d640c-b6ba-45e1-a52f-67708f9f99d7.bicep
+++ b/services/DBforMySQL/flexibleServers/templates/bicep/abortedconnections_269d640c-b6ba-45e1-a52f-67708f9f99d7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/flexibleServers/templates/bicep/activeconnections_347674ce-8534-403d-8281-cac9ea6f412a.bicep b/services/DBforMySQL/flexibleServers/templates/bicep/activeconnections_347674ce-8534-403d-8281-cac9ea6f412a.bicep
index 680ac7062..8f768ca2f 100644
--- a/services/DBforMySQL/flexibleServers/templates/bicep/activeconnections_347674ce-8534-403d-8281-cac9ea6f412a.bicep
+++ b/services/DBforMySQL/flexibleServers/templates/bicep/activeconnections_347674ce-8534-403d-8281-cac9ea6f412a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/flexibleServers/templates/bicep/cpupercent_218161be-4952-495b-aed1-03cccda3d42f.bicep b/services/DBforMySQL/flexibleServers/templates/bicep/cpupercent_218161be-4952-495b-aed1-03cccda3d42f.bicep
index b9de46bcc..64e55f4e7 100644
--- a/services/DBforMySQL/flexibleServers/templates/bicep/cpupercent_218161be-4952-495b-aed1-03cccda3d42f.bicep
+++ b/services/DBforMySQL/flexibleServers/templates/bicep/cpupercent_218161be-4952-495b-aed1-03cccda3d42f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/flexibleServers/templates/bicep/ioconsumptionpercent_a3601973-f48c-4bf2-8384-90d250702a79.bicep b/services/DBforMySQL/flexibleServers/templates/bicep/ioconsumptionpercent_a3601973-f48c-4bf2-8384-90d250702a79.bicep
index 3e25194a7..671dbe42b 100644
--- a/services/DBforMySQL/flexibleServers/templates/bicep/ioconsumptionpercent_a3601973-f48c-4bf2-8384-90d250702a79.bicep
+++ b/services/DBforMySQL/flexibleServers/templates/bicep/ioconsumptionpercent_a3601973-f48c-4bf2-8384-90d250702a79.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/flexibleServers/templates/bicep/memorypercent_757e2adf-60b8-4688-ae8f-03dd7dcd5226.bicep b/services/DBforMySQL/flexibleServers/templates/bicep/memorypercent_757e2adf-60b8-4688-ae8f-03dd7dcd5226.bicep
index de0906952..11af6223e 100644
--- a/services/DBforMySQL/flexibleServers/templates/bicep/memorypercent_757e2adf-60b8-4688-ae8f-03dd7dcd5226.bicep
+++ b/services/DBforMySQL/flexibleServers/templates/bicep/memorypercent_757e2adf-60b8-4688-ae8f-03dd7dcd5226.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/flexibleServers/templates/bicep/replicationlag_dfe563fc-0ec1-401d-a362-8d293a06d02b.bicep b/services/DBforMySQL/flexibleServers/templates/bicep/replicationlag_dfe563fc-0ec1-401d-a362-8d293a06d02b.bicep
index b5a217e59..78afde05f 100644
--- a/services/DBforMySQL/flexibleServers/templates/bicep/replicationlag_dfe563fc-0ec1-401d-a362-8d293a06d02b.bicep
+++ b/services/DBforMySQL/flexibleServers/templates/bicep/replicationlag_dfe563fc-0ec1-401d-a362-8d293a06d02b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/flexibleServers/templates/bicep/storagelimit_f285c23f-3b8e-428a-b289-8ff38a3c0e4b.bicep b/services/DBforMySQL/flexibleServers/templates/bicep/storagelimit_f285c23f-3b8e-428a-b289-8ff38a3c0e4b.bicep
index 90d0b7025..4e96ac528 100644
--- a/services/DBforMySQL/flexibleServers/templates/bicep/storagelimit_f285c23f-3b8e-428a-b289-8ff38a3c0e4b.bicep
+++ b/services/DBforMySQL/flexibleServers/templates/bicep/storagelimit_f285c23f-3b8e-428a-b289-8ff38a3c0e4b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/flexibleServers/templates/bicep/storagepercent_e6771f44-f6d3-4a27-a9e4-b402a79c2891.bicep b/services/DBforMySQL/flexibleServers/templates/bicep/storagepercent_e6771f44-f6d3-4a27-a9e4-b402a79c2891.bicep
index e6cc8267b..a9bc94945 100644
--- a/services/DBforMySQL/flexibleServers/templates/bicep/storagepercent_e6771f44-f6d3-4a27-a9e4-b402a79c2891.bicep
+++ b/services/DBforMySQL/flexibleServers/templates/bicep/storagepercent_e6771f44-f6d3-4a27-a9e4-b402a79c2891.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/servers/templates/arm/activeconnections_60453255-5e0e-4fa5-95b5-6c449bee6902.json b/services/DBforMySQL/servers/templates/arm/activeconnections_60453255-5e0e-4fa5-95b5-6c449bee6902.json
index de9a67568..f0fb4f359 100644
--- a/services/DBforMySQL/servers/templates/arm/activeconnections_60453255-5e0e-4fa5-95b5-6c449bee6902.json
+++ b/services/DBforMySQL/servers/templates/arm/activeconnections_60453255-5e0e-4fa5-95b5-6c449bee6902.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/servers/templates/arm/connectionsfailed_f0767b27-b88b-46a1-ab90-37dc8c399358.json b/services/DBforMySQL/servers/templates/arm/connectionsfailed_f0767b27-b88b-46a1-ab90-37dc8c399358.json
index 8ddbc9370..507418f98 100644
--- a/services/DBforMySQL/servers/templates/arm/connectionsfailed_f0767b27-b88b-46a1-ab90-37dc8c399358.json
+++ b/services/DBforMySQL/servers/templates/arm/connectionsfailed_f0767b27-b88b-46a1-ab90-37dc8c399358.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/servers/templates/arm/cpupercent_173e6b88-e8a9-4763-becb-9c749878c767.json b/services/DBforMySQL/servers/templates/arm/cpupercent_173e6b88-e8a9-4763-becb-9c749878c767.json
index 9f2a9c4b4..21454db86 100644
--- a/services/DBforMySQL/servers/templates/arm/cpupercent_173e6b88-e8a9-4763-becb-9c749878c767.json
+++ b/services/DBforMySQL/servers/templates/arm/cpupercent_173e6b88-e8a9-4763-becb-9c749878c767.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/servers/templates/arm/ioconsumptionpercent_978944c7-a049-4847-8483-dcf5baa92f6a.json b/services/DBforMySQL/servers/templates/arm/ioconsumptionpercent_978944c7-a049-4847-8483-dcf5baa92f6a.json
index 3ef1b28ee..db9f87079 100644
--- a/services/DBforMySQL/servers/templates/arm/ioconsumptionpercent_978944c7-a049-4847-8483-dcf5baa92f6a.json
+++ b/services/DBforMySQL/servers/templates/arm/ioconsumptionpercent_978944c7-a049-4847-8483-dcf5baa92f6a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/servers/templates/arm/memorypercent_3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.json b/services/DBforMySQL/servers/templates/arm/memorypercent_3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.json
index fc648516f..944df1833 100644
--- a/services/DBforMySQL/servers/templates/arm/memorypercent_3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.json
+++ b/services/DBforMySQL/servers/templates/arm/memorypercent_3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/servers/templates/arm/serverlogstoragepercent_af2b7bbb-9476-475a-b523-da3ee521eda7.json b/services/DBforMySQL/servers/templates/arm/serverlogstoragepercent_af2b7bbb-9476-475a-b523-da3ee521eda7.json
index 568a8e8e8..ad1c809a0 100644
--- a/services/DBforMySQL/servers/templates/arm/serverlogstoragepercent_af2b7bbb-9476-475a-b523-da3ee521eda7.json
+++ b/services/DBforMySQL/servers/templates/arm/serverlogstoragepercent_af2b7bbb-9476-475a-b523-da3ee521eda7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/servers/templates/arm/storagepercent_4f988eb2-c420-4ef2-82ed-2569b21b70e1.json b/services/DBforMySQL/servers/templates/arm/storagepercent_4f988eb2-c420-4ef2-82ed-2569b21b70e1.json
index acaf2dc63..9b09a8fd2 100644
--- a/services/DBforMySQL/servers/templates/arm/storagepercent_4f988eb2-c420-4ef2-82ed-2569b21b70e1.json
+++ b/services/DBforMySQL/servers/templates/arm/storagepercent_4f988eb2-c420-4ef2-82ed-2569b21b70e1.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforMySQL/servers/templates/bicep/activeconnections_60453255-5e0e-4fa5-95b5-6c449bee6902.bicep b/services/DBforMySQL/servers/templates/bicep/activeconnections_60453255-5e0e-4fa5-95b5-6c449bee6902.bicep
index a9ec197b6..cd2639879 100644
--- a/services/DBforMySQL/servers/templates/bicep/activeconnections_60453255-5e0e-4fa5-95b5-6c449bee6902.bicep
+++ b/services/DBforMySQL/servers/templates/bicep/activeconnections_60453255-5e0e-4fa5-95b5-6c449bee6902.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/servers/templates/bicep/connectionsfailed_f0767b27-b88b-46a1-ab90-37dc8c399358.bicep b/services/DBforMySQL/servers/templates/bicep/connectionsfailed_f0767b27-b88b-46a1-ab90-37dc8c399358.bicep
index ef386045a..312b332ce 100644
--- a/services/DBforMySQL/servers/templates/bicep/connectionsfailed_f0767b27-b88b-46a1-ab90-37dc8c399358.bicep
+++ b/services/DBforMySQL/servers/templates/bicep/connectionsfailed_f0767b27-b88b-46a1-ab90-37dc8c399358.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/servers/templates/bicep/cpupercent_173e6b88-e8a9-4763-becb-9c749878c767.bicep b/services/DBforMySQL/servers/templates/bicep/cpupercent_173e6b88-e8a9-4763-becb-9c749878c767.bicep
index 8b51a9cc6..d817294b9 100644
--- a/services/DBforMySQL/servers/templates/bicep/cpupercent_173e6b88-e8a9-4763-becb-9c749878c767.bicep
+++ b/services/DBforMySQL/servers/templates/bicep/cpupercent_173e6b88-e8a9-4763-becb-9c749878c767.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/servers/templates/bicep/ioconsumptionpercent_978944c7-a049-4847-8483-dcf5baa92f6a.bicep b/services/DBforMySQL/servers/templates/bicep/ioconsumptionpercent_978944c7-a049-4847-8483-dcf5baa92f6a.bicep
index 2bb2e0d88..169798d4a 100644
--- a/services/DBforMySQL/servers/templates/bicep/ioconsumptionpercent_978944c7-a049-4847-8483-dcf5baa92f6a.bicep
+++ b/services/DBforMySQL/servers/templates/bicep/ioconsumptionpercent_978944c7-a049-4847-8483-dcf5baa92f6a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/servers/templates/bicep/memorypercent_3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.bicep b/services/DBforMySQL/servers/templates/bicep/memorypercent_3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.bicep
index c91ff46cb..378aa5ce3 100644
--- a/services/DBforMySQL/servers/templates/bicep/memorypercent_3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.bicep
+++ b/services/DBforMySQL/servers/templates/bicep/memorypercent_3a1dd0bd-ebe9-4f9b-b38c-88686a390bdd.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/servers/templates/bicep/serverlogstoragepercent_af2b7bbb-9476-475a-b523-da3ee521eda7.bicep b/services/DBforMySQL/servers/templates/bicep/serverlogstoragepercent_af2b7bbb-9476-475a-b523-da3ee521eda7.bicep
index 27dc12a2e..09df95468 100644
--- a/services/DBforMySQL/servers/templates/bicep/serverlogstoragepercent_af2b7bbb-9476-475a-b523-da3ee521eda7.bicep
+++ b/services/DBforMySQL/servers/templates/bicep/serverlogstoragepercent_af2b7bbb-9476-475a-b523-da3ee521eda7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforMySQL/servers/templates/bicep/storagepercent_4f988eb2-c420-4ef2-82ed-2569b21b70e1.bicep b/services/DBforMySQL/servers/templates/bicep/storagepercent_4f988eb2-c420-4ef2-82ed-2569b21b70e1.bicep
index 9c855c291..c53f2fe0b 100644
--- a/services/DBforMySQL/servers/templates/bicep/storagepercent_4f988eb2-c420-4ef2-82ed-2569b21b70e1.bicep
+++ b/services/DBforMySQL/servers/templates/bicep/storagepercent_4f988eb2-c420-4ef2-82ed-2569b21b70e1.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/activeconnections_f9b59221-8055-449e-bfd5-7a056945c694.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/activeconnections_f9b59221-8055-449e-bfd5-7a056945c694.json
index fd7084a27..122256c76 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/activeconnections_f9b59221-8055-449e-bfd5-7a056945c694.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/activeconnections_f9b59221-8055-449e-bfd5-7a056945c694.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/connectionsfailed_5f9cdad0-db39-48c9-a4eb-3107b5b79414.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/connectionsfailed_5f9cdad0-db39-48c9-a4eb-3107b5b79414.json
index a0cd87a4e..773fc0155 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/connectionsfailed_5f9cdad0-db39-48c9-a4eb-3107b5b79414.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/connectionsfailed_5f9cdad0-db39-48c9-a4eb-3107b5b79414.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/cpupercent_389057c9-a0e0-4327-b89f-58c3dabb519d.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/cpupercent_389057c9-a0e0-4327-b89f-58c3dabb519d.json
index 471f21d64..290082309 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/cpupercent_389057c9-a0e0-4327-b89f-58c3dabb519d.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/cpupercent_389057c9-a0e0-4327-b89f-58c3dabb519d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/deadlocks_1904dd93-9655-403f-bb89-dc42e5ebc666.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/deadlocks_1904dd93-9655-403f-bb89-dc42e5ebc666.json
index 931d85023..b78812cd1 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/deadlocks_1904dd93-9655-403f-bb89-dc42e5ebc666.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/deadlocks_1904dd93-9655-403f-bb89-dc42e5ebc666.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/diskiopsconsumedpercentage_5856ad80-7256-441f-8a62-af1fdc712018.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/diskiopsconsumedpercentage_5856ad80-7256-441f-8a62-af1fdc712018.json
index bf4ae8fc5..b4a78fcda 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/diskiopsconsumedpercentage_5856ad80-7256-441f-8a62-af1fdc712018.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/diskiopsconsumedpercentage_5856ad80-7256-441f-8a62-af1fdc712018.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/iops_eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/iops_eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.json
index 68b084c40..74017eb6c 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/iops_eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/iops_eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/isdbalive_b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/isdbalive_b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.json
index 1210ab562..385c29baa 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/isdbalive_b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/isdbalive_b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/maximumusedtransactionIDs_1103b9a5-3d3d-4aa8-a3c2-66958e32c220.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/maximumusedtransactionIDs_1103b9a5-3d3d-4aa8-a3c2-66958e32c220.json
index 837afefce..525ca822c 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/maximumusedtransactionIDs_1103b9a5-3d3d-4aa8-a3c2-66958e32c220.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/maximumusedtransactionIDs_1103b9a5-3d3d-4aa8-a3c2-66958e32c220.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/memorypercent_0c64aa8f-4bdb-4bb0-961c-d298000536af.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/memorypercent_0c64aa8f-4bdb-4bb0-961c-d298000536af.json
index 4049f2a80..37c2a8829 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/memorypercent_0c64aa8f-4bdb-4bb0-961c-d298000536af.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/memorypercent_0c64aa8f-4bdb-4bb0-961c-d298000536af.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/storagefree_d389ee62-f431-4faa-a4bc-4a3d02cea182.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/storagefree_d389ee62-f431-4faa-a4bc-4a3d02cea182.json
index c69ef8f9a..979b29d3b 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/storagefree_d389ee62-f431-4faa-a4bc-4a3d02cea182.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/storagefree_d389ee62-f431-4faa-a4bc-4a3d02cea182.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/arm/storagepercent_e397645f-359b-46d1-8182-d2cabab71aae.json b/services/DBforPostgreSQL/flexibleServers/templates/arm/storagepercent_e397645f-359b-46d1-8182-d2cabab71aae.json
index a40c2c294..125dfdfca 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/arm/storagepercent_e397645f-359b-46d1-8182-d2cabab71aae.json
+++ b/services/DBforPostgreSQL/flexibleServers/templates/arm/storagepercent_e397645f-359b-46d1-8182-d2cabab71aae.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/activeconnections_f9b59221-8055-449e-bfd5-7a056945c694.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/activeconnections_f9b59221-8055-449e-bfd5-7a056945c694.bicep
index 839831344..8675a7af9 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/activeconnections_f9b59221-8055-449e-bfd5-7a056945c694.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/activeconnections_f9b59221-8055-449e-bfd5-7a056945c694.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/connectionsfailed_5f9cdad0-db39-48c9-a4eb-3107b5b79414.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/connectionsfailed_5f9cdad0-db39-48c9-a4eb-3107b5b79414.bicep
index 7f061d3cd..308a8fca5 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/connectionsfailed_5f9cdad0-db39-48c9-a4eb-3107b5b79414.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/connectionsfailed_5f9cdad0-db39-48c9-a4eb-3107b5b79414.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/cpupercent_389057c9-a0e0-4327-b89f-58c3dabb519d.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/cpupercent_389057c9-a0e0-4327-b89f-58c3dabb519d.bicep
index c3f7cd051..7dd577e1d 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/cpupercent_389057c9-a0e0-4327-b89f-58c3dabb519d.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/cpupercent_389057c9-a0e0-4327-b89f-58c3dabb519d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/deadlocks_1904dd93-9655-403f-bb89-dc42e5ebc666.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/deadlocks_1904dd93-9655-403f-bb89-dc42e5ebc666.bicep
index 5cb2df5ce..facdcaad2 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/deadlocks_1904dd93-9655-403f-bb89-dc42e5ebc666.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/deadlocks_1904dd93-9655-403f-bb89-dc42e5ebc666.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/diskiopsconsumedpercentage_5856ad80-7256-441f-8a62-af1fdc712018.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/diskiopsconsumedpercentage_5856ad80-7256-441f-8a62-af1fdc712018.bicep
index 8c95448b7..4cc30127d 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/diskiopsconsumedpercentage_5856ad80-7256-441f-8a62-af1fdc712018.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/diskiopsconsumedpercentage_5856ad80-7256-441f-8a62-af1fdc712018.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/iops_eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/iops_eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.bicep
index 1bee4db2e..da529dcd6 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/iops_eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/iops_eb3e1fb3-83e9-4764-b6e1-532bb22ce1aa.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/isdbalive_b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/isdbalive_b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.bicep
index 587bcae77..f668e2640 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/isdbalive_b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/isdbalive_b0ac25d8-ae08-45e1-8a1e-5204514ad7bd.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/maximumusedtransactionIDs_1103b9a5-3d3d-4aa8-a3c2-66958e32c220.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/maximumusedtransactionIDs_1103b9a5-3d3d-4aa8-a3c2-66958e32c220.bicep
index e486be306..daee22c81 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/maximumusedtransactionIDs_1103b9a5-3d3d-4aa8-a3c2-66958e32c220.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/maximumusedtransactionIDs_1103b9a5-3d3d-4aa8-a3c2-66958e32c220.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/memorypercent_0c64aa8f-4bdb-4bb0-961c-d298000536af.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/memorypercent_0c64aa8f-4bdb-4bb0-961c-d298000536af.bicep
index 327251236..b91e5113c 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/memorypercent_0c64aa8f-4bdb-4bb0-961c-d298000536af.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/memorypercent_0c64aa8f-4bdb-4bb0-961c-d298000536af.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/storagefree_d389ee62-f431-4faa-a4bc-4a3d02cea182.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/storagefree_d389ee62-f431-4faa-a4bc-4a3d02cea182.bicep
index 726b512f1..e581737f3 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/storagefree_d389ee62-f431-4faa-a4bc-4a3d02cea182.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/storagefree_d389ee62-f431-4faa-a4bc-4a3d02cea182.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/flexibleServers/templates/bicep/storagepercent_e397645f-359b-46d1-8182-d2cabab71aae.bicep b/services/DBforPostgreSQL/flexibleServers/templates/bicep/storagepercent_e397645f-359b-46d1-8182-d2cabab71aae.bicep
index 9532a470b..f45643303 100644
--- a/services/DBforPostgreSQL/flexibleServers/templates/bicep/storagepercent_e397645f-359b-46d1-8182-d2cabab71aae.bicep
+++ b/services/DBforPostgreSQL/flexibleServers/templates/bicep/storagepercent_e397645f-359b-46d1-8182-d2cabab71aae.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/servers/templates/arm/activeconnections_186c5227-a9f4-4cd0-a355-c8d28f359398.json b/services/DBforPostgreSQL/servers/templates/arm/activeconnections_186c5227-a9f4-4cd0-a355-c8d28f359398.json
index fd7084a27..122256c76 100644
--- a/services/DBforPostgreSQL/servers/templates/arm/activeconnections_186c5227-a9f4-4cd0-a355-c8d28f359398.json
+++ b/services/DBforPostgreSQL/servers/templates/arm/activeconnections_186c5227-a9f4-4cd0-a355-c8d28f359398.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/servers/templates/arm/connectionsfailed_0a6de1a0-e4df-470f-9bc7-247838fc428c.json b/services/DBforPostgreSQL/servers/templates/arm/connectionsfailed_0a6de1a0-e4df-470f-9bc7-247838fc428c.json
index 8ddbc9370..507418f98 100644
--- a/services/DBforPostgreSQL/servers/templates/arm/connectionsfailed_0a6de1a0-e4df-470f-9bc7-247838fc428c.json
+++ b/services/DBforPostgreSQL/servers/templates/arm/connectionsfailed_0a6de1a0-e4df-470f-9bc7-247838fc428c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/servers/templates/arm/cpupercent_a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.json b/services/DBforPostgreSQL/servers/templates/arm/cpupercent_a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.json
index 3ad80248d..623c32af4 100644
--- a/services/DBforPostgreSQL/servers/templates/arm/cpupercent_a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.json
+++ b/services/DBforPostgreSQL/servers/templates/arm/cpupercent_a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/servers/templates/arm/ioconsumptionpercent_ea7248bd-f96c-4391-ac48-c95312441028.json b/services/DBforPostgreSQL/servers/templates/arm/ioconsumptionpercent_ea7248bd-f96c-4391-ac48-c95312441028.json
index e89cbafd1..841c14375 100644
--- a/services/DBforPostgreSQL/servers/templates/arm/ioconsumptionpercent_ea7248bd-f96c-4391-ac48-c95312441028.json
+++ b/services/DBforPostgreSQL/servers/templates/arm/ioconsumptionpercent_ea7248bd-f96c-4391-ac48-c95312441028.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/servers/templates/arm/memorypercent_1d53e3ac-e98a-426c-81f1-aa1834c49692.json b/services/DBforPostgreSQL/servers/templates/arm/memorypercent_1d53e3ac-e98a-426c-81f1-aa1834c49692.json
index 4049f2a80..37c2a8829 100644
--- a/services/DBforPostgreSQL/servers/templates/arm/memorypercent_1d53e3ac-e98a-426c-81f1-aa1834c49692.json
+++ b/services/DBforPostgreSQL/servers/templates/arm/memorypercent_1d53e3ac-e98a-426c-81f1-aa1834c49692.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/servers/templates/arm/pgreplicalogdelayinseconds_90c0997a-f96e-4a34-87c7-c394c6e8b940.json b/services/DBforPostgreSQL/servers/templates/arm/pgreplicalogdelayinseconds_90c0997a-f96e-4a34-87c7-c394c6e8b940.json
index d85f87c58..831e8d244 100644
--- a/services/DBforPostgreSQL/servers/templates/arm/pgreplicalogdelayinseconds_90c0997a-f96e-4a34-87c7-c394c6e8b940.json
+++ b/services/DBforPostgreSQL/servers/templates/arm/pgreplicalogdelayinseconds_90c0997a-f96e-4a34-87c7-c394c6e8b940.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/servers/templates/arm/serverlogstoragepercent_56a13163-c2b6-4235-96bd-ef1e373b19ba.json b/services/DBforPostgreSQL/servers/templates/arm/serverlogstoragepercent_56a13163-c2b6-4235-96bd-ef1e373b19ba.json
index cefb8b2a8..ffcce4914 100644
--- a/services/DBforPostgreSQL/servers/templates/arm/serverlogstoragepercent_56a13163-c2b6-4235-96bd-ef1e373b19ba.json
+++ b/services/DBforPostgreSQL/servers/templates/arm/serverlogstoragepercent_56a13163-c2b6-4235-96bd-ef1e373b19ba.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/servers/templates/arm/storagepercent_e031f8bf-ed3f-4a41-87fe-b301c1d02367.json b/services/DBforPostgreSQL/servers/templates/arm/storagepercent_e031f8bf-ed3f-4a41-87fe-b301c1d02367.json
index a40c2c294..125dfdfca 100644
--- a/services/DBforPostgreSQL/servers/templates/arm/storagepercent_e031f8bf-ed3f-4a41-87fe-b301c1d02367.json
+++ b/services/DBforPostgreSQL/servers/templates/arm/storagepercent_e031f8bf-ed3f-4a41-87fe-b301c1d02367.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DBforPostgreSQL/servers/templates/bicep/activeconnections_186c5227-a9f4-4cd0-a355-c8d28f359398.bicep b/services/DBforPostgreSQL/servers/templates/bicep/activeconnections_186c5227-a9f4-4cd0-a355-c8d28f359398.bicep
index 839831344..8675a7af9 100644
--- a/services/DBforPostgreSQL/servers/templates/bicep/activeconnections_186c5227-a9f4-4cd0-a355-c8d28f359398.bicep
+++ b/services/DBforPostgreSQL/servers/templates/bicep/activeconnections_186c5227-a9f4-4cd0-a355-c8d28f359398.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/servers/templates/bicep/connectionsfailed_0a6de1a0-e4df-470f-9bc7-247838fc428c.bicep b/services/DBforPostgreSQL/servers/templates/bicep/connectionsfailed_0a6de1a0-e4df-470f-9bc7-247838fc428c.bicep
index ef386045a..312b332ce 100644
--- a/services/DBforPostgreSQL/servers/templates/bicep/connectionsfailed_0a6de1a0-e4df-470f-9bc7-247838fc428c.bicep
+++ b/services/DBforPostgreSQL/servers/templates/bicep/connectionsfailed_0a6de1a0-e4df-470f-9bc7-247838fc428c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/servers/templates/bicep/cpupercent_a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.bicep b/services/DBforPostgreSQL/servers/templates/bicep/cpupercent_a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.bicep
index 85037e236..b1e043348 100644
--- a/services/DBforPostgreSQL/servers/templates/bicep/cpupercent_a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.bicep
+++ b/services/DBforPostgreSQL/servers/templates/bicep/cpupercent_a2b3fa9d-f7e8-4d1e-967c-3d661bc06708.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/servers/templates/bicep/ioconsumptionpercent_ea7248bd-f96c-4391-ac48-c95312441028.bicep b/services/DBforPostgreSQL/servers/templates/bicep/ioconsumptionpercent_ea7248bd-f96c-4391-ac48-c95312441028.bicep
index 664414d7e..f953ced13 100644
--- a/services/DBforPostgreSQL/servers/templates/bicep/ioconsumptionpercent_ea7248bd-f96c-4391-ac48-c95312441028.bicep
+++ b/services/DBforPostgreSQL/servers/templates/bicep/ioconsumptionpercent_ea7248bd-f96c-4391-ac48-c95312441028.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/servers/templates/bicep/memorypercent_1d53e3ac-e98a-426c-81f1-aa1834c49692.bicep b/services/DBforPostgreSQL/servers/templates/bicep/memorypercent_1d53e3ac-e98a-426c-81f1-aa1834c49692.bicep
index 327251236..b91e5113c 100644
--- a/services/DBforPostgreSQL/servers/templates/bicep/memorypercent_1d53e3ac-e98a-426c-81f1-aa1834c49692.bicep
+++ b/services/DBforPostgreSQL/servers/templates/bicep/memorypercent_1d53e3ac-e98a-426c-81f1-aa1834c49692.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/servers/templates/bicep/pgreplicalogdelayinseconds_90c0997a-f96e-4a34-87c7-c394c6e8b940.bicep b/services/DBforPostgreSQL/servers/templates/bicep/pgreplicalogdelayinseconds_90c0997a-f96e-4a34-87c7-c394c6e8b940.bicep
index 2deafc8f5..2eea8af67 100644
--- a/services/DBforPostgreSQL/servers/templates/bicep/pgreplicalogdelayinseconds_90c0997a-f96e-4a34-87c7-c394c6e8b940.bicep
+++ b/services/DBforPostgreSQL/servers/templates/bicep/pgreplicalogdelayinseconds_90c0997a-f96e-4a34-87c7-c394c6e8b940.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/servers/templates/bicep/serverlogstoragepercent_56a13163-c2b6-4235-96bd-ef1e373b19ba.bicep b/services/DBforPostgreSQL/servers/templates/bicep/serverlogstoragepercent_56a13163-c2b6-4235-96bd-ef1e373b19ba.bicep
index 8a583d223..a9a16e167 100644
--- a/services/DBforPostgreSQL/servers/templates/bicep/serverlogstoragepercent_56a13163-c2b6-4235-96bd-ef1e373b19ba.bicep
+++ b/services/DBforPostgreSQL/servers/templates/bicep/serverlogstoragepercent_56a13163-c2b6-4235-96bd-ef1e373b19ba.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DBforPostgreSQL/servers/templates/bicep/storagepercent_e031f8bf-ed3f-4a41-87fe-b301c1d02367.bicep b/services/DBforPostgreSQL/servers/templates/bicep/storagepercent_e031f8bf-ed3f-4a41-87fe-b301c1d02367.bicep
index 9532a470b..f45643303 100644
--- a/services/DBforPostgreSQL/servers/templates/bicep/storagepercent_e031f8bf-ed3f-4a41-87fe-b301c1d02367.bicep
+++ b/services/DBforPostgreSQL/servers/templates/bicep/storagepercent_e031f8bf-ed3f-4a41-87fe-b301c1d02367.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/arm/ActivityFailedRuns_980f53cb-3eef-4263-952e-e69709e2a6e7.json b/services/DataFactory/factories/templates/arm/ActivityFailedRuns_980f53cb-3eef-4263-952e-e69709e2a6e7.json
index 9b0e20a95..26f7e5bdb 100644
--- a/services/DataFactory/factories/templates/arm/ActivityFailedRuns_980f53cb-3eef-4263-952e-e69709e2a6e7.json
+++ b/services/DataFactory/factories/templates/arm/ActivityFailedRuns_980f53cb-3eef-4263-952e-e69709e2a6e7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/ActivitySucceededRuns_321c2df7-c548-4e06-8729-8132b4dc3386.json b/services/DataFactory/factories/templates/arm/ActivitySucceededRuns_321c2df7-c548-4e06-8729-8132b4dc3386.json
index ac0cf1373..21fbb93de 100644
--- a/services/DataFactory/factories/templates/arm/ActivitySucceededRuns_321c2df7-c548-4e06-8729-8132b4dc3386.json
+++ b/services/DataFactory/factories/templates/arm/ActivitySucceededRuns_321c2df7-c548-4e06-8729-8132b4dc3386.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/FactorySizeInGbUnits_08bfad59-0c23-4e6b-b577-e325f445a2cc.json b/services/DataFactory/factories/templates/arm/FactorySizeInGbUnits_08bfad59-0c23-4e6b-b577-e325f445a2cc.json
index 42d322948..725d4fd70 100644
--- a/services/DataFactory/factories/templates/arm/FactorySizeInGbUnits_08bfad59-0c23-4e6b-b577-e325f445a2cc.json
+++ b/services/DataFactory/factories/templates/arm/FactorySizeInGbUnits_08bfad59-0c23-4e6b-b577-e325f445a2cc.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/IntegrationRuntimeAvailableMemory_e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.json b/services/DataFactory/factories/templates/arm/IntegrationRuntimeAvailableMemory_e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.json
index 6c358a8d1..68110dd8a 100644
--- a/services/DataFactory/factories/templates/arm/IntegrationRuntimeAvailableMemory_e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.json
+++ b/services/DataFactory/factories/templates/arm/IntegrationRuntimeAvailableMemory_e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/IntegrationRuntimeAvailableNodeNumber_4b40d85d-f0be-41e5-9d60-ad9a99c54a41.json b/services/DataFactory/factories/templates/arm/IntegrationRuntimeAvailableNodeNumber_4b40d85d-f0be-41e5-9d60-ad9a99c54a41.json
index 7df06e1e4..a33a0503b 100644
--- a/services/DataFactory/factories/templates/arm/IntegrationRuntimeAvailableNodeNumber_4b40d85d-f0be-41e5-9d60-ad9a99c54a41.json
+++ b/services/DataFactory/factories/templates/arm/IntegrationRuntimeAvailableNodeNumber_4b40d85d-f0be-41e5-9d60-ad9a99c54a41.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/IntegrationRuntimeCpuPercentage_473c5450-95cc-4f86-bb8a-d0a06edd1357.json b/services/DataFactory/factories/templates/arm/IntegrationRuntimeCpuPercentage_473c5450-95cc-4f86-bb8a-d0a06edd1357.json
index a07cd77c8..d6855d6f7 100644
--- a/services/DataFactory/factories/templates/arm/IntegrationRuntimeCpuPercentage_473c5450-95cc-4f86-bb8a-d0a06edd1357.json
+++ b/services/DataFactory/factories/templates/arm/IntegrationRuntimeCpuPercentage_473c5450-95cc-4f86-bb8a-d0a06edd1357.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/MaxAllowedFactorySizeInGbUnits_71d5d464-ae1c-4383-835f-bb7369e307ea.json b/services/DataFactory/factories/templates/arm/MaxAllowedFactorySizeInGbUnits_71d5d464-ae1c-4383-835f-bb7369e307ea.json
index 84ece4782..656eeb273 100644
--- a/services/DataFactory/factories/templates/arm/MaxAllowedFactorySizeInGbUnits_71d5d464-ae1c-4383-835f-bb7369e307ea.json
+++ b/services/DataFactory/factories/templates/arm/MaxAllowedFactorySizeInGbUnits_71d5d464-ae1c-4383-835f-bb7369e307ea.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/MaxAllowedResourceCount_a678b284-d23b-46e4-a8fa-75bb744a53bb.json b/services/DataFactory/factories/templates/arm/MaxAllowedResourceCount_a678b284-d23b-46e4-a8fa-75bb744a53bb.json
index 01d0cd807..198d7d34a 100644
--- a/services/DataFactory/factories/templates/arm/MaxAllowedResourceCount_a678b284-d23b-46e4-a8fa-75bb744a53bb.json
+++ b/services/DataFactory/factories/templates/arm/MaxAllowedResourceCount_a678b284-d23b-46e4-a8fa-75bb744a53bb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/PipelineCancelledRuns_f5e0a050-1994-4864-b2c3-a09dc77fb5b4.json b/services/DataFactory/factories/templates/arm/PipelineCancelledRuns_f5e0a050-1994-4864-b2c3-a09dc77fb5b4.json
index 1b106cd86..0e87dc52e 100644
--- a/services/DataFactory/factories/templates/arm/PipelineCancelledRuns_f5e0a050-1994-4864-b2c3-a09dc77fb5b4.json
+++ b/services/DataFactory/factories/templates/arm/PipelineCancelledRuns_f5e0a050-1994-4864-b2c3-a09dc77fb5b4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/PipelineElapsedTimeRuns_df4f3e6f-757e-4fa0-a411-b2cdf4039649.json b/services/DataFactory/factories/templates/arm/PipelineElapsedTimeRuns_df4f3e6f-757e-4fa0-a411-b2cdf4039649.json
index a1042571f..f61e4e32b 100644
--- a/services/DataFactory/factories/templates/arm/PipelineElapsedTimeRuns_df4f3e6f-757e-4fa0-a411-b2cdf4039649.json
+++ b/services/DataFactory/factories/templates/arm/PipelineElapsedTimeRuns_df4f3e6f-757e-4fa0-a411-b2cdf4039649.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/PipelineFailedRuns_2dd0b760-3235-479d-86d4-c152ca76b7e8.json b/services/DataFactory/factories/templates/arm/PipelineFailedRuns_2dd0b760-3235-479d-86d4-c152ca76b7e8.json
index b960fd646..035e4812c 100644
--- a/services/DataFactory/factories/templates/arm/PipelineFailedRuns_2dd0b760-3235-479d-86d4-c152ca76b7e8.json
+++ b/services/DataFactory/factories/templates/arm/PipelineFailedRuns_2dd0b760-3235-479d-86d4-c152ca76b7e8.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/PipelineSucceededRuns_47615ecc-bf5d-47e2-8c10-f8411e6c5d56.json b/services/DataFactory/factories/templates/arm/PipelineSucceededRuns_47615ecc-bf5d-47e2-8c10-f8411e6c5d56.json
index e6db0d7ce..07010a326 100644
--- a/services/DataFactory/factories/templates/arm/PipelineSucceededRuns_47615ecc-bf5d-47e2-8c10-f8411e6c5d56.json
+++ b/services/DataFactory/factories/templates/arm/PipelineSucceededRuns_47615ecc-bf5d-47e2-8c10-f8411e6c5d56.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/ResourceCount_740b104c-1ad2-4ef7-bafc-c98f22551548.json b/services/DataFactory/factories/templates/arm/ResourceCount_740b104c-1ad2-4ef7-bafc-c98f22551548.json
index 99a8916b5..6f041e508 100644
--- a/services/DataFactory/factories/templates/arm/ResourceCount_740b104c-1ad2-4ef7-bafc-c98f22551548.json
+++ b/services/DataFactory/factories/templates/arm/ResourceCount_740b104c-1ad2-4ef7-bafc-c98f22551548.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/SSISIntegrationRuntimeStartFailed_5f2a0272-792a-4cdd-ba94-9f46db438a0e.json b/services/DataFactory/factories/templates/arm/SSISIntegrationRuntimeStartFailed_5f2a0272-792a-4cdd-ba94-9f46db438a0e.json
index 47527d963..e418a6957 100644
--- a/services/DataFactory/factories/templates/arm/SSISIntegrationRuntimeStartFailed_5f2a0272-792a-4cdd-ba94-9f46db438a0e.json
+++ b/services/DataFactory/factories/templates/arm/SSISIntegrationRuntimeStartFailed_5f2a0272-792a-4cdd-ba94-9f46db438a0e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/SSISPackageExecutionFailed_c30b6089-59c5-4452-b382-d33152be9b03.json b/services/DataFactory/factories/templates/arm/SSISPackageExecutionFailed_c30b6089-59c5-4452-b382-d33152be9b03.json
index ad11ec0bc..1fa0adf02 100644
--- a/services/DataFactory/factories/templates/arm/SSISPackageExecutionFailed_c30b6089-59c5-4452-b382-d33152be9b03.json
+++ b/services/DataFactory/factories/templates/arm/SSISPackageExecutionFailed_c30b6089-59c5-4452-b382-d33152be9b03.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/TriggerFailedRuns_9c7bde49-f0c2-4a07-b150-5dc9464fcf29.json b/services/DataFactory/factories/templates/arm/TriggerFailedRuns_9c7bde49-f0c2-4a07-b150-5dc9464fcf29.json
index 2eff6bd02..0ecc1a3a7 100644
--- a/services/DataFactory/factories/templates/arm/TriggerFailedRuns_9c7bde49-f0c2-4a07-b150-5dc9464fcf29.json
+++ b/services/DataFactory/factories/templates/arm/TriggerFailedRuns_9c7bde49-f0c2-4a07-b150-5dc9464fcf29.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/arm/TriggerSucceededRuns_b8286cfa-9f86-4309-954b-ef69a6d8982d.json b/services/DataFactory/factories/templates/arm/TriggerSucceededRuns_b8286cfa-9f86-4309-954b-ef69a6d8982d.json
index 60e76f402..e35348785 100644
--- a/services/DataFactory/factories/templates/arm/TriggerSucceededRuns_b8286cfa-9f86-4309-954b-ef69a6d8982d.json
+++ b/services/DataFactory/factories/templates/arm/TriggerSucceededRuns_b8286cfa-9f86-4309-954b-ef69a6d8982d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DataFactory/factories/templates/bicep/ActivityFailedRuns_980f53cb-3eef-4263-952e-e69709e2a6e7.bicep b/services/DataFactory/factories/templates/bicep/ActivityFailedRuns_980f53cb-3eef-4263-952e-e69709e2a6e7.bicep
index a9d6f1588..f959e8492 100644
--- a/services/DataFactory/factories/templates/bicep/ActivityFailedRuns_980f53cb-3eef-4263-952e-e69709e2a6e7.bicep
+++ b/services/DataFactory/factories/templates/bicep/ActivityFailedRuns_980f53cb-3eef-4263-952e-e69709e2a6e7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/ActivitySucceededRuns_321c2df7-c548-4e06-8729-8132b4dc3386.bicep b/services/DataFactory/factories/templates/bicep/ActivitySucceededRuns_321c2df7-c548-4e06-8729-8132b4dc3386.bicep
index 45d533d22..622195d6a 100644
--- a/services/DataFactory/factories/templates/bicep/ActivitySucceededRuns_321c2df7-c548-4e06-8729-8132b4dc3386.bicep
+++ b/services/DataFactory/factories/templates/bicep/ActivitySucceededRuns_321c2df7-c548-4e06-8729-8132b4dc3386.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/FactorySizeInGbUnits_08bfad59-0c23-4e6b-b577-e325f445a2cc.bicep b/services/DataFactory/factories/templates/bicep/FactorySizeInGbUnits_08bfad59-0c23-4e6b-b577-e325f445a2cc.bicep
index 83a7710a2..896a6dbf3 100644
--- a/services/DataFactory/factories/templates/bicep/FactorySizeInGbUnits_08bfad59-0c23-4e6b-b577-e325f445a2cc.bicep
+++ b/services/DataFactory/factories/templates/bicep/FactorySizeInGbUnits_08bfad59-0c23-4e6b-b577-e325f445a2cc.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/IntegrationRuntimeAvailableMemory_e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.bicep b/services/DataFactory/factories/templates/bicep/IntegrationRuntimeAvailableMemory_e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.bicep
index 2612ac2d3..899433c50 100644
--- a/services/DataFactory/factories/templates/bicep/IntegrationRuntimeAvailableMemory_e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.bicep
+++ b/services/DataFactory/factories/templates/bicep/IntegrationRuntimeAvailableMemory_e8fec7b1-ca81-48cd-a7ea-f81cc2fcb4a5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/IntegrationRuntimeAvailableNodeNumber_4b40d85d-f0be-41e5-9d60-ad9a99c54a41.bicep b/services/DataFactory/factories/templates/bicep/IntegrationRuntimeAvailableNodeNumber_4b40d85d-f0be-41e5-9d60-ad9a99c54a41.bicep
index d679c5c43..322b32a69 100644
--- a/services/DataFactory/factories/templates/bicep/IntegrationRuntimeAvailableNodeNumber_4b40d85d-f0be-41e5-9d60-ad9a99c54a41.bicep
+++ b/services/DataFactory/factories/templates/bicep/IntegrationRuntimeAvailableNodeNumber_4b40d85d-f0be-41e5-9d60-ad9a99c54a41.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/IntegrationRuntimeCpuPercentage_473c5450-95cc-4f86-bb8a-d0a06edd1357.bicep b/services/DataFactory/factories/templates/bicep/IntegrationRuntimeCpuPercentage_473c5450-95cc-4f86-bb8a-d0a06edd1357.bicep
index 97d6eff35..1c03a3d55 100644
--- a/services/DataFactory/factories/templates/bicep/IntegrationRuntimeCpuPercentage_473c5450-95cc-4f86-bb8a-d0a06edd1357.bicep
+++ b/services/DataFactory/factories/templates/bicep/IntegrationRuntimeCpuPercentage_473c5450-95cc-4f86-bb8a-d0a06edd1357.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/MaxAllowedFactorySizeInGbUnits_71d5d464-ae1c-4383-835f-bb7369e307ea.bicep b/services/DataFactory/factories/templates/bicep/MaxAllowedFactorySizeInGbUnits_71d5d464-ae1c-4383-835f-bb7369e307ea.bicep
index b9c08875b..327fec3da 100644
--- a/services/DataFactory/factories/templates/bicep/MaxAllowedFactorySizeInGbUnits_71d5d464-ae1c-4383-835f-bb7369e307ea.bicep
+++ b/services/DataFactory/factories/templates/bicep/MaxAllowedFactorySizeInGbUnits_71d5d464-ae1c-4383-835f-bb7369e307ea.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/MaxAllowedResourceCount_a678b284-d23b-46e4-a8fa-75bb744a53bb.bicep b/services/DataFactory/factories/templates/bicep/MaxAllowedResourceCount_a678b284-d23b-46e4-a8fa-75bb744a53bb.bicep
index a47c0a78d..937c87d21 100644
--- a/services/DataFactory/factories/templates/bicep/MaxAllowedResourceCount_a678b284-d23b-46e4-a8fa-75bb744a53bb.bicep
+++ b/services/DataFactory/factories/templates/bicep/MaxAllowedResourceCount_a678b284-d23b-46e4-a8fa-75bb744a53bb.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/PipelineCancelledRuns_f5e0a050-1994-4864-b2c3-a09dc77fb5b4.bicep b/services/DataFactory/factories/templates/bicep/PipelineCancelledRuns_f5e0a050-1994-4864-b2c3-a09dc77fb5b4.bicep
index 451244970..fc1d242ad 100644
--- a/services/DataFactory/factories/templates/bicep/PipelineCancelledRuns_f5e0a050-1994-4864-b2c3-a09dc77fb5b4.bicep
+++ b/services/DataFactory/factories/templates/bicep/PipelineCancelledRuns_f5e0a050-1994-4864-b2c3-a09dc77fb5b4.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/PipelineElapsedTimeRuns_df4f3e6f-757e-4fa0-a411-b2cdf4039649.bicep b/services/DataFactory/factories/templates/bicep/PipelineElapsedTimeRuns_df4f3e6f-757e-4fa0-a411-b2cdf4039649.bicep
index 2e242fa6f..7e9193e7b 100644
--- a/services/DataFactory/factories/templates/bicep/PipelineElapsedTimeRuns_df4f3e6f-757e-4fa0-a411-b2cdf4039649.bicep
+++ b/services/DataFactory/factories/templates/bicep/PipelineElapsedTimeRuns_df4f3e6f-757e-4fa0-a411-b2cdf4039649.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/PipelineFailedRuns_2dd0b760-3235-479d-86d4-c152ca76b7e8.bicep b/services/DataFactory/factories/templates/bicep/PipelineFailedRuns_2dd0b760-3235-479d-86d4-c152ca76b7e8.bicep
index a9089e873..091ae9a7b 100644
--- a/services/DataFactory/factories/templates/bicep/PipelineFailedRuns_2dd0b760-3235-479d-86d4-c152ca76b7e8.bicep
+++ b/services/DataFactory/factories/templates/bicep/PipelineFailedRuns_2dd0b760-3235-479d-86d4-c152ca76b7e8.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/PipelineSucceededRuns_47615ecc-bf5d-47e2-8c10-f8411e6c5d56.bicep b/services/DataFactory/factories/templates/bicep/PipelineSucceededRuns_47615ecc-bf5d-47e2-8c10-f8411e6c5d56.bicep
index fd232047f..d896de2e9 100644
--- a/services/DataFactory/factories/templates/bicep/PipelineSucceededRuns_47615ecc-bf5d-47e2-8c10-f8411e6c5d56.bicep
+++ b/services/DataFactory/factories/templates/bicep/PipelineSucceededRuns_47615ecc-bf5d-47e2-8c10-f8411e6c5d56.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/ResourceCount_740b104c-1ad2-4ef7-bafc-c98f22551548.bicep b/services/DataFactory/factories/templates/bicep/ResourceCount_740b104c-1ad2-4ef7-bafc-c98f22551548.bicep
index 53a593b1b..21745d1a2 100644
--- a/services/DataFactory/factories/templates/bicep/ResourceCount_740b104c-1ad2-4ef7-bafc-c98f22551548.bicep
+++ b/services/DataFactory/factories/templates/bicep/ResourceCount_740b104c-1ad2-4ef7-bafc-c98f22551548.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/SSISIntegrationRuntimeStartFailed_5f2a0272-792a-4cdd-ba94-9f46db438a0e.bicep b/services/DataFactory/factories/templates/bicep/SSISIntegrationRuntimeStartFailed_5f2a0272-792a-4cdd-ba94-9f46db438a0e.bicep
index bfd80b854..ebbcbca0f 100644
--- a/services/DataFactory/factories/templates/bicep/SSISIntegrationRuntimeStartFailed_5f2a0272-792a-4cdd-ba94-9f46db438a0e.bicep
+++ b/services/DataFactory/factories/templates/bicep/SSISIntegrationRuntimeStartFailed_5f2a0272-792a-4cdd-ba94-9f46db438a0e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/SSISPackageExecutionFailed_c30b6089-59c5-4452-b382-d33152be9b03.bicep b/services/DataFactory/factories/templates/bicep/SSISPackageExecutionFailed_c30b6089-59c5-4452-b382-d33152be9b03.bicep
index f95c9b809..d1319e83d 100644
--- a/services/DataFactory/factories/templates/bicep/SSISPackageExecutionFailed_c30b6089-59c5-4452-b382-d33152be9b03.bicep
+++ b/services/DataFactory/factories/templates/bicep/SSISPackageExecutionFailed_c30b6089-59c5-4452-b382-d33152be9b03.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/TriggerFailedRuns_9c7bde49-f0c2-4a07-b150-5dc9464fcf29.bicep b/services/DataFactory/factories/templates/bicep/TriggerFailedRuns_9c7bde49-f0c2-4a07-b150-5dc9464fcf29.bicep
index e46596850..369928c7a 100644
--- a/services/DataFactory/factories/templates/bicep/TriggerFailedRuns_9c7bde49-f0c2-4a07-b150-5dc9464fcf29.bicep
+++ b/services/DataFactory/factories/templates/bicep/TriggerFailedRuns_9c7bde49-f0c2-4a07-b150-5dc9464fcf29.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DataFactory/factories/templates/bicep/TriggerSucceededRuns_b8286cfa-9f86-4309-954b-ef69a6d8982d.bicep b/services/DataFactory/factories/templates/bicep/TriggerSucceededRuns_b8286cfa-9f86-4309-954b-ef69a6d8982d.bicep
index 96768894c..616cc63e7 100644
--- a/services/DataFactory/factories/templates/bicep/TriggerSucceededRuns_b8286cfa-9f86-4309-954b-ef69a6d8982d.bicep
+++ b/services/DataFactory/factories/templates/bicep/TriggerSucceededRuns_b8286cfa-9f86-4309-954b-ef69a6d8982d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/Capacity85PercentxHostPoolNamex_a8e65618-c367-42bc-916a-b192ddf4c6ca.json b/services/DesktopVirtualization/hostPools/templates/arm/Capacity85PercentxHostPoolNamex_a8e65618-c367-42bc-916a-b192ddf4c6ca.json
index 0e37823c9..719039351 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/Capacity85PercentxHostPoolNamex_a8e65618-c367-42bc-916a-b192ddf4c6ca.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/Capacity85PercentxHostPoolNamex_a8e65618-c367-42bc-916a-b192ddf4c6ca.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/Capacity95PercentxHostPoolNamex_eefabb12-9ce7-4784-911a-c7000424388e.json b/services/DesktopVirtualization/hostPools/templates/arm/Capacity95PercentxHostPoolNamex_eefabb12-9ce7-4784-911a-c7000424388e.json
index f75699b28..3d08d6632 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/Capacity95PercentxHostPoolNamex_eefabb12-9ce7-4784-911a-c7000424388e.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/Capacity95PercentxHostPoolNamex_eefabb12-9ce7-4784-911a-c7000424388e.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixDiskAlreadyInUsexHostPoolNamex_edbbb4d2-00e5-4592-a489-08c2afe37506.json b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixDiskAlreadyInUsexHostPoolNamex_edbbb4d2-00e5-4592-a489-08c2afe37506.json
index f645a32a1..14d2e1303 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixDiskAlreadyInUsexHostPoolNamex_edbbb4d2-00e5-4592-a489-08c2afe37506.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixDiskAlreadyInUsexHostPoolNamex_edbbb4d2-00e5-4592-a489-08c2afe37506.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixDiskCompactFailurexHostPoolNamex_1b3f0c37-61b9-4024-8e4b-17b2279d3306.json b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixDiskCompactFailurexHostPoolNamex_1b3f0c37-61b9-4024-8e4b-17b2279d3306.json
index 5f1ca0931..8aa810be2 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixDiskCompactFailurexHostPoolNamex_1b3f0c37-61b9-4024-8e4b-17b2279d3306.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixDiskCompactFailurexHostPoolNamex_1b3f0c37-61b9-4024-8e4b-17b2279d3306.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixNetworkIssuexHostPoolNamex_d11e2210-d818-43c6-9380-b0f6cd02ed6e.json b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixNetworkIssuexHostPoolNamex_d11e2210-d818-43c6-9380-b0f6cd02ed6e.json
index c34c113b9..d7a8a97f5 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixNetworkIssuexHostPoolNamex_d11e2210-d818-43c6-9380-b0f6cd02ed6e.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixNetworkIssuexHostPoolNamex_d11e2210-d818-43c6-9380-b0f6cd02ed6e.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfileDiskFailedtoAttachxHostPoolNamex_222d5a84-2439-4f76-90a2-a44161eafbb0.json b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfileDiskFailedtoAttachxHostPoolNamex_222d5a84-2439-4f76-90a2-a44161eafbb0.json
index d54596f86..7936f0f8b 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfileDiskFailedtoAttachxHostPoolNamex_222d5a84-2439-4f76-90a2-a44161eafbb0.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfileDiskFailedtoAttachxHostPoolNamex_222d5a84-2439-4f76-90a2-a44161eafbb0.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfilelessthan2xHostPoolNamex_44d508c2-ae0c-487b-bf5f-65422a59cd63.json b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfilelessthan2xHostPoolNamex_44d508c2-ae0c-487b-bf5f-65422a59cd63.json
index 134620ab3..b3582ce44 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfilelessthan2xHostPoolNamex_44d508c2-ae0c-487b-bf5f-65422a59cd63.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfilelessthan2xHostPoolNamex_44d508c2-ae0c-487b-bf5f-65422a59cd63.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfilelessthan5xHostPoolNamex_560c969e-13bd-43bf-8b07-5798f6c4a31c.json b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfilelessthan5xHostPoolNamex_560c969e-13bd-43bf-8b07-5798f6c4a31c.json
index ba1ba8453..bd11d68e1 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfilelessthan5xHostPoolNamex_560c969e-13bd-43bf-8b07-5798f6c4a31c.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixProfilelessthan5xHostPoolNamex_560c969e-13bd-43bf-8b07-5798f6c4a31c.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixServiceDisabledxHostPoolNamex_e03e4072-a5d4-46e8-b5fe-dc586ca56a86.json b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixServiceDisabledxHostPoolNamex_e03e4072-a5d4-46e8-b5fe-dc586ca56a86.json
index 5f8cc4ebe..bb5399f3c 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/FSLogixServiceDisabledxHostPoolNamex_e03e4072-a5d4-46e8-b5fe-dc586ca56a86.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/FSLogixServiceDisabledxHostPoolNamex_e03e4072-a5d4-46e8-b5fe-dc586ca56a86.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/LocalDiskSpacelessthan10xHostPoolNamex_1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.json b/services/DesktopVirtualization/hostPools/templates/arm/LocalDiskSpacelessthan10xHostPoolNamex_1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.json
index aa31f1c2a..1959629e0 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/LocalDiskSpacelessthan10xHostPoolNamex_1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/LocalDiskSpacelessthan10xHostPoolNamex_1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/LocalDiskSpacelessthan5xHostPoolNamex_2f25b89a-6c5b-4a74-9584-31fe13802d3c.json b/services/DesktopVirtualization/hostPools/templates/arm/LocalDiskSpacelessthan5xHostPoolNamex_2f25b89a-6c5b-4a74-9584-31fe13802d3c.json
index 2a2849014..9a2d93319 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/LocalDiskSpacelessthan5xHostPoolNamex_2f25b89a-6c5b-4a74-9584-31fe13802d3c.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/LocalDiskSpacelessthan5xHostPoolNamex_2f25b89a-6c5b-4a74-9584-31fe13802d3c.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/NoResourcesAvailablexHostPoolNamex_691468ac-c0a5-45cf-81d1-41032c7c766a.json b/services/DesktopVirtualization/hostPools/templates/arm/NoResourcesAvailablexHostPoolNamex_691468ac-c0a5-45cf-81d1-41032c7c766a.json
index a046c9b71..be1fbc4b1 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/NoResourcesAvailablexHostPoolNamex_691468ac-c0a5-45cf-81d1-41032c7c766a.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/NoResourcesAvailablexHostPoolNamex_691468ac-c0a5-45cf-81d1-41032c7c766a.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/PersonalDesktopAssignedHealthcheckFailurexHostPoolNamex_55c5591a-60bb-48a0-bdd5-4c35f6293278.json b/services/DesktopVirtualization/hostPools/templates/arm/PersonalDesktopAssignedHealthcheckFailurexHostPoolNamex_55c5591a-60bb-48a0-bdd5-4c35f6293278.json
index 91a41bd92..84b1c7f89 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/PersonalDesktopAssignedHealthcheckFailurexHostPoolNamex_55c5591a-60bb-48a0-bdd5-4c35f6293278.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/PersonalDesktopAssignedHealthcheckFailurexHostPoolNamex_55c5591a-60bb-48a0-bdd5-4c35f6293278.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/SessionHostHealthcheckFailurexHostPoolNamex_c87ad0cd-e867-4d18-b61c-ec2a092ef459.json b/services/DesktopVirtualization/hostPools/templates/arm/SessionHostHealthcheckFailurexHostPoolNamex_c87ad0cd-e867-4d18-b61c-ec2a092ef459.json
index 917f2b9bd..8304adbf0 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/SessionHostHealthcheckFailurexHostPoolNamex_c87ad0cd-e867-4d18-b61c-ec2a092ef459.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/SessionHostHealthcheckFailurexHostPoolNamex_c87ad0cd-e867-4d18-b61c-ec2a092ef459.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/UserConnectiontoSessionHostFailurexHostPoolNamex_1f0258f8-bc06-4593-9d77-eba879f5b62d.json b/services/DesktopVirtualization/hostPools/templates/arm/UserConnectiontoSessionHostFailurexHostPoolNamex_1f0258f8-bc06-4593-9d77-eba879f5b62d.json
index b5057c39f..624450e4f 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/UserConnectiontoSessionHostFailurexHostPoolNamex_1f0258f8-bc06-4593-9d77-eba879f5b62d.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/UserConnectiontoSessionHostFailurexHostPoolNamex_1f0258f8-bc06-4593-9d77-eba879f5b62d.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/UserDisconnectedover24hxHostPoolNamex_b31d7620-f79b-4a44-b4f6-e96563040ea4.json b/services/DesktopVirtualization/hostPools/templates/arm/UserDisconnectedover24hxHostPoolNamex_b31d7620-f79b-4a44-b4f6-e96563040ea4.json
index 5d83ac094..e78b0590d 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/UserDisconnectedover24hxHostPoolNamex_b31d7620-f79b-4a44-b4f6-e96563040ea4.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/UserDisconnectedover24hxHostPoolNamex_b31d7620-f79b-4a44-b4f6-e96563040ea4.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/arm/UserDisconnectedover72hxHostPoolNamex_c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.json b/services/DesktopVirtualization/hostPools/templates/arm/UserDisconnectedover72hxHostPoolNamex_c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.json
index bd61b44fb..600832ae7 100644
--- a/services/DesktopVirtualization/hostPools/templates/arm/UserDisconnectedover72hxHostPoolNamex_c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.json
+++ b/services/DesktopVirtualization/hostPools/templates/arm/UserDisconnectedover72hxHostPoolNamex_c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/Capacity85PercentxHostPoolNamex_a8e65618-c367-42bc-916a-b192ddf4c6ca.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/Capacity85PercentxHostPoolNamex_a8e65618-c367-42bc-916a-b192ddf4c6ca.bicep
index cae6ef504..92e4fa7a1 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/Capacity85PercentxHostPoolNamex_a8e65618-c367-42bc-916a-b192ddf4c6ca.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/Capacity85PercentxHostPoolNamex_a8e65618-c367-42bc-916a-b192ddf4c6ca.bicep
@@ -182,7 +182,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/Capacity95PercentxHostPoolNamex_eefabb12-9ce7-4784-911a-c7000424388e.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/Capacity95PercentxHostPoolNamex_eefabb12-9ce7-4784-911a-c7000424388e.bicep
index 80115f71c..e50b75d49 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/Capacity95PercentxHostPoolNamex_eefabb12-9ce7-4784-911a-c7000424388e.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/Capacity95PercentxHostPoolNamex_eefabb12-9ce7-4784-911a-c7000424388e.bicep
@@ -182,7 +182,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixDiskAlreadyInUsexHostPoolNamex_edbbb4d2-00e5-4592-a489-08c2afe37506.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixDiskAlreadyInUsexHostPoolNamex_edbbb4d2-00e5-4592-a489-08c2afe37506.bicep
index cd5cb0b19..f194094ca 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixDiskAlreadyInUsexHostPoolNamex_edbbb4d2-00e5-4592-a489-08c2afe37506.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixDiskAlreadyInUsexHostPoolNamex_edbbb4d2-00e5-4592-a489-08c2afe37506.bicep
@@ -172,7 +172,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixDiskCompactFailurexHostPoolNamex_1b3f0c37-61b9-4024-8e4b-17b2279d3306.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixDiskCompactFailurexHostPoolNamex_1b3f0c37-61b9-4024-8e4b-17b2279d3306.bicep
index 7ddabb1a3..12852a5ea 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixDiskCompactFailurexHostPoolNamex_1b3f0c37-61b9-4024-8e4b-17b2279d3306.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixDiskCompactFailurexHostPoolNamex_1b3f0c37-61b9-4024-8e4b-17b2279d3306.bicep
@@ -172,7 +172,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixNetworkIssuexHostPoolNamex_d11e2210-d818-43c6-9380-b0f6cd02ed6e.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixNetworkIssuexHostPoolNamex_d11e2210-d818-43c6-9380-b0f6cd02ed6e.bicep
index f527a8d6f..13cc0b7d9 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixNetworkIssuexHostPoolNamex_d11e2210-d818-43c6-9380-b0f6cd02ed6e.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixNetworkIssuexHostPoolNamex_d11e2210-d818-43c6-9380-b0f6cd02ed6e.bicep
@@ -172,7 +172,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfileDiskFailedtoAttachxHostPoolNamex_222d5a84-2439-4f76-90a2-a44161eafbb0.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfileDiskFailedtoAttachxHostPoolNamex_222d5a84-2439-4f76-90a2-a44161eafbb0.bicep
index 915b9c0bd..4baf04caf 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfileDiskFailedtoAttachxHostPoolNamex_222d5a84-2439-4f76-90a2-a44161eafbb0.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfileDiskFailedtoAttachxHostPoolNamex_222d5a84-2439-4f76-90a2-a44161eafbb0.bicep
@@ -172,7 +172,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfilelessthan2xHostPoolNamex_44d508c2-ae0c-487b-bf5f-65422a59cd63.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfilelessthan2xHostPoolNamex_44d508c2-ae0c-487b-bf5f-65422a59cd63.bicep
index fc9be28a6..468396af3 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfilelessthan2xHostPoolNamex_44d508c2-ae0c-487b-bf5f-65422a59cd63.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfilelessthan2xHostPoolNamex_44d508c2-ae0c-487b-bf5f-65422a59cd63.bicep
@@ -172,7 +172,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfilelessthan5xHostPoolNamex_560c969e-13bd-43bf-8b07-5798f6c4a31c.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfilelessthan5xHostPoolNamex_560c969e-13bd-43bf-8b07-5798f6c4a31c.bicep
index db3a08b42..978848c30 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfilelessthan5xHostPoolNamex_560c969e-13bd-43bf-8b07-5798f6c4a31c.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixProfilelessthan5xHostPoolNamex_560c969e-13bd-43bf-8b07-5798f6c4a31c.bicep
@@ -172,7 +172,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixServiceDisabledxHostPoolNamex_e03e4072-a5d4-46e8-b5fe-dc586ca56a86.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixServiceDisabledxHostPoolNamex_e03e4072-a5d4-46e8-b5fe-dc586ca56a86.bicep
index d6adc57a6..464215656 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixServiceDisabledxHostPoolNamex_e03e4072-a5d4-46e8-b5fe-dc586ca56a86.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/FSLogixServiceDisabledxHostPoolNamex_e03e4072-a5d4-46e8-b5fe-dc586ca56a86.bicep
@@ -172,7 +172,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/LocalDiskSpacelessthan10xHostPoolNamex_1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/LocalDiskSpacelessthan10xHostPoolNamex_1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.bicep
index a519e6436..582d0eaef 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/LocalDiskSpacelessthan10xHostPoolNamex_1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/LocalDiskSpacelessthan10xHostPoolNamex_1749f4f8-e4cd-4bc8-b2f8-7aa9b98095da.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/LocalDiskSpacelessthan5xHostPoolNamex_2f25b89a-6c5b-4a74-9584-31fe13802d3c.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/LocalDiskSpacelessthan5xHostPoolNamex_2f25b89a-6c5b-4a74-9584-31fe13802d3c.bicep
index 8c453d536..9b074b03b 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/LocalDiskSpacelessthan5xHostPoolNamex_2f25b89a-6c5b-4a74-9584-31fe13802d3c.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/LocalDiskSpacelessthan5xHostPoolNamex_2f25b89a-6c5b-4a74-9584-31fe13802d3c.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/NoResourcesAvailablexHostPoolNamex_691468ac-c0a5-45cf-81d1-41032c7c766a.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/NoResourcesAvailablexHostPoolNamex_691468ac-c0a5-45cf-81d1-41032c7c766a.bicep
index 509460123..d97331944 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/NoResourcesAvailablexHostPoolNamex_691468ac-c0a5-45cf-81d1-41032c7c766a.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/NoResourcesAvailablexHostPoolNamex_691468ac-c0a5-45cf-81d1-41032c7c766a.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/PersonalDesktopAssignedHealthcheckFailurexHostPoolNamex_55c5591a-60bb-48a0-bdd5-4c35f6293278.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/PersonalDesktopAssignedHealthcheckFailurexHostPoolNamex_55c5591a-60bb-48a0-bdd5-4c35f6293278.bicep
index ff6c1aba0..a22346c3a 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/PersonalDesktopAssignedHealthcheckFailurexHostPoolNamex_55c5591a-60bb-48a0-bdd5-4c35f6293278.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/PersonalDesktopAssignedHealthcheckFailurexHostPoolNamex_55c5591a-60bb-48a0-bdd5-4c35f6293278.bicep
@@ -172,7 +172,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/SessionHostHealthcheckFailurexHostPoolNamex_c87ad0cd-e867-4d18-b61c-ec2a092ef459.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/SessionHostHealthcheckFailurexHostPoolNamex_c87ad0cd-e867-4d18-b61c-ec2a092ef459.bicep
index 60799bf5b..57c2a03f4 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/SessionHostHealthcheckFailurexHostPoolNamex_c87ad0cd-e867-4d18-b61c-ec2a092ef459.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/SessionHostHealthcheckFailurexHostPoolNamex_c87ad0cd-e867-4d18-b61c-ec2a092ef459.bicep
@@ -172,7 +172,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/UserConnectiontoSessionHostFailurexHostPoolNamex_1f0258f8-bc06-4593-9d77-eba879f5b62d.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/UserConnectiontoSessionHostFailurexHostPoolNamex_1f0258f8-bc06-4593-9d77-eba879f5b62d.bicep
index d4714481d..db48c53ab 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/UserConnectiontoSessionHostFailurexHostPoolNamex_1f0258f8-bc06-4593-9d77-eba879f5b62d.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/UserConnectiontoSessionHostFailurexHostPoolNamex_1f0258f8-bc06-4593-9d77-eba879f5b62d.bicep
@@ -197,7 +197,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/UserDisconnectedover24hxHostPoolNamex_b31d7620-f79b-4a44-b4f6-e96563040ea4.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/UserDisconnectedover24hxHostPoolNamex_b31d7620-f79b-4a44-b4f6-e96563040ea4.bicep
index 5b47ff08b..7d1d720bd 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/UserDisconnectedover24hxHostPoolNamex_b31d7620-f79b-4a44-b4f6-e96563040ea4.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/UserDisconnectedover24hxHostPoolNamex_b31d7620-f79b-4a44-b4f6-e96563040ea4.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DesktopVirtualization/hostPools/templates/bicep/UserDisconnectedover72hxHostPoolNamex_c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.bicep b/services/DesktopVirtualization/hostPools/templates/bicep/UserDisconnectedover72hxHostPoolNamex_c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.bicep
index db3b6f521..70de243ea 100644
--- a/services/DesktopVirtualization/hostPools/templates/bicep/UserDisconnectedover72hxHostPoolNamex_c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.bicep
+++ b/services/DesktopVirtualization/hostPools/templates/bicep/UserDisconnectedover72hxHostPoolNamex_c2c03bd2-0b7c-43cb-9e83-9da78cc4eb6e.bicep
@@ -162,7 +162,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Devices/IotHubs/templates/arm/d2ctelemetryegressdropped_d5a028d1-ae0e-4349-8a79-630f891c8235.json b/services/Devices/IotHubs/templates/arm/d2ctelemetryegressdropped_d5a028d1-ae0e-4349-8a79-630f891c8235.json
index dbeaf3a01..14d12fe92 100644
--- a/services/Devices/IotHubs/templates/arm/d2ctelemetryegressdropped_d5a028d1-ae0e-4349-8a79-630f891c8235.json
+++ b/services/Devices/IotHubs/templates/arm/d2ctelemetryegressdropped_d5a028d1-ae0e-4349-8a79-630f891c8235.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Devices/IotHubs/templates/arm/d2ctelemetryingresssendThrottle_65deae31-85e8-477a-b17e-50d2d10cd7b0.json b/services/Devices/IotHubs/templates/arm/d2ctelemetryingresssendThrottle_65deae31-85e8-477a-b17e-50d2d10cd7b0.json
index ca1aa0471..7800cd0f8 100644
--- a/services/Devices/IotHubs/templates/arm/d2ctelemetryingresssendThrottle_65deae31-85e8-477a-b17e-50d2d10cd7b0.json
+++ b/services/Devices/IotHubs/templates/arm/d2ctelemetryingresssendThrottle_65deae31-85e8-477a-b17e-50d2d10cd7b0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Devices/IotHubs/templates/arm/dailyMessageQuotaUsed_d78fc655-68ca-4877-ac60-7fc805f1ae94.json b/services/Devices/IotHubs/templates/arm/dailyMessageQuotaUsed_d78fc655-68ca-4877-ac60-7fc805f1ae94.json
index 8db102757..4711ab0fd 100644
--- a/services/Devices/IotHubs/templates/arm/dailyMessageQuotaUsed_d78fc655-68ca-4877-ac60-7fc805f1ae94.json
+++ b/services/Devices/IotHubs/templates/arm/dailyMessageQuotaUsed_d78fc655-68ca-4877-ac60-7fc805f1ae94.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Devices/IotHubs/templates/bicep/d2ctelemetryegressdropped_d5a028d1-ae0e-4349-8a79-630f891c8235.bicep b/services/Devices/IotHubs/templates/bicep/d2ctelemetryegressdropped_d5a028d1-ae0e-4349-8a79-630f891c8235.bicep
index 8441fcec5..9f946edfa 100644
--- a/services/Devices/IotHubs/templates/bicep/d2ctelemetryegressdropped_d5a028d1-ae0e-4349-8a79-630f891c8235.bicep
+++ b/services/Devices/IotHubs/templates/bicep/d2ctelemetryegressdropped_d5a028d1-ae0e-4349-8a79-630f891c8235.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Devices/IotHubs/templates/bicep/d2ctelemetryingresssendThrottle_65deae31-85e8-477a-b17e-50d2d10cd7b0.bicep b/services/Devices/IotHubs/templates/bicep/d2ctelemetryingresssendThrottle_65deae31-85e8-477a-b17e-50d2d10cd7b0.bicep
index 1535ba8bc..045cc0a0d 100644
--- a/services/Devices/IotHubs/templates/bicep/d2ctelemetryingresssendThrottle_65deae31-85e8-477a-b17e-50d2d10cd7b0.bicep
+++ b/services/Devices/IotHubs/templates/bicep/d2ctelemetryingresssendThrottle_65deae31-85e8-477a-b17e-50d2d10cd7b0.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Devices/IotHubs/templates/bicep/dailyMessageQuotaUsed_d78fc655-68ca-4877-ac60-7fc805f1ae94.bicep b/services/Devices/IotHubs/templates/bicep/dailyMessageQuotaUsed_d78fc655-68ca-4877-ac60-7fc805f1ae94.bicep
index 4d75f05d6..dc0c851a5 100644
--- a/services/Devices/IotHubs/templates/bicep/dailyMessageQuotaUsed_d78fc655-68ca-4877-ac60-7fc805f1ae94.bicep
+++ b/services/Devices/IotHubs/templates/bicep/dailyMessageQuotaUsed_d78fc655-68ca-4877-ac60-7fc805f1ae94.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/DataUsage_0914c189-0adc-45d6-8704-d2ae73b9b7b6.json b/services/DocumentDB/databaseAccounts/templates/arm/DataUsage_0914c189-0adc-45d6-8704-d2ae73b9b7b6.json
index 3a69cc053..49efc9647 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/DataUsage_0914c189-0adc-45d6-8704-d2ae73b9b7b6.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/DataUsage_0914c189-0adc-45d6-8704-d2ae73b9b7b6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/MongoRequests_3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.json b/services/DocumentDB/databaseAccounts/templates/arm/MongoRequests_3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.json
index 0c8efdd4c..7424b0c82 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/MongoRequests_3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/MongoRequests_3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/NormalizedRUConsumption_9bae539a-12ed-46e2-b105-101ce036c9a4.json b/services/DocumentDB/databaseAccounts/templates/arm/NormalizedRUConsumption_9bae539a-12ed-46e2-b105-101ce036c9a4.json
index 6e51260c1..80d90c28a 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/NormalizedRUConsumption_9bae539a-12ed-46e2-b105-101ce036c9a4.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/NormalizedRUConsumption_9bae539a-12ed-46e2-b105-101ce036c9a4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/OfflineRegion_0cb53be3-76b5-44be-9f32-bcc821be34b6.json b/services/DocumentDB/databaseAccounts/templates/arm/OfflineRegion_0cb53be3-76b5-44be-9f32-bcc821be34b6.json
index c0ce89b8b..5556c3930 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/OfflineRegion_0cb53be3-76b5-44be-9f32-bcc821be34b6.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/OfflineRegion_0cb53be3-76b5-44be-9f32-bcc821be34b6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/ProvisionedThroughput_f77ce9c2-bb95-47e7-8e5d-75d5c098f489.json b/services/DocumentDB/databaseAccounts/templates/arm/ProvisionedThroughput_f77ce9c2-bb95-47e7-8e5d-75d5c098f489.json
index 3e3ed5b56..33647fea8 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/ProvisionedThroughput_f77ce9c2-bb95-47e7-8e5d-75d5c098f489.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/ProvisionedThroughput_f77ce9c2-bb95-47e7-8e5d-75d5c098f489.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/RegionFailover_9c41c539-b81b-4917-b04a-e67225f78e75.json b/services/DocumentDB/databaseAccounts/templates/arm/RegionFailover_9c41c539-b81b-4917-b04a-e67225f78e75.json
index 195f55dfb..ac5d1718e 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/RegionFailover_9c41c539-b81b-4917-b04a-e67225f78e75.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/RegionFailover_9c41c539-b81b-4917-b04a-e67225f78e75.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/RemoveRegion_228e104f-002a-441d-91ec-6140f233c1a4.json b/services/DocumentDB/databaseAccounts/templates/arm/RemoveRegion_228e104f-002a-441d-91ec-6140f233c1a4.json
index b0cb177df..30f63730b 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/RemoveRegion_228e104f-002a-441d-91ec-6140f233c1a4.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/RemoveRegion_228e104f-002a-441d-91ec-6140f233c1a4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/ReplicationLatency_cf0655a4-042d-4979-bbc7-5559eaa8f2b9.json b/services/DocumentDB/databaseAccounts/templates/arm/ReplicationLatency_cf0655a4-042d-4979-bbc7-5559eaa8f2b9.json
index 8a7ccbbd1..efaf4a035 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/ReplicationLatency_cf0655a4-042d-4979-bbc7-5559eaa8f2b9.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/ReplicationLatency_cf0655a4-042d-4979-bbc7-5559eaa8f2b9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/ServerSideLatency_28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.json b/services/DocumentDB/databaseAccounts/templates/arm/ServerSideLatency_28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.json
index caa05b997..bf057c14b 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/ServerSideLatency_28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/ServerSideLatency_28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/ServiceAvailability_ee10b769-b38b-44d1-9fd3-926b8dca4c41.json b/services/DocumentDB/databaseAccounts/templates/arm/ServiceAvailability_ee10b769-b38b-44d1-9fd3-926b8dca4c41.json
index eb5c66831..5fba8c3d0 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/ServiceAvailability_ee10b769-b38b-44d1-9fd3-926b8dca4c41.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/ServiceAvailability_ee10b769-b38b-44d1-9fd3-926b8dca4c41.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/SqlContainerDelete_faf5510e-28b7-42c9-8ad1-de68a5737eaf.json b/services/DocumentDB/databaseAccounts/templates/arm/SqlContainerDelete_faf5510e-28b7-42c9-8ad1-de68a5737eaf.json
index 694af88a5..3d64c6139 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/SqlContainerDelete_faf5510e-28b7-42c9-8ad1-de68a5737eaf.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/SqlContainerDelete_faf5510e-28b7-42c9-8ad1-de68a5737eaf.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/SqlDatabaseDelete_a7958120-a386-46d0-9790-e80bfa72fb22.json b/services/DocumentDB/databaseAccounts/templates/arm/SqlDatabaseDelete_a7958120-a386-46d0-9790-e80bfa72fb22.json
index e9deb1dfa..8f41303ac 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/SqlDatabaseDelete_a7958120-a386-46d0-9790-e80bfa72fb22.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/SqlDatabaseDelete_a7958120-a386-46d0-9790-e80bfa72fb22.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/TotalRequestUnits_14fc7c6b-484f-427f-a1d2-94cded799f88.json b/services/DocumentDB/databaseAccounts/templates/arm/TotalRequestUnits_14fc7c6b-484f-427f-a1d2-94cded799f88.json
index f5eb06227..d9ff24552 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/TotalRequestUnits_14fc7c6b-484f-427f-a1d2-94cded799f88.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/TotalRequestUnits_14fc7c6b-484f-427f-a1d2-94cded799f88.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/TotalRequests_2a1deb2d-1fc0-499b-a828-04aeece855fe.json b/services/DocumentDB/databaseAccounts/templates/arm/TotalRequests_2a1deb2d-1fc0-499b-a828-04aeece855fe.json
index eba486e21..3186b522a 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/TotalRequests_2a1deb2d-1fc0-499b-a828-04aeece855fe.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/TotalRequests_2a1deb2d-1fc0-499b-a828-04aeece855fe.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/arm/UpdateAccountKeys_d4d7685a-ce55-4709-a847-747d02165cb7.json b/services/DocumentDB/databaseAccounts/templates/arm/UpdateAccountKeys_d4d7685a-ce55-4709-a847-747d02165cb7.json
index 6a88474c4..00c0ff752 100644
--- a/services/DocumentDB/databaseAccounts/templates/arm/UpdateAccountKeys_d4d7685a-ce55-4709-a847-747d02165cb7.json
+++ b/services/DocumentDB/databaseAccounts/templates/arm/UpdateAccountKeys_d4d7685a-ce55-4709-a847-747d02165cb7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/DataUsage_0914c189-0adc-45d6-8704-d2ae73b9b7b6.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/DataUsage_0914c189-0adc-45d6-8704-d2ae73b9b7b6.bicep
index e6da6fef2..d19162c53 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/DataUsage_0914c189-0adc-45d6-8704-d2ae73b9b7b6.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/DataUsage_0914c189-0adc-45d6-8704-d2ae73b9b7b6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/MongoRequests_3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/MongoRequests_3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.bicep
index 55a2d5a50..7aa12b822 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/MongoRequests_3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/MongoRequests_3f30e3aa-7e17-4eaf-a437-a420f5a23bf2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/NormalizedRUConsumption_9bae539a-12ed-46e2-b105-101ce036c9a4.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/NormalizedRUConsumption_9bae539a-12ed-46e2-b105-101ce036c9a4.bicep
index 0785257a2..85e692061 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/NormalizedRUConsumption_9bae539a-12ed-46e2-b105-101ce036c9a4.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/NormalizedRUConsumption_9bae539a-12ed-46e2-b105-101ce036c9a4.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/OfflineRegion_0cb53be3-76b5-44be-9f32-bcc821be34b6.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/OfflineRegion_0cb53be3-76b5-44be-9f32-bcc821be34b6.bicep
index a57c3a21f..b808dadac 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/OfflineRegion_0cb53be3-76b5-44be-9f32-bcc821be34b6.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/OfflineRegion_0cb53be3-76b5-44be-9f32-bcc821be34b6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/ProvisionedThroughput_f77ce9c2-bb95-47e7-8e5d-75d5c098f489.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/ProvisionedThroughput_f77ce9c2-bb95-47e7-8e5d-75d5c098f489.bicep
index 5e60c2240..adf0bb9cb 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/ProvisionedThroughput_f77ce9c2-bb95-47e7-8e5d-75d5c098f489.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/ProvisionedThroughput_f77ce9c2-bb95-47e7-8e5d-75d5c098f489.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/RegionFailover_9c41c539-b81b-4917-b04a-e67225f78e75.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/RegionFailover_9c41c539-b81b-4917-b04a-e67225f78e75.bicep
index 3cd356b40..3533c070e 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/RegionFailover_9c41c539-b81b-4917-b04a-e67225f78e75.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/RegionFailover_9c41c539-b81b-4917-b04a-e67225f78e75.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/RemoveRegion_228e104f-002a-441d-91ec-6140f233c1a4.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/RemoveRegion_228e104f-002a-441d-91ec-6140f233c1a4.bicep
index 2746c1647..db740857d 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/RemoveRegion_228e104f-002a-441d-91ec-6140f233c1a4.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/RemoveRegion_228e104f-002a-441d-91ec-6140f233c1a4.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/ReplicationLatency_cf0655a4-042d-4979-bbc7-5559eaa8f2b9.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/ReplicationLatency_cf0655a4-042d-4979-bbc7-5559eaa8f2b9.bicep
index 798640fde..6a7e2a52a 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/ReplicationLatency_cf0655a4-042d-4979-bbc7-5559eaa8f2b9.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/ReplicationLatency_cf0655a4-042d-4979-bbc7-5559eaa8f2b9.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/ServerSideLatency_28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/ServerSideLatency_28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.bicep
index 419a9d1c3..128a71174 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/ServerSideLatency_28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/ServerSideLatency_28f2e10d-2297-47f9-ac6a-c7a8cc0c8ead.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/ServiceAvailability_ee10b769-b38b-44d1-9fd3-926b8dca4c41.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/ServiceAvailability_ee10b769-b38b-44d1-9fd3-926b8dca4c41.bicep
index a316b8450..f3c5cb12e 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/ServiceAvailability_ee10b769-b38b-44d1-9fd3-926b8dca4c41.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/ServiceAvailability_ee10b769-b38b-44d1-9fd3-926b8dca4c41.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/SqlContainerDelete_faf5510e-28b7-42c9-8ad1-de68a5737eaf.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/SqlContainerDelete_faf5510e-28b7-42c9-8ad1-de68a5737eaf.bicep
index a7ffe3494..b6a924e04 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/SqlContainerDelete_faf5510e-28b7-42c9-8ad1-de68a5737eaf.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/SqlContainerDelete_faf5510e-28b7-42c9-8ad1-de68a5737eaf.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/SqlDatabaseDelete_a7958120-a386-46d0-9790-e80bfa72fb22.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/SqlDatabaseDelete_a7958120-a386-46d0-9790-e80bfa72fb22.bicep
index 304e17b69..3dc5d0d93 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/SqlDatabaseDelete_a7958120-a386-46d0-9790-e80bfa72fb22.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/SqlDatabaseDelete_a7958120-a386-46d0-9790-e80bfa72fb22.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/TotalRequestUnits_14fc7c6b-484f-427f-a1d2-94cded799f88.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/TotalRequestUnits_14fc7c6b-484f-427f-a1d2-94cded799f88.bicep
index 2e33727c4..ccc41f4a4 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/TotalRequestUnits_14fc7c6b-484f-427f-a1d2-94cded799f88.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/TotalRequestUnits_14fc7c6b-484f-427f-a1d2-94cded799f88.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/TotalRequests_2a1deb2d-1fc0-499b-a828-04aeece855fe.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/TotalRequests_2a1deb2d-1fc0-499b-a828-04aeece855fe.bicep
index e16ea79d6..e02686fb4 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/TotalRequests_2a1deb2d-1fc0-499b-a828-04aeece855fe.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/TotalRequests_2a1deb2d-1fc0-499b-a828-04aeece855fe.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/DocumentDB/databaseAccounts/templates/bicep/UpdateAccountKeys_d4d7685a-ce55-4709-a847-747d02165cb7.bicep b/services/DocumentDB/databaseAccounts/templates/bicep/UpdateAccountKeys_d4d7685a-ce55-4709-a847-747d02165cb7.bicep
index b9e06811c..51d93aa4c 100644
--- a/services/DocumentDB/databaseAccounts/templates/bicep/UpdateAccountKeys_d4d7685a-ce55-4709-a847-747d02165cb7.bicep
+++ b/services/DocumentDB/databaseAccounts/templates/bicep/UpdateAccountKeys_d4d7685a-ce55-4709-a847-747d02165cb7.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventGrid/systemTopics/templates/arm/DeadLetteredCount_c02f2d18-2b7e-4d85-81fa-2c1437d0b092.json b/services/EventGrid/systemTopics/templates/arm/DeadLetteredCount_c02f2d18-2b7e-4d85-81fa-2c1437d0b092.json
index 4fa37e1db..c89b49a0c 100644
--- a/services/EventGrid/systemTopics/templates/arm/DeadLetteredCount_c02f2d18-2b7e-4d85-81fa-2c1437d0b092.json
+++ b/services/EventGrid/systemTopics/templates/arm/DeadLetteredCount_c02f2d18-2b7e-4d85-81fa-2c1437d0b092.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventGrid/systemTopics/templates/arm/DeliveryAttemptFailCount_6584a39d-0795-4132-8c33-376d3926d21b.json b/services/EventGrid/systemTopics/templates/arm/DeliveryAttemptFailCount_6584a39d-0795-4132-8c33-376d3926d21b.json
index 81be23660..ff27ac422 100644
--- a/services/EventGrid/systemTopics/templates/arm/DeliveryAttemptFailCount_6584a39d-0795-4132-8c33-376d3926d21b.json
+++ b/services/EventGrid/systemTopics/templates/arm/DeliveryAttemptFailCount_6584a39d-0795-4132-8c33-376d3926d21b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventGrid/systemTopics/templates/arm/PublishFailCount_fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.json b/services/EventGrid/systemTopics/templates/arm/PublishFailCount_fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.json
index c60ec374a..66d2d09b1 100644
--- a/services/EventGrid/systemTopics/templates/arm/PublishFailCount_fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.json
+++ b/services/EventGrid/systemTopics/templates/arm/PublishFailCount_fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventGrid/systemTopics/templates/bicep/DeadLetteredCount_c02f2d18-2b7e-4d85-81fa-2c1437d0b092.bicep b/services/EventGrid/systemTopics/templates/bicep/DeadLetteredCount_c02f2d18-2b7e-4d85-81fa-2c1437d0b092.bicep
index 4a2200a09..5cbef403d 100644
--- a/services/EventGrid/systemTopics/templates/bicep/DeadLetteredCount_c02f2d18-2b7e-4d85-81fa-2c1437d0b092.bicep
+++ b/services/EventGrid/systemTopics/templates/bicep/DeadLetteredCount_c02f2d18-2b7e-4d85-81fa-2c1437d0b092.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventGrid/systemTopics/templates/bicep/DeliveryAttemptFailCount_6584a39d-0795-4132-8c33-376d3926d21b.bicep b/services/EventGrid/systemTopics/templates/bicep/DeliveryAttemptFailCount_6584a39d-0795-4132-8c33-376d3926d21b.bicep
index c2ab4157a..60533b773 100644
--- a/services/EventGrid/systemTopics/templates/bicep/DeliveryAttemptFailCount_6584a39d-0795-4132-8c33-376d3926d21b.bicep
+++ b/services/EventGrid/systemTopics/templates/bicep/DeliveryAttemptFailCount_6584a39d-0795-4132-8c33-376d3926d21b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventGrid/systemTopics/templates/bicep/PublishFailCount_fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.bicep b/services/EventGrid/systemTopics/templates/bicep/PublishFailCount_fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.bicep
index feb8ad5d4..1c0000a2f 100644
--- a/services/EventGrid/systemTopics/templates/bicep/PublishFailCount_fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.bicep
+++ b/services/EventGrid/systemTopics/templates/bicep/PublishFailCount_fb8bc2ae-26bc-45a1-b616-1f45ffb864ae.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventGrid/topics/templates/arm/DeadLetteredCount_343258f9-4bb2-41fb-abfa-d04ea62a6aad.json b/services/EventGrid/topics/templates/arm/DeadLetteredCount_343258f9-4bb2-41fb-abfa-d04ea62a6aad.json
index 4fa37e1db..c89b49a0c 100644
--- a/services/EventGrid/topics/templates/arm/DeadLetteredCount_343258f9-4bb2-41fb-abfa-d04ea62a6aad.json
+++ b/services/EventGrid/topics/templates/arm/DeadLetteredCount_343258f9-4bb2-41fb-abfa-d04ea62a6aad.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventGrid/topics/templates/arm/DeliveryAttemptFailCount_95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.json b/services/EventGrid/topics/templates/arm/DeliveryAttemptFailCount_95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.json
index 5f767c352..30a57603d 100644
--- a/services/EventGrid/topics/templates/arm/DeliveryAttemptFailCount_95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.json
+++ b/services/EventGrid/topics/templates/arm/DeliveryAttemptFailCount_95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventGrid/topics/templates/arm/DroppedEventCount_e9561f89-282e-4145-b5cc-8485a7fc987c.json b/services/EventGrid/topics/templates/arm/DroppedEventCount_e9561f89-282e-4145-b5cc-8485a7fc987c.json
index bd7b86e1c..4b99cd4a2 100644
--- a/services/EventGrid/topics/templates/arm/DroppedEventCount_e9561f89-282e-4145-b5cc-8485a7fc987c.json
+++ b/services/EventGrid/topics/templates/arm/DroppedEventCount_e9561f89-282e-4145-b5cc-8485a7fc987c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventGrid/topics/templates/arm/PublishFailCount_230c0173-8b36-4412-9617-3e096886a403.json b/services/EventGrid/topics/templates/arm/PublishFailCount_230c0173-8b36-4412-9617-3e096886a403.json
index a13044971..48a0a2826 100644
--- a/services/EventGrid/topics/templates/arm/PublishFailCount_230c0173-8b36-4412-9617-3e096886a403.json
+++ b/services/EventGrid/topics/templates/arm/PublishFailCount_230c0173-8b36-4412-9617-3e096886a403.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventGrid/topics/templates/bicep/DeadLetteredCount_343258f9-4bb2-41fb-abfa-d04ea62a6aad.bicep b/services/EventGrid/topics/templates/bicep/DeadLetteredCount_343258f9-4bb2-41fb-abfa-d04ea62a6aad.bicep
index 4a2200a09..5cbef403d 100644
--- a/services/EventGrid/topics/templates/bicep/DeadLetteredCount_343258f9-4bb2-41fb-abfa-d04ea62a6aad.bicep
+++ b/services/EventGrid/topics/templates/bicep/DeadLetteredCount_343258f9-4bb2-41fb-abfa-d04ea62a6aad.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventGrid/topics/templates/bicep/DeliveryAttemptFailCount_95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.bicep b/services/EventGrid/topics/templates/bicep/DeliveryAttemptFailCount_95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.bicep
index 9e373f7fc..a9373f2a7 100644
--- a/services/EventGrid/topics/templates/bicep/DeliveryAttemptFailCount_95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.bicep
+++ b/services/EventGrid/topics/templates/bicep/DeliveryAttemptFailCount_95865d3b-41d0-4ad6-b08b-a2dcfe0940a9.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventGrid/topics/templates/bicep/DroppedEventCount_e9561f89-282e-4145-b5cc-8485a7fc987c.bicep b/services/EventGrid/topics/templates/bicep/DroppedEventCount_e9561f89-282e-4145-b5cc-8485a7fc987c.bicep
index c7260fedc..331ddc402 100644
--- a/services/EventGrid/topics/templates/bicep/DroppedEventCount_e9561f89-282e-4145-b5cc-8485a7fc987c.bicep
+++ b/services/EventGrid/topics/templates/bicep/DroppedEventCount_e9561f89-282e-4145-b5cc-8485a7fc987c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventGrid/topics/templates/bicep/PublishFailCount_230c0173-8b36-4412-9617-3e096886a403.bicep b/services/EventGrid/topics/templates/bicep/PublishFailCount_230c0173-8b36-4412-9617-3e096886a403.bicep
index f6e1866b0..bc0a694dd 100644
--- a/services/EventGrid/topics/templates/bicep/PublishFailCount_230c0173-8b36-4412-9617-3e096886a403.bicep
+++ b/services/EventGrid/topics/templates/bicep/PublishFailCount_230c0173-8b36-4412-9617-3e096886a403.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/clusters/templates/arm/CPU_8875590a-9f72-49a2-807f-62437f8079b1.json b/services/EventHub/clusters/templates/arm/CPU_8875590a-9f72-49a2-807f-62437f8079b1.json
index 128fd1a40..da43c4402 100644
--- a/services/EventHub/clusters/templates/arm/CPU_8875590a-9f72-49a2-807f-62437f8079b1.json
+++ b/services/EventHub/clusters/templates/arm/CPU_8875590a-9f72-49a2-807f-62437f8079b1.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/clusters/templates/bicep/CPU_8875590a-9f72-49a2-807f-62437f8079b1.bicep b/services/EventHub/clusters/templates/bicep/CPU_8875590a-9f72-49a2-807f-62437f8079b1.bicep
index e2ec9d2ad..7b2302c40 100644
--- a/services/EventHub/clusters/templates/bicep/CPU_8875590a-9f72-49a2-807f-62437f8079b1.bicep
+++ b/services/EventHub/clusters/templates/bicep/CPU_8875590a-9f72-49a2-807f-62437f8079b1.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/arm/CaptureBacklog_2959b52d-6756-480d-9193-b2c0c4c5d305.json b/services/EventHub/namespaces/templates/arm/CaptureBacklog_2959b52d-6756-480d-9193-b2c0c4c5d305.json
index 80485fba2..186f92a91 100644
--- a/services/EventHub/namespaces/templates/arm/CaptureBacklog_2959b52d-6756-480d-9193-b2c0c4c5d305.json
+++ b/services/EventHub/namespaces/templates/arm/CaptureBacklog_2959b52d-6756-480d-9193-b2c0c4c5d305.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/IncomingBytes_2ca39ff3-6f87-438c-81f6-7ce51f70902f.json b/services/EventHub/namespaces/templates/arm/IncomingBytes_2ca39ff3-6f87-438c-81f6-7ce51f70902f.json
index 7a567d43c..e71025556 100644
--- a/services/EventHub/namespaces/templates/arm/IncomingBytes_2ca39ff3-6f87-438c-81f6-7ce51f70902f.json
+++ b/services/EventHub/namespaces/templates/arm/IncomingBytes_2ca39ff3-6f87-438c-81f6-7ce51f70902f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/IncomingMessages_4f1964ce-6938-499a-af3d-bb746aaff72a.json b/services/EventHub/namespaces/templates/arm/IncomingMessages_4f1964ce-6938-499a-af3d-bb746aaff72a.json
index 637b28725..1c526dd12 100644
--- a/services/EventHub/namespaces/templates/arm/IncomingMessages_4f1964ce-6938-499a-af3d-bb746aaff72a.json
+++ b/services/EventHub/namespaces/templates/arm/IncomingMessages_4f1964ce-6938-499a-af3d-bb746aaff72a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/NamespaceCpuUsage_a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.json b/services/EventHub/namespaces/templates/arm/NamespaceCpuUsage_a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.json
index 85b2de55c..e4fe7ff3c 100644
--- a/services/EventHub/namespaces/templates/arm/NamespaceCpuUsage_a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.json
+++ b/services/EventHub/namespaces/templates/arm/NamespaceCpuUsage_a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/NamespaceMemoryUsage_26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.json b/services/EventHub/namespaces/templates/arm/NamespaceMemoryUsage_26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.json
index dae1ab040..e2d9ff301 100644
--- a/services/EventHub/namespaces/templates/arm/NamespaceMemoryUsage_26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.json
+++ b/services/EventHub/namespaces/templates/arm/NamespaceMemoryUsage_26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/OutgoingBytes_46a66177-c487-4ed1-b2fc-19c0bf52b168.json b/services/EventHub/namespaces/templates/arm/OutgoingBytes_46a66177-c487-4ed1-b2fc-19c0bf52b168.json
index f65e696a9..9e10f04e4 100644
--- a/services/EventHub/namespaces/templates/arm/OutgoingBytes_46a66177-c487-4ed1-b2fc-19c0bf52b168.json
+++ b/services/EventHub/namespaces/templates/arm/OutgoingBytes_46a66177-c487-4ed1-b2fc-19c0bf52b168.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/OutgoingMessages_c67b86dc-74d5-4ea1-882e-de257d054ff3.json b/services/EventHub/namespaces/templates/arm/OutgoingMessages_c67b86dc-74d5-4ea1-882e-de257d054ff3.json
index 1f60b2115..58df45570 100644
--- a/services/EventHub/namespaces/templates/arm/OutgoingMessages_c67b86dc-74d5-4ea1-882e-de257d054ff3.json
+++ b/services/EventHub/namespaces/templates/arm/OutgoingMessages_c67b86dc-74d5-4ea1-882e-de257d054ff3.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/QuotaExceededErrors_237493ef-15c0-4e87-80bc-f8c59dd897ce.json b/services/EventHub/namespaces/templates/arm/QuotaExceededErrors_237493ef-15c0-4e87-80bc-f8c59dd897ce.json
index 4596ee046..45669a5ac 100644
--- a/services/EventHub/namespaces/templates/arm/QuotaExceededErrors_237493ef-15c0-4e87-80bc-f8c59dd897ce.json
+++ b/services/EventHub/namespaces/templates/arm/QuotaExceededErrors_237493ef-15c0-4e87-80bc-f8c59dd897ce.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/ServerErrors_48581aa9-53ee-4467-b04c-402061fe40e8.json b/services/EventHub/namespaces/templates/arm/ServerErrors_48581aa9-53ee-4467-b04c-402061fe40e8.json
index 7c8b9d1ca..3bfabc116 100644
--- a/services/EventHub/namespaces/templates/arm/ServerErrors_48581aa9-53ee-4467-b04c-402061fe40e8.json
+++ b/services/EventHub/namespaces/templates/arm/ServerErrors_48581aa9-53ee-4467-b04c-402061fe40e8.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/ThrottledRequests_1684f387-04e6-440c-a931-f57efdc84cd2.json b/services/EventHub/namespaces/templates/arm/ThrottledRequests_1684f387-04e6-440c-a931-f57efdc84cd2.json
index 548380c3f..fa4de47c6 100644
--- a/services/EventHub/namespaces/templates/arm/ThrottledRequests_1684f387-04e6-440c-a931-f57efdc84cd2.json
+++ b/services/EventHub/namespaces/templates/arm/ThrottledRequests_1684f387-04e6-440c-a931-f57efdc84cd2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/arm/UserErrors_b1700765-b168-4ad4-a73e-f3a93a6bf5cf.json b/services/EventHub/namespaces/templates/arm/UserErrors_b1700765-b168-4ad4-a73e-f3a93a6bf5cf.json
index 97f7aa0f7..326f0b8be 100644
--- a/services/EventHub/namespaces/templates/arm/UserErrors_b1700765-b168-4ad4-a73e-f3a93a6bf5cf.json
+++ b/services/EventHub/namespaces/templates/arm/UserErrors_b1700765-b168-4ad4-a73e-f3a93a6bf5cf.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/EventHub/namespaces/templates/bicep/CaptureBacklog_2959b52d-6756-480d-9193-b2c0c4c5d305.bicep b/services/EventHub/namespaces/templates/bicep/CaptureBacklog_2959b52d-6756-480d-9193-b2c0c4c5d305.bicep
index d65568315..032e3f32f 100644
--- a/services/EventHub/namespaces/templates/bicep/CaptureBacklog_2959b52d-6756-480d-9193-b2c0c4c5d305.bicep
+++ b/services/EventHub/namespaces/templates/bicep/CaptureBacklog_2959b52d-6756-480d-9193-b2c0c4c5d305.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/IncomingBytes_2ca39ff3-6f87-438c-81f6-7ce51f70902f.bicep b/services/EventHub/namespaces/templates/bicep/IncomingBytes_2ca39ff3-6f87-438c-81f6-7ce51f70902f.bicep
index 4058bdea9..b27265a5c 100644
--- a/services/EventHub/namespaces/templates/bicep/IncomingBytes_2ca39ff3-6f87-438c-81f6-7ce51f70902f.bicep
+++ b/services/EventHub/namespaces/templates/bicep/IncomingBytes_2ca39ff3-6f87-438c-81f6-7ce51f70902f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/IncomingMessages_4f1964ce-6938-499a-af3d-bb746aaff72a.bicep b/services/EventHub/namespaces/templates/bicep/IncomingMessages_4f1964ce-6938-499a-af3d-bb746aaff72a.bicep
index dd3fb5b9a..ca467a4ce 100644
--- a/services/EventHub/namespaces/templates/bicep/IncomingMessages_4f1964ce-6938-499a-af3d-bb746aaff72a.bicep
+++ b/services/EventHub/namespaces/templates/bicep/IncomingMessages_4f1964ce-6938-499a-af3d-bb746aaff72a.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/NamespaceCpuUsage_a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.bicep b/services/EventHub/namespaces/templates/bicep/NamespaceCpuUsage_a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.bicep
index 89f33b14b..bc8b2830b 100644
--- a/services/EventHub/namespaces/templates/bicep/NamespaceCpuUsage_a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.bicep
+++ b/services/EventHub/namespaces/templates/bicep/NamespaceCpuUsage_a9c1e74c-bd3a-438c-bd13-7a2fec2d172c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/NamespaceMemoryUsage_26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.bicep b/services/EventHub/namespaces/templates/bicep/NamespaceMemoryUsage_26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.bicep
index 030f3b67e..ae21947ed 100644
--- a/services/EventHub/namespaces/templates/bicep/NamespaceMemoryUsage_26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.bicep
+++ b/services/EventHub/namespaces/templates/bicep/NamespaceMemoryUsage_26972609-fbb4-4fb9-b7f8-7b99a06bb4e3.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/OutgoingBytes_46a66177-c487-4ed1-b2fc-19c0bf52b168.bicep b/services/EventHub/namespaces/templates/bicep/OutgoingBytes_46a66177-c487-4ed1-b2fc-19c0bf52b168.bicep
index 740800b93..330e6200c 100644
--- a/services/EventHub/namespaces/templates/bicep/OutgoingBytes_46a66177-c487-4ed1-b2fc-19c0bf52b168.bicep
+++ b/services/EventHub/namespaces/templates/bicep/OutgoingBytes_46a66177-c487-4ed1-b2fc-19c0bf52b168.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/OutgoingMessages_c67b86dc-74d5-4ea1-882e-de257d054ff3.bicep b/services/EventHub/namespaces/templates/bicep/OutgoingMessages_c67b86dc-74d5-4ea1-882e-de257d054ff3.bicep
index 6339d1d62..f679ad0e3 100644
--- a/services/EventHub/namespaces/templates/bicep/OutgoingMessages_c67b86dc-74d5-4ea1-882e-de257d054ff3.bicep
+++ b/services/EventHub/namespaces/templates/bicep/OutgoingMessages_c67b86dc-74d5-4ea1-882e-de257d054ff3.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/QuotaExceededErrors_237493ef-15c0-4e87-80bc-f8c59dd897ce.bicep b/services/EventHub/namespaces/templates/bicep/QuotaExceededErrors_237493ef-15c0-4e87-80bc-f8c59dd897ce.bicep
index 55c6bbf3d..475a05de4 100644
--- a/services/EventHub/namespaces/templates/bicep/QuotaExceededErrors_237493ef-15c0-4e87-80bc-f8c59dd897ce.bicep
+++ b/services/EventHub/namespaces/templates/bicep/QuotaExceededErrors_237493ef-15c0-4e87-80bc-f8c59dd897ce.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/ServerErrors_48581aa9-53ee-4467-b04c-402061fe40e8.bicep b/services/EventHub/namespaces/templates/bicep/ServerErrors_48581aa9-53ee-4467-b04c-402061fe40e8.bicep
index e4387ebed..ea54e2e31 100644
--- a/services/EventHub/namespaces/templates/bicep/ServerErrors_48581aa9-53ee-4467-b04c-402061fe40e8.bicep
+++ b/services/EventHub/namespaces/templates/bicep/ServerErrors_48581aa9-53ee-4467-b04c-402061fe40e8.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/ThrottledRequests_1684f387-04e6-440c-a931-f57efdc84cd2.bicep b/services/EventHub/namespaces/templates/bicep/ThrottledRequests_1684f387-04e6-440c-a931-f57efdc84cd2.bicep
index 8ff541744..5859deabb 100644
--- a/services/EventHub/namespaces/templates/bicep/ThrottledRequests_1684f387-04e6-440c-a931-f57efdc84cd2.bicep
+++ b/services/EventHub/namespaces/templates/bicep/ThrottledRequests_1684f387-04e6-440c-a931-f57efdc84cd2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/EventHub/namespaces/templates/bicep/UserErrors_b1700765-b168-4ad4-a73e-f3a93a6bf5cf.bicep b/services/EventHub/namespaces/templates/bicep/UserErrors_b1700765-b168-4ad4-a73e-f3a93a6bf5cf.bicep
index 3d23996ef..185608322 100644
--- a/services/EventHub/namespaces/templates/bicep/UserErrors_b1700765-b168-4ad4-a73e-f3a93a6bf5cf.bicep
+++ b/services/EventHub/namespaces/templates/bicep/UserErrors_b1700765-b168-4ad4-a73e-f3a93a6bf5cf.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/KeyVault/vaults/templates/arm/ActivityLogKeyVaultDelete_f68ed392-7179-419d-8ee6-3813ea10866b.json b/services/KeyVault/vaults/templates/arm/ActivityLogKeyVaultDelete_f68ed392-7179-419d-8ee6-3813ea10866b.json
index ffc6ed874..f80171125 100644
--- a/services/KeyVault/vaults/templates/arm/ActivityLogKeyVaultDelete_f68ed392-7179-419d-8ee6-3813ea10866b.json
+++ b/services/KeyVault/vaults/templates/arm/ActivityLogKeyVaultDelete_f68ed392-7179-419d-8ee6-3813ea10866b.json
@@ -79,7 +79,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/KeyVault/vaults/templates/arm/Availability_a3c8bcb4-22ca-45be-92f7-605f232ecec2.json b/services/KeyVault/vaults/templates/arm/Availability_a3c8bcb4-22ca-45be-92f7-605f232ecec2.json
index 61f081e29..1724dfba0 100644
--- a/services/KeyVault/vaults/templates/arm/Availability_a3c8bcb4-22ca-45be-92f7-605f232ecec2.json
+++ b/services/KeyVault/vaults/templates/arm/Availability_a3c8bcb4-22ca-45be-92f7-605f232ecec2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/KeyVault/vaults/templates/arm/SaturationShoebox_dc852755-e5df-4fd0-83ac-cbbc516f60b3.json b/services/KeyVault/vaults/templates/arm/SaturationShoebox_dc852755-e5df-4fd0-83ac-cbbc516f60b3.json
index f4520ec39..41e251c63 100644
--- a/services/KeyVault/vaults/templates/arm/SaturationShoebox_dc852755-e5df-4fd0-83ac-cbbc516f60b3.json
+++ b/services/KeyVault/vaults/templates/arm/SaturationShoebox_dc852755-e5df-4fd0-83ac-cbbc516f60b3.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/KeyVault/vaults/templates/arm/ServiceApiHit_7b52bf07-3d86-4429-b5d4-829a6a5542df.json b/services/KeyVault/vaults/templates/arm/ServiceApiHit_7b52bf07-3d86-4429-b5d4-829a6a5542df.json
index a80b20e4f..d78819404 100644
--- a/services/KeyVault/vaults/templates/arm/ServiceApiHit_7b52bf07-3d86-4429-b5d4-829a6a5542df.json
+++ b/services/KeyVault/vaults/templates/arm/ServiceApiHit_7b52bf07-3d86-4429-b5d4-829a6a5542df.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/KeyVault/vaults/templates/arm/ServiceApiLatency_2651f57f-ac74-44f3-8511-c245488134f8.json b/services/KeyVault/vaults/templates/arm/ServiceApiLatency_2651f57f-ac74-44f3-8511-c245488134f8.json
index 50eddcd50..4b5304a12 100644
--- a/services/KeyVault/vaults/templates/arm/ServiceApiLatency_2651f57f-ac74-44f3-8511-c245488134f8.json
+++ b/services/KeyVault/vaults/templates/arm/ServiceApiLatency_2651f57f-ac74-44f3-8511-c245488134f8.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/KeyVault/vaults/templates/arm/ServiceApiResult_14356b19-1264-498d-b1cd-e3fa9f0c9fc9.json b/services/KeyVault/vaults/templates/arm/ServiceApiResult_14356b19-1264-498d-b1cd-e3fa9f0c9fc9.json
index 15a713674..7abb79c35 100644
--- a/services/KeyVault/vaults/templates/arm/ServiceApiResult_14356b19-1264-498d-b1cd-e3fa9f0c9fc9.json
+++ b/services/KeyVault/vaults/templates/arm/ServiceApiResult_14356b19-1264-498d-b1cd-e3fa9f0c9fc9.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/KeyVault/vaults/templates/bicep/ActivityLogKeyVaultDelete_f68ed392-7179-419d-8ee6-3813ea10866b.bicep b/services/KeyVault/vaults/templates/bicep/ActivityLogKeyVaultDelete_f68ed392-7179-419d-8ee6-3813ea10866b.bicep
index bf13ccb28..e8cf5dc4a 100644
--- a/services/KeyVault/vaults/templates/bicep/ActivityLogKeyVaultDelete_f68ed392-7179-419d-8ee6-3813ea10866b.bicep
+++ b/services/KeyVault/vaults/templates/bicep/ActivityLogKeyVaultDelete_f68ed392-7179-419d-8ee6-3813ea10866b.bicep
@@ -52,7 +52,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/KeyVault/vaults/templates/bicep/Availability_a3c8bcb4-22ca-45be-92f7-605f232ecec2.bicep b/services/KeyVault/vaults/templates/bicep/Availability_a3c8bcb4-22ca-45be-92f7-605f232ecec2.bicep
index b38fb8ede..5d92f10cd 100644
--- a/services/KeyVault/vaults/templates/bicep/Availability_a3c8bcb4-22ca-45be-92f7-605f232ecec2.bicep
+++ b/services/KeyVault/vaults/templates/bicep/Availability_a3c8bcb4-22ca-45be-92f7-605f232ecec2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/KeyVault/vaults/templates/bicep/SaturationShoebox_dc852755-e5df-4fd0-83ac-cbbc516f60b3.bicep b/services/KeyVault/vaults/templates/bicep/SaturationShoebox_dc852755-e5df-4fd0-83ac-cbbc516f60b3.bicep
index d988bcde4..fa4c0981e 100644
--- a/services/KeyVault/vaults/templates/bicep/SaturationShoebox_dc852755-e5df-4fd0-83ac-cbbc516f60b3.bicep
+++ b/services/KeyVault/vaults/templates/bicep/SaturationShoebox_dc852755-e5df-4fd0-83ac-cbbc516f60b3.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/KeyVault/vaults/templates/bicep/ServiceApiHit_7b52bf07-3d86-4429-b5d4-829a6a5542df.bicep b/services/KeyVault/vaults/templates/bicep/ServiceApiHit_7b52bf07-3d86-4429-b5d4-829a6a5542df.bicep
index 21bb50593..6068c544e 100644
--- a/services/KeyVault/vaults/templates/bicep/ServiceApiHit_7b52bf07-3d86-4429-b5d4-829a6a5542df.bicep
+++ b/services/KeyVault/vaults/templates/bicep/ServiceApiHit_7b52bf07-3d86-4429-b5d4-829a6a5542df.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/KeyVault/vaults/templates/bicep/ServiceApiLatency_2651f57f-ac74-44f3-8511-c245488134f8.bicep b/services/KeyVault/vaults/templates/bicep/ServiceApiLatency_2651f57f-ac74-44f3-8511-c245488134f8.bicep
index a47bbb76c..9a484c9e0 100644
--- a/services/KeyVault/vaults/templates/bicep/ServiceApiLatency_2651f57f-ac74-44f3-8511-c245488134f8.bicep
+++ b/services/KeyVault/vaults/templates/bicep/ServiceApiLatency_2651f57f-ac74-44f3-8511-c245488134f8.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/KeyVault/vaults/templates/bicep/ServiceApiResult_14356b19-1264-498d-b1cd-e3fa9f0c9fc9.bicep b/services/KeyVault/vaults/templates/bicep/ServiceApiResult_14356b19-1264-498d-b1cd-e3fa9f0c9fc9.bicep
index c1fa0b7c2..0aa511d28 100644
--- a/services/KeyVault/vaults/templates/bicep/ServiceApiResult_14356b19-1264-498d-b1cd-e3fa9f0c9fc9.bicep
+++ b/services/KeyVault/vaults/templates/bicep/ServiceApiResult_14356b19-1264-498d-b1cd-e3fa9f0c9fc9.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Kusto/clusters/templates/arm/BlobsDropped_422c292e-54e3-4e7d-93e2-bcd1bf65dae6.json b/services/Kusto/clusters/templates/arm/BlobsDropped_422c292e-54e3-4e7d-93e2-bcd1bf65dae6.json
index 87b6ed689..b9d0a748e 100644
--- a/services/Kusto/clusters/templates/arm/BlobsDropped_422c292e-54e3-4e7d-93e2-bcd1bf65dae6.json
+++ b/services/Kusto/clusters/templates/arm/BlobsDropped_422c292e-54e3-4e7d-93e2-bcd1bf65dae6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Kusto/clusters/templates/arm/CPU_cae6ec0a-a26d-494b-94b2-3d93dcedff42.json b/services/Kusto/clusters/templates/arm/CPU_cae6ec0a-a26d-494b-94b2-3d93dcedff42.json
index 91bb79f1d..b858be949 100644
--- a/services/Kusto/clusters/templates/arm/CPU_cae6ec0a-a26d-494b-94b2-3d93dcedff42.json
+++ b/services/Kusto/clusters/templates/arm/CPU_cae6ec0a-a26d-494b-94b2-3d93dcedff42.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Kusto/clusters/templates/arm/IngestionLatencyInSeconds_8493c362-2524-4079-9025-8f5ffee62936.json b/services/Kusto/clusters/templates/arm/IngestionLatencyInSeconds_8493c362-2524-4079-9025-8f5ffee62936.json
index 65616a5d9..759275365 100644
--- a/services/Kusto/clusters/templates/arm/IngestionLatencyInSeconds_8493c362-2524-4079-9025-8f5ffee62936.json
+++ b/services/Kusto/clusters/templates/arm/IngestionLatencyInSeconds_8493c362-2524-4079-9025-8f5ffee62936.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Kusto/clusters/templates/arm/IngestionResult_6c4213c5-743f-48b8-b957-dd26fbf8809e.json b/services/Kusto/clusters/templates/arm/IngestionResult_6c4213c5-743f-48b8-b957-dd26fbf8809e.json
index 1b1eb18fc..819466ffb 100644
--- a/services/Kusto/clusters/templates/arm/IngestionResult_6c4213c5-743f-48b8-b957-dd26fbf8809e.json
+++ b/services/Kusto/clusters/templates/arm/IngestionResult_6c4213c5-743f-48b8-b957-dd26fbf8809e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Kusto/clusters/templates/arm/KeepAlive_188fc0b5-a686-48a7-950f-76f183ba49d6.json b/services/Kusto/clusters/templates/arm/KeepAlive_188fc0b5-a686-48a7-950f-76f183ba49d6.json
index 74aa60e2f..02f16da2b 100644
--- a/services/Kusto/clusters/templates/arm/KeepAlive_188fc0b5-a686-48a7-950f-76f183ba49d6.json
+++ b/services/Kusto/clusters/templates/arm/KeepAlive_188fc0b5-a686-48a7-950f-76f183ba49d6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Kusto/clusters/templates/bicep/BlobsDropped_422c292e-54e3-4e7d-93e2-bcd1bf65dae6.bicep b/services/Kusto/clusters/templates/bicep/BlobsDropped_422c292e-54e3-4e7d-93e2-bcd1bf65dae6.bicep
index 3d6714932..20149cba1 100644
--- a/services/Kusto/clusters/templates/bicep/BlobsDropped_422c292e-54e3-4e7d-93e2-bcd1bf65dae6.bicep
+++ b/services/Kusto/clusters/templates/bicep/BlobsDropped_422c292e-54e3-4e7d-93e2-bcd1bf65dae6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Kusto/clusters/templates/bicep/CPU_cae6ec0a-a26d-494b-94b2-3d93dcedff42.bicep b/services/Kusto/clusters/templates/bicep/CPU_cae6ec0a-a26d-494b-94b2-3d93dcedff42.bicep
index 8badcfc49..a75ff8251 100644
--- a/services/Kusto/clusters/templates/bicep/CPU_cae6ec0a-a26d-494b-94b2-3d93dcedff42.bicep
+++ b/services/Kusto/clusters/templates/bicep/CPU_cae6ec0a-a26d-494b-94b2-3d93dcedff42.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Kusto/clusters/templates/bicep/IngestionLatencyInSeconds_8493c362-2524-4079-9025-8f5ffee62936.bicep b/services/Kusto/clusters/templates/bicep/IngestionLatencyInSeconds_8493c362-2524-4079-9025-8f5ffee62936.bicep
index 1525fcf9a..5d0923bd9 100644
--- a/services/Kusto/clusters/templates/bicep/IngestionLatencyInSeconds_8493c362-2524-4079-9025-8f5ffee62936.bicep
+++ b/services/Kusto/clusters/templates/bicep/IngestionLatencyInSeconds_8493c362-2524-4079-9025-8f5ffee62936.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Kusto/clusters/templates/bicep/IngestionResult_6c4213c5-743f-48b8-b957-dd26fbf8809e.bicep b/services/Kusto/clusters/templates/bicep/IngestionResult_6c4213c5-743f-48b8-b957-dd26fbf8809e.bicep
index 90d0096fd..d07eec948 100644
--- a/services/Kusto/clusters/templates/bicep/IngestionResult_6c4213c5-743f-48b8-b957-dd26fbf8809e.bicep
+++ b/services/Kusto/clusters/templates/bicep/IngestionResult_6c4213c5-743f-48b8-b957-dd26fbf8809e.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Kusto/clusters/templates/bicep/KeepAlive_188fc0b5-a686-48a7-950f-76f183ba49d6.bicep b/services/Kusto/clusters/templates/bicep/KeepAlive_188fc0b5-a686-48a7-950f-76f183ba49d6.bicep
index 12984760d..7408b6aad 100644
--- a/services/Kusto/clusters/templates/bicep/KeepAlive_188fc0b5-a686-48a7-950f-76f183ba49d6.bicep
+++ b/services/Kusto/clusters/templates/bicep/KeepAlive_188fc0b5-a686-48a7-950f-76f183ba49d6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/arm/ActionLatency_d8bf77d2-8572-4392-8097-5e84f136513d.json b/services/Logic/workflows/templates/arm/ActionLatency_d8bf77d2-8572-4392-8097-5e84f136513d.json
index 72eb1ed15..25898fd2e 100644
--- a/services/Logic/workflows/templates/arm/ActionLatency_d8bf77d2-8572-4392-8097-5e84f136513d.json
+++ b/services/Logic/workflows/templates/arm/ActionLatency_d8bf77d2-8572-4392-8097-5e84f136513d.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/ActionThrottledEvents_5aa5790b-2bff-40b0-9099-38485b9a9e0a.json b/services/Logic/workflows/templates/arm/ActionThrottledEvents_5aa5790b-2bff-40b0-9099-38485b9a9e0a.json
index a917e5ae1..8cb39ca53 100644
--- a/services/Logic/workflows/templates/arm/ActionThrottledEvents_5aa5790b-2bff-40b0-9099-38485b9a9e0a.json
+++ b/services/Logic/workflows/templates/arm/ActionThrottledEvents_5aa5790b-2bff-40b0-9099-38485b9a9e0a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/ActionsFailed_514f695a-4f11-4a28-9516-f7f3b5b1c53b.json b/services/Logic/workflows/templates/arm/ActionsFailed_514f695a-4f11-4a28-9516-f7f3b5b1c53b.json
index 140395b12..8bbece28e 100644
--- a/services/Logic/workflows/templates/arm/ActionsFailed_514f695a-4f11-4a28-9516-f7f3b5b1c53b.json
+++ b/services/Logic/workflows/templates/arm/ActionsFailed_514f695a-4f11-4a28-9516-f7f3b5b1c53b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunFailurePercentage_c4864d80-dd28-4344-a135-03b600920c06.json b/services/Logic/workflows/templates/arm/RunFailurePercentage_c4864d80-dd28-4344-a135-03b600920c06.json
index e1461a9fb..195dc4adc 100644
--- a/services/Logic/workflows/templates/arm/RunFailurePercentage_c4864d80-dd28-4344-a135-03b600920c06.json
+++ b/services/Logic/workflows/templates/arm/RunFailurePercentage_c4864d80-dd28-4344-a135-03b600920c06.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunLatency_eb44cbdc-a259-4354-9b54-2bc72f811440.json b/services/Logic/workflows/templates/arm/RunLatency_eb44cbdc-a259-4354-9b54-2bc72f811440.json
index 10e9d1fb0..b1b14d067 100644
--- a/services/Logic/workflows/templates/arm/RunLatency_eb44cbdc-a259-4354-9b54-2bc72f811440.json
+++ b/services/Logic/workflows/templates/arm/RunLatency_eb44cbdc-a259-4354-9b54-2bc72f811440.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunStartThrottledEvents_6524b22c-661e-48cd-87e7-7ee9ddea7b8b.json b/services/Logic/workflows/templates/arm/RunStartThrottledEvents_6524b22c-661e-48cd-87e7-7ee9ddea7b8b.json
index 0d66adea6..32e345316 100644
--- a/services/Logic/workflows/templates/arm/RunStartThrottledEvents_6524b22c-661e-48cd-87e7-7ee9ddea7b8b.json
+++ b/services/Logic/workflows/templates/arm/RunStartThrottledEvents_6524b22c-661e-48cd-87e7-7ee9ddea7b8b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunSuccessLatency_346ba728-f7a1-4ca4-8486-786d6ebb9f9a.json b/services/Logic/workflows/templates/arm/RunSuccessLatency_346ba728-f7a1-4ca4-8486-786d6ebb9f9a.json
index 29111bc4e..e28d498a0 100644
--- a/services/Logic/workflows/templates/arm/RunSuccessLatency_346ba728-f7a1-4ca4-8486-786d6ebb9f9a.json
+++ b/services/Logic/workflows/templates/arm/RunSuccessLatency_346ba728-f7a1-4ca4-8486-786d6ebb9f9a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunThrottledEvents_9d324d21-ab2b-48b7-a637-4b1d9891d6b5.json b/services/Logic/workflows/templates/arm/RunThrottledEvents_9d324d21-ab2b-48b7-a637-4b1d9891d6b5.json
index 29006dd2b..90116563a 100644
--- a/services/Logic/workflows/templates/arm/RunThrottledEvents_9d324d21-ab2b-48b7-a637-4b1d9891d6b5.json
+++ b/services/Logic/workflows/templates/arm/RunThrottledEvents_9d324d21-ab2b-48b7-a637-4b1d9891d6b5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunsCancelled_a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.json b/services/Logic/workflows/templates/arm/RunsCancelled_a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.json
index 2163c0e9c..81919c263 100644
--- a/services/Logic/workflows/templates/arm/RunsCancelled_a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.json
+++ b/services/Logic/workflows/templates/arm/RunsCancelled_a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunsCompleted_5d020d4d-9359-4ecd-934a-409d0e4a5abd.json b/services/Logic/workflows/templates/arm/RunsCompleted_5d020d4d-9359-4ecd-934a-409d0e4a5abd.json
index d4cd2a5d5..721fad4e6 100644
--- a/services/Logic/workflows/templates/arm/RunsCompleted_5d020d4d-9359-4ecd-934a-409d0e4a5abd.json
+++ b/services/Logic/workflows/templates/arm/RunsCompleted_5d020d4d-9359-4ecd-934a-409d0e4a5abd.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunsFailed_350cc22f-d202-4c7c-9239-cbdb3b71e14b.json b/services/Logic/workflows/templates/arm/RunsFailed_350cc22f-d202-4c7c-9239-cbdb3b71e14b.json
index 93fe35c32..9cce36da2 100644
--- a/services/Logic/workflows/templates/arm/RunsFailed_350cc22f-d202-4c7c-9239-cbdb3b71e14b.json
+++ b/services/Logic/workflows/templates/arm/RunsFailed_350cc22f-d202-4c7c-9239-cbdb3b71e14b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunsStarted_8f7a8cb8-feef-4eaa-9e74-18693ce9969e.json b/services/Logic/workflows/templates/arm/RunsStarted_8f7a8cb8-feef-4eaa-9e74-18693ce9969e.json
index 8c4ae877d..4b66e03cb 100644
--- a/services/Logic/workflows/templates/arm/RunsStarted_8f7a8cb8-feef-4eaa-9e74-18693ce9969e.json
+++ b/services/Logic/workflows/templates/arm/RunsStarted_8f7a8cb8-feef-4eaa-9e74-18693ce9969e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/RunsSucceeded_16c2d231-f28b-4146-9aa3-57d419eb8780.json b/services/Logic/workflows/templates/arm/RunsSucceeded_16c2d231-f28b-4146-9aa3-57d419eb8780.json
index da10102d1..1138f004e 100644
--- a/services/Logic/workflows/templates/arm/RunsSucceeded_16c2d231-f28b-4146-9aa3-57d419eb8780.json
+++ b/services/Logic/workflows/templates/arm/RunsSucceeded_16c2d231-f28b-4146-9aa3-57d419eb8780.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/TotalBillableExecutions_85bb464e-d9ce-496a-a66d-4c6d28d808df.json b/services/Logic/workflows/templates/arm/TotalBillableExecutions_85bb464e-d9ce-496a-a66d-4c6d28d808df.json
index ac9c4ca5f..71f32ed10 100644
--- a/services/Logic/workflows/templates/arm/TotalBillableExecutions_85bb464e-d9ce-496a-a66d-4c6d28d808df.json
+++ b/services/Logic/workflows/templates/arm/TotalBillableExecutions_85bb464e-d9ce-496a-a66d-4c6d28d808df.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/TriggerLatency_114f7c8e-e285-487d-9e50-7fe160769167.json b/services/Logic/workflows/templates/arm/TriggerLatency_114f7c8e-e285-487d-9e50-7fe160769167.json
index 0cadd971c..e15d68c79 100644
--- a/services/Logic/workflows/templates/arm/TriggerLatency_114f7c8e-e285-487d-9e50-7fe160769167.json
+++ b/services/Logic/workflows/templates/arm/TriggerLatency_114f7c8e-e285-487d-9e50-7fe160769167.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/TriggerThrottledEvents_42ae6a24-d545-4bbd-a7f9-8a3b6f977366.json b/services/Logic/workflows/templates/arm/TriggerThrottledEvents_42ae6a24-d545-4bbd-a7f9-8a3b6f977366.json
index 10b82cf15..23fc03a86 100644
--- a/services/Logic/workflows/templates/arm/TriggerThrottledEvents_42ae6a24-d545-4bbd-a7f9-8a3b6f977366.json
+++ b/services/Logic/workflows/templates/arm/TriggerThrottledEvents_42ae6a24-d545-4bbd-a7f9-8a3b6f977366.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/TriggersFailed_0378fd1f-976e-4a32-aa2b-25003e7d6ee5.json b/services/Logic/workflows/templates/arm/TriggersFailed_0378fd1f-976e-4a32-aa2b-25003e7d6ee5.json
index ffa4f99db..cabda3596 100644
--- a/services/Logic/workflows/templates/arm/TriggersFailed_0378fd1f-976e-4a32-aa2b-25003e7d6ee5.json
+++ b/services/Logic/workflows/templates/arm/TriggersFailed_0378fd1f-976e-4a32-aa2b-25003e7d6ee5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/arm/TriggersSkipped_cb35fd68-9568-42f9-b527-44e77726b100.json b/services/Logic/workflows/templates/arm/TriggersSkipped_cb35fd68-9568-42f9-b527-44e77726b100.json
index 6b41e3849..bfd3ef604 100644
--- a/services/Logic/workflows/templates/arm/TriggersSkipped_cb35fd68-9568-42f9-b527-44e77726b100.json
+++ b/services/Logic/workflows/templates/arm/TriggersSkipped_cb35fd68-9568-42f9-b527-44e77726b100.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Logic/workflows/templates/bicep/ActionLatency_d8bf77d2-8572-4392-8097-5e84f136513d.bicep b/services/Logic/workflows/templates/bicep/ActionLatency_d8bf77d2-8572-4392-8097-5e84f136513d.bicep
index c3e69722a..bb4534f0e 100644
--- a/services/Logic/workflows/templates/bicep/ActionLatency_d8bf77d2-8572-4392-8097-5e84f136513d.bicep
+++ b/services/Logic/workflows/templates/bicep/ActionLatency_d8bf77d2-8572-4392-8097-5e84f136513d.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/ActionThrottledEvents_5aa5790b-2bff-40b0-9099-38485b9a9e0a.bicep b/services/Logic/workflows/templates/bicep/ActionThrottledEvents_5aa5790b-2bff-40b0-9099-38485b9a9e0a.bicep
index 1c610b469..921024804 100644
--- a/services/Logic/workflows/templates/bicep/ActionThrottledEvents_5aa5790b-2bff-40b0-9099-38485b9a9e0a.bicep
+++ b/services/Logic/workflows/templates/bicep/ActionThrottledEvents_5aa5790b-2bff-40b0-9099-38485b9a9e0a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/ActionsFailed_514f695a-4f11-4a28-9516-f7f3b5b1c53b.bicep b/services/Logic/workflows/templates/bicep/ActionsFailed_514f695a-4f11-4a28-9516-f7f3b5b1c53b.bicep
index 1a8a10e7a..b2a716bbc 100644
--- a/services/Logic/workflows/templates/bicep/ActionsFailed_514f695a-4f11-4a28-9516-f7f3b5b1c53b.bicep
+++ b/services/Logic/workflows/templates/bicep/ActionsFailed_514f695a-4f11-4a28-9516-f7f3b5b1c53b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunFailurePercentage_c4864d80-dd28-4344-a135-03b600920c06.bicep b/services/Logic/workflows/templates/bicep/RunFailurePercentage_c4864d80-dd28-4344-a135-03b600920c06.bicep
index 1a4d2f7ed..0654f2f43 100644
--- a/services/Logic/workflows/templates/bicep/RunFailurePercentage_c4864d80-dd28-4344-a135-03b600920c06.bicep
+++ b/services/Logic/workflows/templates/bicep/RunFailurePercentage_c4864d80-dd28-4344-a135-03b600920c06.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunLatency_eb44cbdc-a259-4354-9b54-2bc72f811440.bicep b/services/Logic/workflows/templates/bicep/RunLatency_eb44cbdc-a259-4354-9b54-2bc72f811440.bicep
index ed0019c0a..afc833e92 100644
--- a/services/Logic/workflows/templates/bicep/RunLatency_eb44cbdc-a259-4354-9b54-2bc72f811440.bicep
+++ b/services/Logic/workflows/templates/bicep/RunLatency_eb44cbdc-a259-4354-9b54-2bc72f811440.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunStartThrottledEvents_6524b22c-661e-48cd-87e7-7ee9ddea7b8b.bicep b/services/Logic/workflows/templates/bicep/RunStartThrottledEvents_6524b22c-661e-48cd-87e7-7ee9ddea7b8b.bicep
index 33b902a23..065ead51c 100644
--- a/services/Logic/workflows/templates/bicep/RunStartThrottledEvents_6524b22c-661e-48cd-87e7-7ee9ddea7b8b.bicep
+++ b/services/Logic/workflows/templates/bicep/RunStartThrottledEvents_6524b22c-661e-48cd-87e7-7ee9ddea7b8b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunSuccessLatency_346ba728-f7a1-4ca4-8486-786d6ebb9f9a.bicep b/services/Logic/workflows/templates/bicep/RunSuccessLatency_346ba728-f7a1-4ca4-8486-786d6ebb9f9a.bicep
index 64b205d66..2bce6a13e 100644
--- a/services/Logic/workflows/templates/bicep/RunSuccessLatency_346ba728-f7a1-4ca4-8486-786d6ebb9f9a.bicep
+++ b/services/Logic/workflows/templates/bicep/RunSuccessLatency_346ba728-f7a1-4ca4-8486-786d6ebb9f9a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunThrottledEvents_9d324d21-ab2b-48b7-a637-4b1d9891d6b5.bicep b/services/Logic/workflows/templates/bicep/RunThrottledEvents_9d324d21-ab2b-48b7-a637-4b1d9891d6b5.bicep
index e6acca791..083a43e4c 100644
--- a/services/Logic/workflows/templates/bicep/RunThrottledEvents_9d324d21-ab2b-48b7-a637-4b1d9891d6b5.bicep
+++ b/services/Logic/workflows/templates/bicep/RunThrottledEvents_9d324d21-ab2b-48b7-a637-4b1d9891d6b5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunsCancelled_a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.bicep b/services/Logic/workflows/templates/bicep/RunsCancelled_a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.bicep
index f89373cf5..409ee10c5 100644
--- a/services/Logic/workflows/templates/bicep/RunsCancelled_a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.bicep
+++ b/services/Logic/workflows/templates/bicep/RunsCancelled_a4b5f1f3-aa12-4ed5-8a9d-a135204d22de.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunsCompleted_5d020d4d-9359-4ecd-934a-409d0e4a5abd.bicep b/services/Logic/workflows/templates/bicep/RunsCompleted_5d020d4d-9359-4ecd-934a-409d0e4a5abd.bicep
index 320219e9d..d8ba451e3 100644
--- a/services/Logic/workflows/templates/bicep/RunsCompleted_5d020d4d-9359-4ecd-934a-409d0e4a5abd.bicep
+++ b/services/Logic/workflows/templates/bicep/RunsCompleted_5d020d4d-9359-4ecd-934a-409d0e4a5abd.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunsFailed_350cc22f-d202-4c7c-9239-cbdb3b71e14b.bicep b/services/Logic/workflows/templates/bicep/RunsFailed_350cc22f-d202-4c7c-9239-cbdb3b71e14b.bicep
index d246ddbba..8204e6cff 100644
--- a/services/Logic/workflows/templates/bicep/RunsFailed_350cc22f-d202-4c7c-9239-cbdb3b71e14b.bicep
+++ b/services/Logic/workflows/templates/bicep/RunsFailed_350cc22f-d202-4c7c-9239-cbdb3b71e14b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunsStarted_8f7a8cb8-feef-4eaa-9e74-18693ce9969e.bicep b/services/Logic/workflows/templates/bicep/RunsStarted_8f7a8cb8-feef-4eaa-9e74-18693ce9969e.bicep
index 08ef419ab..2fb5d1c2a 100644
--- a/services/Logic/workflows/templates/bicep/RunsStarted_8f7a8cb8-feef-4eaa-9e74-18693ce9969e.bicep
+++ b/services/Logic/workflows/templates/bicep/RunsStarted_8f7a8cb8-feef-4eaa-9e74-18693ce9969e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/RunsSucceeded_16c2d231-f28b-4146-9aa3-57d419eb8780.bicep b/services/Logic/workflows/templates/bicep/RunsSucceeded_16c2d231-f28b-4146-9aa3-57d419eb8780.bicep
index 09413bcc6..b12706144 100644
--- a/services/Logic/workflows/templates/bicep/RunsSucceeded_16c2d231-f28b-4146-9aa3-57d419eb8780.bicep
+++ b/services/Logic/workflows/templates/bicep/RunsSucceeded_16c2d231-f28b-4146-9aa3-57d419eb8780.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/TotalBillableExecutions_85bb464e-d9ce-496a-a66d-4c6d28d808df.bicep b/services/Logic/workflows/templates/bicep/TotalBillableExecutions_85bb464e-d9ce-496a-a66d-4c6d28d808df.bicep
index afe494786..3eb7d59e4 100644
--- a/services/Logic/workflows/templates/bicep/TotalBillableExecutions_85bb464e-d9ce-496a-a66d-4c6d28d808df.bicep
+++ b/services/Logic/workflows/templates/bicep/TotalBillableExecutions_85bb464e-d9ce-496a-a66d-4c6d28d808df.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/TriggerLatency_114f7c8e-e285-487d-9e50-7fe160769167.bicep b/services/Logic/workflows/templates/bicep/TriggerLatency_114f7c8e-e285-487d-9e50-7fe160769167.bicep
index 4d7c70e69..bd16fcb9b 100644
--- a/services/Logic/workflows/templates/bicep/TriggerLatency_114f7c8e-e285-487d-9e50-7fe160769167.bicep
+++ b/services/Logic/workflows/templates/bicep/TriggerLatency_114f7c8e-e285-487d-9e50-7fe160769167.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/TriggerThrottledEvents_42ae6a24-d545-4bbd-a7f9-8a3b6f977366.bicep b/services/Logic/workflows/templates/bicep/TriggerThrottledEvents_42ae6a24-d545-4bbd-a7f9-8a3b6f977366.bicep
index 3850f2b07..6277b0715 100644
--- a/services/Logic/workflows/templates/bicep/TriggerThrottledEvents_42ae6a24-d545-4bbd-a7f9-8a3b6f977366.bicep
+++ b/services/Logic/workflows/templates/bicep/TriggerThrottledEvents_42ae6a24-d545-4bbd-a7f9-8a3b6f977366.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/TriggersFailed_0378fd1f-976e-4a32-aa2b-25003e7d6ee5.bicep b/services/Logic/workflows/templates/bicep/TriggersFailed_0378fd1f-976e-4a32-aa2b-25003e7d6ee5.bicep
index a3c18cc12..9c7d41b06 100644
--- a/services/Logic/workflows/templates/bicep/TriggersFailed_0378fd1f-976e-4a32-aa2b-25003e7d6ee5.bicep
+++ b/services/Logic/workflows/templates/bicep/TriggersFailed_0378fd1f-976e-4a32-aa2b-25003e7d6ee5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Logic/workflows/templates/bicep/TriggersSkipped_cb35fd68-9568-42f9-b527-44e77726b100.bicep b/services/Logic/workflows/templates/bicep/TriggersSkipped_cb35fd68-9568-42f9-b527-44e77726b100.bicep
index 8ad60aed6..d56f13741 100644
--- a/services/Logic/workflows/templates/bicep/TriggersSkipped_cb35fd68-9568-42f9-b527-44e77726b100.bicep
+++ b/services/Logic/workflows/templates/bicep/TriggersSkipped_cb35fd68-9568-42f9-b527-44e77726b100.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/MachineLearningServices/workspaces/templates/arm/FailedRuns_c897902c-40a5-497b-a0ce-86c3eda7c61d.json b/services/MachineLearningServices/workspaces/templates/arm/FailedRuns_c897902c-40a5-497b-a0ce-86c3eda7c61d.json
index 274903857..88147d066 100644
--- a/services/MachineLearningServices/workspaces/templates/arm/FailedRuns_c897902c-40a5-497b-a0ce-86c3eda7c61d.json
+++ b/services/MachineLearningServices/workspaces/templates/arm/FailedRuns_c897902c-40a5-497b-a0ce-86c3eda7c61d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/MachineLearningServices/workspaces/templates/arm/ModelDeployFailed_0337a76f-238e-4d4d-9cd1-48b205874dbb.json b/services/MachineLearningServices/workspaces/templates/arm/ModelDeployFailed_0337a76f-238e-4d4d-9cd1-48b205874dbb.json
index c0e7f0473..b05f85fd2 100644
--- a/services/MachineLearningServices/workspaces/templates/arm/ModelDeployFailed_0337a76f-238e-4d4d-9cd1-48b205874dbb.json
+++ b/services/MachineLearningServices/workspaces/templates/arm/ModelDeployFailed_0337a76f-238e-4d4d-9cd1-48b205874dbb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/MachineLearningServices/workspaces/templates/arm/NotRespondingRuns_d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.json b/services/MachineLearningServices/workspaces/templates/arm/NotRespondingRuns_d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.json
index 3928d116b..8883fe5db 100644
--- a/services/MachineLearningServices/workspaces/templates/arm/NotRespondingRuns_d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.json
+++ b/services/MachineLearningServices/workspaces/templates/arm/NotRespondingRuns_d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/MachineLearningServices/workspaces/templates/arm/QuotaUtilizationPercentage_be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.json b/services/MachineLearningServices/workspaces/templates/arm/QuotaUtilizationPercentage_be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.json
index d2b2f5e8d..7c28de8d9 100644
--- a/services/MachineLearningServices/workspaces/templates/arm/QuotaUtilizationPercentage_be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.json
+++ b/services/MachineLearningServices/workspaces/templates/arm/QuotaUtilizationPercentage_be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/MachineLearningServices/workspaces/templates/arm/UnusableNodes_a171bc0c-676f-464b-a7b5-e50cd6c612a2.json b/services/MachineLearningServices/workspaces/templates/arm/UnusableNodes_a171bc0c-676f-464b-a7b5-e50cd6c612a2.json
index bda61d6bb..0bdbb1d82 100644
--- a/services/MachineLearningServices/workspaces/templates/arm/UnusableNodes_a171bc0c-676f-464b-a7b5-e50cd6c612a2.json
+++ b/services/MachineLearningServices/workspaces/templates/arm/UnusableNodes_a171bc0c-676f-464b-a7b5-e50cd6c612a2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/MachineLearningServices/workspaces/templates/bicep/FailedRuns_c897902c-40a5-497b-a0ce-86c3eda7c61d.bicep b/services/MachineLearningServices/workspaces/templates/bicep/FailedRuns_c897902c-40a5-497b-a0ce-86c3eda7c61d.bicep
index 2188374d9..b2a10a574 100644
--- a/services/MachineLearningServices/workspaces/templates/bicep/FailedRuns_c897902c-40a5-497b-a0ce-86c3eda7c61d.bicep
+++ b/services/MachineLearningServices/workspaces/templates/bicep/FailedRuns_c897902c-40a5-497b-a0ce-86c3eda7c61d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/MachineLearningServices/workspaces/templates/bicep/ModelDeployFailed_0337a76f-238e-4d4d-9cd1-48b205874dbb.bicep b/services/MachineLearningServices/workspaces/templates/bicep/ModelDeployFailed_0337a76f-238e-4d4d-9cd1-48b205874dbb.bicep
index 04325f934..9f9e33bc3 100644
--- a/services/MachineLearningServices/workspaces/templates/bicep/ModelDeployFailed_0337a76f-238e-4d4d-9cd1-48b205874dbb.bicep
+++ b/services/MachineLearningServices/workspaces/templates/bicep/ModelDeployFailed_0337a76f-238e-4d4d-9cd1-48b205874dbb.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/MachineLearningServices/workspaces/templates/bicep/NotRespondingRuns_d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.bicep b/services/MachineLearningServices/workspaces/templates/bicep/NotRespondingRuns_d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.bicep
index 2e81b12d2..e387dd92d 100644
--- a/services/MachineLearningServices/workspaces/templates/bicep/NotRespondingRuns_d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.bicep
+++ b/services/MachineLearningServices/workspaces/templates/bicep/NotRespondingRuns_d3b80f22-9f1d-3038-86ff-c4dd5ba02d7a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/MachineLearningServices/workspaces/templates/bicep/QuotaUtilizationPercentage_be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.bicep b/services/MachineLearningServices/workspaces/templates/bicep/QuotaUtilizationPercentage_be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.bicep
index 8fff070e3..4db34c917 100644
--- a/services/MachineLearningServices/workspaces/templates/bicep/QuotaUtilizationPercentage_be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.bicep
+++ b/services/MachineLearningServices/workspaces/templates/bicep/QuotaUtilizationPercentage_be3f1bfc-c21a-4399-9b9f-a33ebdc470cb.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/MachineLearningServices/workspaces/templates/bicep/UnusableNodes_a171bc0c-676f-464b-a7b5-e50cd6c612a2.bicep b/services/MachineLearningServices/workspaces/templates/bicep/UnusableNodes_a171bc0c-676f-464b-a7b5-e50cd6c612a2.bicep
index 93dd546a6..f3fba2595 100644
--- a/services/MachineLearningServices/workspaces/templates/bicep/UnusableNodes_a171bc0c-676f-464b-a7b5-e50cd6c612a2.bicep
+++ b/services/MachineLearningServices/workspaces/templates/bicep/UnusableNodes_a171bc0c-676f-464b-a7b5-e50cd6c612a2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-AverageReadLatency_30b0cb86-ba8b-4eeb-9067-88456ec403ad.json b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-AverageReadLatency_30b0cb86-ba8b-4eeb-9067-88456ec403ad.json
index 580c78bb5..7772dc2c5 100644
--- a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-AverageReadLatency_30b0cb86-ba8b-4eeb-9067-88456ec403ad.json
+++ b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-AverageReadLatency_30b0cb86-ba8b-4eeb-9067-88456ec403ad.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-AverageWriteLatency_075f0066-51f6-4c36-8000-ce7070493674.json b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-AverageWriteLatency_075f0066-51f6-4c36-8000-ce7070493674.json
index 61ccd4e58..8aea8de46 100644
--- a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-AverageWriteLatency_075f0066-51f6-4c36-8000-ce7070493674.json
+++ b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-AverageWriteLatency_075f0066-51f6-4c36-8000-ce7070493674.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-CbsVolumeOperationComplete_27768691-301d-4938-bd8a-85598c2b50c6.json b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-CbsVolumeOperationComplete_27768691-301d-4938-bd8a-85598c2b50c6.json
index e41c91366..b3d154de4 100644
--- a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-CbsVolumeOperationComplete_27768691-301d-4938-bd8a-85598c2b50c6.json
+++ b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-CbsVolumeOperationComplete_27768691-301d-4938-bd8a-85598c2b50c6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeAllocatedSize_1be09484-96ee-4399-8ed4-35f5f4b5c23e.json b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeAllocatedSize_1be09484-96ee-4399-8ed4-35f5f4b5c23e.json
index fc5bfadb2..b7ffa05c5 100644
--- a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeAllocatedSize_1be09484-96ee-4399-8ed4-35f5f4b5c23e.json
+++ b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeAllocatedSize_1be09484-96ee-4399-8ed4-35f5f4b5c23e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeConsumedSizePercentage_d474e6d2-0b9a-4912-ae61-16dc23126b3f.json b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeConsumedSizePercentage_d474e6d2-0b9a-4912-ae61-16dc23126b3f.json
index 0a5bc9f23..602dc0867 100644
--- a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeConsumedSizePercentage_d474e6d2-0b9a-4912-ae61-16dc23126b3f.json
+++ b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeConsumedSizePercentage_d474e6d2-0b9a-4912-ae61-16dc23126b3f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeLogicalSize_149f6b6c-4729-4da4-af00-bccbb1cce9ae.json b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeLogicalSize_149f6b6c-4729-4da4-af00-bccbb1cce9ae.json
index 0b2d0f4d7..689ce1e77 100644
--- a/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeLogicalSize_149f6b6c-4729-4da4-af00-bccbb1cce9ae.json
+++ b/services/NetApp/netAppAccounts/templates/arm/capacityPoolsvolumes-VolumeLogicalSize_149f6b6c-4729-4da4-af00-bccbb1cce9ae.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-AverageReadLatency_30b0cb86-ba8b-4eeb-9067-88456ec403ad.bicep b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-AverageReadLatency_30b0cb86-ba8b-4eeb-9067-88456ec403ad.bicep
index 1acbf2bd0..256b92ce2 100644
--- a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-AverageReadLatency_30b0cb86-ba8b-4eeb-9067-88456ec403ad.bicep
+++ b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-AverageReadLatency_30b0cb86-ba8b-4eeb-9067-88456ec403ad.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-AverageWriteLatency_075f0066-51f6-4c36-8000-ce7070493674.bicep b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-AverageWriteLatency_075f0066-51f6-4c36-8000-ce7070493674.bicep
index e7d962680..cc83d632e 100644
--- a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-AverageWriteLatency_075f0066-51f6-4c36-8000-ce7070493674.bicep
+++ b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-AverageWriteLatency_075f0066-51f6-4c36-8000-ce7070493674.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-CbsVolumeOperationComplete_27768691-301d-4938-bd8a-85598c2b50c6.bicep b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-CbsVolumeOperationComplete_27768691-301d-4938-bd8a-85598c2b50c6.bicep
index 4df244b94..28a7ef93f 100644
--- a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-CbsVolumeOperationComplete_27768691-301d-4938-bd8a-85598c2b50c6.bicep
+++ b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-CbsVolumeOperationComplete_27768691-301d-4938-bd8a-85598c2b50c6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeAllocatedSize_1be09484-96ee-4399-8ed4-35f5f4b5c23e.bicep b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeAllocatedSize_1be09484-96ee-4399-8ed4-35f5f4b5c23e.bicep
index 704cf0cfb..de40f0ad4 100644
--- a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeAllocatedSize_1be09484-96ee-4399-8ed4-35f5f4b5c23e.bicep
+++ b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeAllocatedSize_1be09484-96ee-4399-8ed4-35f5f4b5c23e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeConsumedSizePercentage_d474e6d2-0b9a-4912-ae61-16dc23126b3f.bicep b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeConsumedSizePercentage_d474e6d2-0b9a-4912-ae61-16dc23126b3f.bicep
index 7c5e815ad..c1d7ac9a1 100644
--- a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeConsumedSizePercentage_d474e6d2-0b9a-4912-ae61-16dc23126b3f.bicep
+++ b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeConsumedSizePercentage_d474e6d2-0b9a-4912-ae61-16dc23126b3f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeLogicalSize_149f6b6c-4729-4da4-af00-bccbb1cce9ae.bicep b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeLogicalSize_149f6b6c-4729-4da4-af00-bccbb1cce9ae.bicep
index 64ba8aed2..c86463332 100644
--- a/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeLogicalSize_149f6b6c-4729-4da4-af00-bccbb1cce9ae.bicep
+++ b/services/NetApp/netAppAccounts/templates/bicep/capacityPoolsvolumes-VolumeLogicalSize_149f6b6c-4729-4da4-af00-bccbb1cce9ae.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/arm/ApplicationGatewayTotalTime_73fa1878-d22d-4e8d-922d-9f146454cc40.json b/services/Network/applicationGateways/templates/arm/ApplicationGatewayTotalTime_73fa1878-d22d-4e8d-922d-9f146454cc40.json
index d67dbcf2c..b1dd03d68 100644
--- a/services/Network/applicationGateways/templates/arm/ApplicationGatewayTotalTime_73fa1878-d22d-4e8d-922d-9f146454cc40.json
+++ b/services/Network/applicationGateways/templates/arm/ApplicationGatewayTotalTime_73fa1878-d22d-4e8d-922d-9f146454cc40.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/AzwafSecRule_d5827f03-efb6-4257-96e2-b6e34e3bef7e.json b/services/Network/applicationGateways/templates/arm/AzwafSecRule_d5827f03-efb6-4257-96e2-b6e34e3bef7e.json
index 7b6c165d3..07e3e9912 100644
--- a/services/Network/applicationGateways/templates/arm/AzwafSecRule_d5827f03-efb6-4257-96e2-b6e34e3bef7e.json
+++ b/services/Network/applicationGateways/templates/arm/AzwafSecRule_d5827f03-efb6-4257-96e2-b6e34e3bef7e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/BackendConnectTime_e636b3ea-da2d-42f5-aedf-12b69432ac1f.json b/services/Network/applicationGateways/templates/arm/BackendConnectTime_e636b3ea-da2d-42f5-aedf-12b69432ac1f.json
index 3eb30c34c..4510f8dc0 100644
--- a/services/Network/applicationGateways/templates/arm/BackendConnectTime_e636b3ea-da2d-42f5-aedf-12b69432ac1f.json
+++ b/services/Network/applicationGateways/templates/arm/BackendConnectTime_e636b3ea-da2d-42f5-aedf-12b69432ac1f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/BackendFirstByteResponseTime_3cbcad15-0bb6-423e-87c1-4d40722103d6.json b/services/Network/applicationGateways/templates/arm/BackendFirstByteResponseTime_3cbcad15-0bb6-423e-87c1-4d40722103d6.json
index 6d06d3378..4e8223ac2 100644
--- a/services/Network/applicationGateways/templates/arm/BackendFirstByteResponseTime_3cbcad15-0bb6-423e-87c1-4d40722103d6.json
+++ b/services/Network/applicationGateways/templates/arm/BackendFirstByteResponseTime_3cbcad15-0bb6-423e-87c1-4d40722103d6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/BackendLastByteResponseTime_57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.json b/services/Network/applicationGateways/templates/arm/BackendLastByteResponseTime_57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.json
index 066c77260..53b8368eb 100644
--- a/services/Network/applicationGateways/templates/arm/BackendLastByteResponseTime_57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.json
+++ b/services/Network/applicationGateways/templates/arm/BackendLastByteResponseTime_57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/BackendResponseStatus_c319a40c-3750-4fb4-a36d-beb3d09ef2ee.json b/services/Network/applicationGateways/templates/arm/BackendResponseStatus_c319a40c-3750-4fb4-a36d-beb3d09ef2ee.json
index d9aafddff..a930ea917 100644
--- a/services/Network/applicationGateways/templates/arm/BackendResponseStatus_c319a40c-3750-4fb4-a36d-beb3d09ef2ee.json
+++ b/services/Network/applicationGateways/templates/arm/BackendResponseStatus_c319a40c-3750-4fb4-a36d-beb3d09ef2ee.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/CapacityUnits_d43ca9ef-6211-40ff-972e-fffb17923fc9.json b/services/Network/applicationGateways/templates/arm/CapacityUnits_d43ca9ef-6211-40ff-972e-fffb17923fc9.json
index 7977a189c..eb8303262 100644
--- a/services/Network/applicationGateways/templates/arm/CapacityUnits_d43ca9ef-6211-40ff-972e-fffb17923fc9.json
+++ b/services/Network/applicationGateways/templates/arm/CapacityUnits_d43ca9ef-6211-40ff-972e-fffb17923fc9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/ComputeUnits_e59f4d17-2600-4bcc-ab57-6c695d37a0b2.json b/services/Network/applicationGateways/templates/arm/ComputeUnits_e59f4d17-2600-4bcc-ab57-6c695d37a0b2.json
index 9668d4c66..a8f3af7c2 100644
--- a/services/Network/applicationGateways/templates/arm/ComputeUnits_e59f4d17-2600-4bcc-ab57-6c695d37a0b2.json
+++ b/services/Network/applicationGateways/templates/arm/ComputeUnits_e59f4d17-2600-4bcc-ab57-6c695d37a0b2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/CpuUtilization_9c8be4c5-5ba3-47ef-8a0a-97144734a336.json b/services/Network/applicationGateways/templates/arm/CpuUtilization_9c8be4c5-5ba3-47ef-8a0a-97144734a336.json
index dd97b6157..b4db30c45 100644
--- a/services/Network/applicationGateways/templates/arm/CpuUtilization_9c8be4c5-5ba3-47ef-8a0a-97144734a336.json
+++ b/services/Network/applicationGateways/templates/arm/CpuUtilization_9c8be4c5-5ba3-47ef-8a0a-97144734a336.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/CurrentConnections_695b9710-e432-4521-9042-36287f0fc5ba.json b/services/Network/applicationGateways/templates/arm/CurrentConnections_695b9710-e432-4521-9042-36287f0fc5ba.json
index ff4fc5137..b2309ab75 100644
--- a/services/Network/applicationGateways/templates/arm/CurrentConnections_695b9710-e432-4521-9042-36287f0fc5ba.json
+++ b/services/Network/applicationGateways/templates/arm/CurrentConnections_695b9710-e432-4521-9042-36287f0fc5ba.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/EstimatedBilledCapacityUnits_e77b6820-e115-4e33-97c1-9bb902eec3b2.json b/services/Network/applicationGateways/templates/arm/EstimatedBilledCapacityUnits_e77b6820-e115-4e33-97c1-9bb902eec3b2.json
index c199a7ea7..a6c2ece61 100644
--- a/services/Network/applicationGateways/templates/arm/EstimatedBilledCapacityUnits_e77b6820-e115-4e33-97c1-9bb902eec3b2.json
+++ b/services/Network/applicationGateways/templates/arm/EstimatedBilledCapacityUnits_e77b6820-e115-4e33-97c1-9bb902eec3b2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/FailedRequests_73afde26-bd0c-4c31-8801-5b2444629448.json b/services/Network/applicationGateways/templates/arm/FailedRequests_73afde26-bd0c-4c31-8801-5b2444629448.json
index 6fd8b7218..0ac679654 100644
--- a/services/Network/applicationGateways/templates/arm/FailedRequests_73afde26-bd0c-4c31-8801-5b2444629448.json
+++ b/services/Network/applicationGateways/templates/arm/FailedRequests_73afde26-bd0c-4c31-8801-5b2444629448.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/HealthyHostCount_f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.json b/services/Network/applicationGateways/templates/arm/HealthyHostCount_f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.json
index 36bf3e40a..e380144bb 100644
--- a/services/Network/applicationGateways/templates/arm/HealthyHostCount_f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.json
+++ b/services/Network/applicationGateways/templates/arm/HealthyHostCount_f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/ResponseStatus_6d77d848-23b1-4ff4-b9de-d421845d9566.json b/services/Network/applicationGateways/templates/arm/ResponseStatus_6d77d848-23b1-4ff4-b9de-d421845d9566.json
index 4d6c22be0..99f84202a 100644
--- a/services/Network/applicationGateways/templates/arm/ResponseStatus_6d77d848-23b1-4ff4-b9de-d421845d9566.json
+++ b/services/Network/applicationGateways/templates/arm/ResponseStatus_6d77d848-23b1-4ff4-b9de-d421845d9566.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/Throughput_7640663c-b2f7-41bf-9419-be5e8cfdf74e.json b/services/Network/applicationGateways/templates/arm/Throughput_7640663c-b2f7-41bf-9419-be5e8cfdf74e.json
index aab5edd50..2845e3724 100644
--- a/services/Network/applicationGateways/templates/arm/Throughput_7640663c-b2f7-41bf-9419-be5e8cfdf74e.json
+++ b/services/Network/applicationGateways/templates/arm/Throughput_7640663c-b2f7-41bf-9419-be5e8cfdf74e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/TotalRequests_06982a17-4def-405d-bb59-4ecfb6486f9e.json b/services/Network/applicationGateways/templates/arm/TotalRequests_06982a17-4def-405d-bb59-4ecfb6486f9e.json
index f828467ba..ee169b2fa 100644
--- a/services/Network/applicationGateways/templates/arm/TotalRequests_06982a17-4def-405d-bb59-4ecfb6486f9e.json
+++ b/services/Network/applicationGateways/templates/arm/TotalRequests_06982a17-4def-405d-bb59-4ecfb6486f9e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/arm/UnhealthyHostCount_c88acf4e-2d23-4ac7-93fb-e44ded53ecee.json b/services/Network/applicationGateways/templates/arm/UnhealthyHostCount_c88acf4e-2d23-4ac7-93fb-e44ded53ecee.json
index 3602d00ce..f2c2656cc 100644
--- a/services/Network/applicationGateways/templates/arm/UnhealthyHostCount_c88acf4e-2d23-4ac7-93fb-e44ded53ecee.json
+++ b/services/Network/applicationGateways/templates/arm/UnhealthyHostCount_c88acf4e-2d23-4ac7-93fb-e44ded53ecee.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/applicationGateways/templates/bicep/ApplicationGatewayTotalTime_73fa1878-d22d-4e8d-922d-9f146454cc40.bicep b/services/Network/applicationGateways/templates/bicep/ApplicationGatewayTotalTime_73fa1878-d22d-4e8d-922d-9f146454cc40.bicep
index 8e3ca530b..fbe9676b0 100644
--- a/services/Network/applicationGateways/templates/bicep/ApplicationGatewayTotalTime_73fa1878-d22d-4e8d-922d-9f146454cc40.bicep
+++ b/services/Network/applicationGateways/templates/bicep/ApplicationGatewayTotalTime_73fa1878-d22d-4e8d-922d-9f146454cc40.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/AzwafSecRule_d5827f03-efb6-4257-96e2-b6e34e3bef7e.bicep b/services/Network/applicationGateways/templates/bicep/AzwafSecRule_d5827f03-efb6-4257-96e2-b6e34e3bef7e.bicep
index 74d5e292b..ffe917bf3 100644
--- a/services/Network/applicationGateways/templates/bicep/AzwafSecRule_d5827f03-efb6-4257-96e2-b6e34e3bef7e.bicep
+++ b/services/Network/applicationGateways/templates/bicep/AzwafSecRule_d5827f03-efb6-4257-96e2-b6e34e3bef7e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/BackendConnectTime_e636b3ea-da2d-42f5-aedf-12b69432ac1f.bicep b/services/Network/applicationGateways/templates/bicep/BackendConnectTime_e636b3ea-da2d-42f5-aedf-12b69432ac1f.bicep
index b548bb1ce..52d3766e8 100644
--- a/services/Network/applicationGateways/templates/bicep/BackendConnectTime_e636b3ea-da2d-42f5-aedf-12b69432ac1f.bicep
+++ b/services/Network/applicationGateways/templates/bicep/BackendConnectTime_e636b3ea-da2d-42f5-aedf-12b69432ac1f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/BackendFirstByteResponseTime_3cbcad15-0bb6-423e-87c1-4d40722103d6.bicep b/services/Network/applicationGateways/templates/bicep/BackendFirstByteResponseTime_3cbcad15-0bb6-423e-87c1-4d40722103d6.bicep
index 7177dc8a2..dcb0f9344 100644
--- a/services/Network/applicationGateways/templates/bicep/BackendFirstByteResponseTime_3cbcad15-0bb6-423e-87c1-4d40722103d6.bicep
+++ b/services/Network/applicationGateways/templates/bicep/BackendFirstByteResponseTime_3cbcad15-0bb6-423e-87c1-4d40722103d6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/BackendLastByteResponseTime_57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.bicep b/services/Network/applicationGateways/templates/bicep/BackendLastByteResponseTime_57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.bicep
index 11ea6ab1e..d3ce2edab 100644
--- a/services/Network/applicationGateways/templates/bicep/BackendLastByteResponseTime_57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.bicep
+++ b/services/Network/applicationGateways/templates/bicep/BackendLastByteResponseTime_57c7b576-d4b2-4aa7-8c58-5c0ccbf94726.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/BackendResponseStatus_c319a40c-3750-4fb4-a36d-beb3d09ef2ee.bicep b/services/Network/applicationGateways/templates/bicep/BackendResponseStatus_c319a40c-3750-4fb4-a36d-beb3d09ef2ee.bicep
index a111fc012..59001921a 100644
--- a/services/Network/applicationGateways/templates/bicep/BackendResponseStatus_c319a40c-3750-4fb4-a36d-beb3d09ef2ee.bicep
+++ b/services/Network/applicationGateways/templates/bicep/BackendResponseStatus_c319a40c-3750-4fb4-a36d-beb3d09ef2ee.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/CapacityUnits_d43ca9ef-6211-40ff-972e-fffb17923fc9.bicep b/services/Network/applicationGateways/templates/bicep/CapacityUnits_d43ca9ef-6211-40ff-972e-fffb17923fc9.bicep
index d9cfe4bc4..37b215fbc 100644
--- a/services/Network/applicationGateways/templates/bicep/CapacityUnits_d43ca9ef-6211-40ff-972e-fffb17923fc9.bicep
+++ b/services/Network/applicationGateways/templates/bicep/CapacityUnits_d43ca9ef-6211-40ff-972e-fffb17923fc9.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/ComputeUnits_e59f4d17-2600-4bcc-ab57-6c695d37a0b2.bicep b/services/Network/applicationGateways/templates/bicep/ComputeUnits_e59f4d17-2600-4bcc-ab57-6c695d37a0b2.bicep
index c56a63e4b..f457a99d3 100644
--- a/services/Network/applicationGateways/templates/bicep/ComputeUnits_e59f4d17-2600-4bcc-ab57-6c695d37a0b2.bicep
+++ b/services/Network/applicationGateways/templates/bicep/ComputeUnits_e59f4d17-2600-4bcc-ab57-6c695d37a0b2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/CpuUtilization_9c8be4c5-5ba3-47ef-8a0a-97144734a336.bicep b/services/Network/applicationGateways/templates/bicep/CpuUtilization_9c8be4c5-5ba3-47ef-8a0a-97144734a336.bicep
index 7521a5c31..3ec6ded15 100644
--- a/services/Network/applicationGateways/templates/bicep/CpuUtilization_9c8be4c5-5ba3-47ef-8a0a-97144734a336.bicep
+++ b/services/Network/applicationGateways/templates/bicep/CpuUtilization_9c8be4c5-5ba3-47ef-8a0a-97144734a336.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/CurrentConnections_695b9710-e432-4521-9042-36287f0fc5ba.bicep b/services/Network/applicationGateways/templates/bicep/CurrentConnections_695b9710-e432-4521-9042-36287f0fc5ba.bicep
index cbdbcbf00..59547ad00 100644
--- a/services/Network/applicationGateways/templates/bicep/CurrentConnections_695b9710-e432-4521-9042-36287f0fc5ba.bicep
+++ b/services/Network/applicationGateways/templates/bicep/CurrentConnections_695b9710-e432-4521-9042-36287f0fc5ba.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/EstimatedBilledCapacityUnits_e77b6820-e115-4e33-97c1-9bb902eec3b2.bicep b/services/Network/applicationGateways/templates/bicep/EstimatedBilledCapacityUnits_e77b6820-e115-4e33-97c1-9bb902eec3b2.bicep
index 9d7de2144..ad33e1333 100644
--- a/services/Network/applicationGateways/templates/bicep/EstimatedBilledCapacityUnits_e77b6820-e115-4e33-97c1-9bb902eec3b2.bicep
+++ b/services/Network/applicationGateways/templates/bicep/EstimatedBilledCapacityUnits_e77b6820-e115-4e33-97c1-9bb902eec3b2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/FailedRequests_73afde26-bd0c-4c31-8801-5b2444629448.bicep b/services/Network/applicationGateways/templates/bicep/FailedRequests_73afde26-bd0c-4c31-8801-5b2444629448.bicep
index 2ce173728..dddfb7b41 100644
--- a/services/Network/applicationGateways/templates/bicep/FailedRequests_73afde26-bd0c-4c31-8801-5b2444629448.bicep
+++ b/services/Network/applicationGateways/templates/bicep/FailedRequests_73afde26-bd0c-4c31-8801-5b2444629448.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/HealthyHostCount_f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.bicep b/services/Network/applicationGateways/templates/bicep/HealthyHostCount_f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.bicep
index 24afb5701..49c910c71 100644
--- a/services/Network/applicationGateways/templates/bicep/HealthyHostCount_f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.bicep
+++ b/services/Network/applicationGateways/templates/bicep/HealthyHostCount_f03d1a7a-6bd3-42ae-89db-b36fd6ce5633.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/ResponseStatus_6d77d848-23b1-4ff4-b9de-d421845d9566.bicep b/services/Network/applicationGateways/templates/bicep/ResponseStatus_6d77d848-23b1-4ff4-b9de-d421845d9566.bicep
index e7de12dba..fadb79a8f 100644
--- a/services/Network/applicationGateways/templates/bicep/ResponseStatus_6d77d848-23b1-4ff4-b9de-d421845d9566.bicep
+++ b/services/Network/applicationGateways/templates/bicep/ResponseStatus_6d77d848-23b1-4ff4-b9de-d421845d9566.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/Throughput_7640663c-b2f7-41bf-9419-be5e8cfdf74e.bicep b/services/Network/applicationGateways/templates/bicep/Throughput_7640663c-b2f7-41bf-9419-be5e8cfdf74e.bicep
index 9c5d1fdba..f3a518bda 100644
--- a/services/Network/applicationGateways/templates/bicep/Throughput_7640663c-b2f7-41bf-9419-be5e8cfdf74e.bicep
+++ b/services/Network/applicationGateways/templates/bicep/Throughput_7640663c-b2f7-41bf-9419-be5e8cfdf74e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/TotalRequests_06982a17-4def-405d-bb59-4ecfb6486f9e.bicep b/services/Network/applicationGateways/templates/bicep/TotalRequests_06982a17-4def-405d-bb59-4ecfb6486f9e.bicep
index 81e2d8a3d..3137a0b38 100644
--- a/services/Network/applicationGateways/templates/bicep/TotalRequests_06982a17-4def-405d-bb59-4ecfb6486f9e.bicep
+++ b/services/Network/applicationGateways/templates/bicep/TotalRequests_06982a17-4def-405d-bb59-4ecfb6486f9e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/applicationGateways/templates/bicep/UnhealthyHostCount_c88acf4e-2d23-4ac7-93fb-e44ded53ecee.bicep b/services/Network/applicationGateways/templates/bicep/UnhealthyHostCount_c88acf4e-2d23-4ac7-93fb-e44ded53ecee.bicep
index f7788417d..2fff4636b 100644
--- a/services/Network/applicationGateways/templates/bicep/UnhealthyHostCount_c88acf4e-2d23-4ac7-93fb-e44ded53ecee.bicep
+++ b/services/Network/applicationGateways/templates/bicep/UnhealthyHostCount_c88acf4e-2d23-4ac7-93fb-e44ded53ecee.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/azureFirewalls/templates/arm/ActivityLogAzureFirewallDelete_0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.json b/services/Network/azureFirewalls/templates/arm/ActivityLogAzureFirewallDelete_0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.json
index 9726c15c3..fcc1201e8 100644
--- a/services/Network/azureFirewalls/templates/arm/ActivityLogAzureFirewallDelete_0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.json
+++ b/services/Network/azureFirewalls/templates/arm/ActivityLogAzureFirewallDelete_0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.json
@@ -79,7 +79,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/azureFirewalls/templates/arm/FirewallHealth_0ff72493-3822-4315-a146-8977a0963e39.json b/services/Network/azureFirewalls/templates/arm/FirewallHealth_0ff72493-3822-4315-a146-8977a0963e39.json
index 113f2d132..9c7c66d7d 100644
--- a/services/Network/azureFirewalls/templates/arm/FirewallHealth_0ff72493-3822-4315-a146-8977a0963e39.json
+++ b/services/Network/azureFirewalls/templates/arm/FirewallHealth_0ff72493-3822-4315-a146-8977a0963e39.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/azureFirewalls/templates/arm/SNATPortUtilization_b23f1e82-a791-4610-aaa6-2d960b48b81d.json b/services/Network/azureFirewalls/templates/arm/SNATPortUtilization_b23f1e82-a791-4610-aaa6-2d960b48b81d.json
index a9c16b9f3..0c5aad866 100644
--- a/services/Network/azureFirewalls/templates/arm/SNATPortUtilization_b23f1e82-a791-4610-aaa6-2d960b48b81d.json
+++ b/services/Network/azureFirewalls/templates/arm/SNATPortUtilization_b23f1e82-a791-4610-aaa6-2d960b48b81d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/azureFirewalls/templates/arm/Throughput_e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.json b/services/Network/azureFirewalls/templates/arm/Throughput_e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.json
index 40d5eeab9..a6edd2cf7 100644
--- a/services/Network/azureFirewalls/templates/arm/Throughput_e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.json
+++ b/services/Network/azureFirewalls/templates/arm/Throughput_e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/azureFirewalls/templates/bicep/ActivityLogAzureFirewallDelete_0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.bicep b/services/Network/azureFirewalls/templates/bicep/ActivityLogAzureFirewallDelete_0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.bicep
index d38949d79..fd1ab5172 100644
--- a/services/Network/azureFirewalls/templates/bicep/ActivityLogAzureFirewallDelete_0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.bicep
+++ b/services/Network/azureFirewalls/templates/bicep/ActivityLogAzureFirewallDelete_0b0c11e3-3598-4b2f-8cd8-77a24806bb9d.bicep
@@ -52,7 +52,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/azureFirewalls/templates/bicep/FirewallHealth_0ff72493-3822-4315-a146-8977a0963e39.bicep b/services/Network/azureFirewalls/templates/bicep/FirewallHealth_0ff72493-3822-4315-a146-8977a0963e39.bicep
index 21a28924f..e26d3f491 100644
--- a/services/Network/azureFirewalls/templates/bicep/FirewallHealth_0ff72493-3822-4315-a146-8977a0963e39.bicep
+++ b/services/Network/azureFirewalls/templates/bicep/FirewallHealth_0ff72493-3822-4315-a146-8977a0963e39.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/azureFirewalls/templates/bicep/SNATPortUtilization_b23f1e82-a791-4610-aaa6-2d960b48b81d.bicep b/services/Network/azureFirewalls/templates/bicep/SNATPortUtilization_b23f1e82-a791-4610-aaa6-2d960b48b81d.bicep
index 2a762f488..cd2c4d5cc 100644
--- a/services/Network/azureFirewalls/templates/bicep/SNATPortUtilization_b23f1e82-a791-4610-aaa6-2d960b48b81d.bicep
+++ b/services/Network/azureFirewalls/templates/bicep/SNATPortUtilization_b23f1e82-a791-4610-aaa6-2d960b48b81d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/azureFirewalls/templates/bicep/Throughput_e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.bicep b/services/Network/azureFirewalls/templates/bicep/Throughput_e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.bicep
index 943be066e..61788a702 100644
--- a/services/Network/azureFirewalls/templates/bicep/Throughput_e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.bicep
+++ b/services/Network/azureFirewalls/templates/bicep/Throughput_e8fdab4c-cc9a-4729-8619-a0f468f4dfdc.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/bastionHosts/templates/arm/BastionCommunicationStatus_afd848a8-8b18-410c-bcc1-1b6f06a5a231.json b/services/Network/bastionHosts/templates/arm/BastionCommunicationStatus_afd848a8-8b18-410c-bcc1-1b6f06a5a231.json
index da1d50afe..47bcfe371 100644
--- a/services/Network/bastionHosts/templates/arm/BastionCommunicationStatus_afd848a8-8b18-410c-bcc1-1b6f06a5a231.json
+++ b/services/Network/bastionHosts/templates/arm/BastionCommunicationStatus_afd848a8-8b18-410c-bcc1-1b6f06a5a231.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/bastionHosts/templates/arm/CPUUsage_0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.json b/services/Network/bastionHosts/templates/arm/CPUUsage_0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.json
index 410c3d0b4..86d9074ab 100644
--- a/services/Network/bastionHosts/templates/arm/CPUUsage_0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.json
+++ b/services/Network/bastionHosts/templates/arm/CPUUsage_0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/bastionHosts/templates/arm/MemoryUsage_2c288e52-422b-4f7e-85cf-feb3d08a1602.json b/services/Network/bastionHosts/templates/arm/MemoryUsage_2c288e52-422b-4f7e-85cf-feb3d08a1602.json
index 6d948b027..9f6453c4f 100644
--- a/services/Network/bastionHosts/templates/arm/MemoryUsage_2c288e52-422b-4f7e-85cf-feb3d08a1602.json
+++ b/services/Network/bastionHosts/templates/arm/MemoryUsage_2c288e52-422b-4f7e-85cf-feb3d08a1602.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/bastionHosts/templates/bicep/BastionCommunicationStatus_afd848a8-8b18-410c-bcc1-1b6f06a5a231.bicep b/services/Network/bastionHosts/templates/bicep/BastionCommunicationStatus_afd848a8-8b18-410c-bcc1-1b6f06a5a231.bicep
index 64a56f71c..cf8a12df7 100644
--- a/services/Network/bastionHosts/templates/bicep/BastionCommunicationStatus_afd848a8-8b18-410c-bcc1-1b6f06a5a231.bicep
+++ b/services/Network/bastionHosts/templates/bicep/BastionCommunicationStatus_afd848a8-8b18-410c-bcc1-1b6f06a5a231.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/bastionHosts/templates/bicep/CPUUsage_0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.bicep b/services/Network/bastionHosts/templates/bicep/CPUUsage_0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.bicep
index fdb901e3d..c9321a4e2 100644
--- a/services/Network/bastionHosts/templates/bicep/CPUUsage_0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.bicep
+++ b/services/Network/bastionHosts/templates/bicep/CPUUsage_0d4040d7-4478-46b5-98e0-14bb2f7b8ecf.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/bastionHosts/templates/bicep/MemoryUsage_2c288e52-422b-4f7e-85cf-feb3d08a1602.bicep b/services/Network/bastionHosts/templates/bicep/MemoryUsage_2c288e52-422b-4f7e-85cf-feb3d08a1602.bicep
index bfe3e26dd..8877689d5 100644
--- a/services/Network/bastionHosts/templates/bicep/MemoryUsage_2c288e52-422b-4f7e-85cf-feb3d08a1602.bicep
+++ b/services/Network/bastionHosts/templates/bicep/MemoryUsage_2c288e52-422b-4f7e-85cf-feb3d08a1602.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/connections/templates/arm/BitsInPerSecond_494aa5d6-444d-4c86-9de5-431b3e12a233.json b/services/Network/connections/templates/arm/BitsInPerSecond_494aa5d6-444d-4c86-9de5-431b3e12a233.json
index c70870c7d..0653f2d4d 100644
--- a/services/Network/connections/templates/arm/BitsInPerSecond_494aa5d6-444d-4c86-9de5-431b3e12a233.json
+++ b/services/Network/connections/templates/arm/BitsInPerSecond_494aa5d6-444d-4c86-9de5-431b3e12a233.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/connections/templates/arm/BitsOutPerSecond_b050d767-098e-4947-aa88-2a3090e62eab.json b/services/Network/connections/templates/arm/BitsOutPerSecond_b050d767-098e-4947-aa88-2a3090e62eab.json
index 825e465f4..b32c56e82 100644
--- a/services/Network/connections/templates/arm/BitsOutPerSecond_b050d767-098e-4947-aa88-2a3090e62eab.json
+++ b/services/Network/connections/templates/arm/BitsOutPerSecond_b050d767-098e-4947-aa88-2a3090e62eab.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/connections/templates/bicep/BitsInPerSecond_494aa5d6-444d-4c86-9de5-431b3e12a233.bicep b/services/Network/connections/templates/bicep/BitsInPerSecond_494aa5d6-444d-4c86-9de5-431b3e12a233.bicep
index ba095e18f..459c73010 100644
--- a/services/Network/connections/templates/bicep/BitsInPerSecond_494aa5d6-444d-4c86-9de5-431b3e12a233.bicep
+++ b/services/Network/connections/templates/bicep/BitsInPerSecond_494aa5d6-444d-4c86-9de5-431b3e12a233.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/connections/templates/bicep/BitsOutPerSecond_b050d767-098e-4947-aa88-2a3090e62eab.bicep b/services/Network/connections/templates/bicep/BitsOutPerSecond_b050d767-098e-4947-aa88-2a3090e62eab.bicep
index 1a265d66f..e0985f57a 100644
--- a/services/Network/connections/templates/bicep/BitsOutPerSecond_b050d767-098e-4947-aa88-2a3090e62eab.bicep
+++ b/services/Network/connections/templates/bicep/BitsOutPerSecond_b050d767-098e-4947-aa88-2a3090e62eab.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/dnszones/templates/arm/QueryVolume_0d1709ed-805e-4ca1-8490-f2d6b393e92f.json b/services/Network/dnszones/templates/arm/QueryVolume_0d1709ed-805e-4ca1-8490-f2d6b393e92f.json
index eb51a36c8..9e8e4a1b3 100644
--- a/services/Network/dnszones/templates/arm/QueryVolume_0d1709ed-805e-4ca1-8490-f2d6b393e92f.json
+++ b/services/Network/dnszones/templates/arm/QueryVolume_0d1709ed-805e-4ca1-8490-f2d6b393e92f.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/dnszones/templates/arm/RecordSetCapacityUtilization_dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.json b/services/Network/dnszones/templates/arm/RecordSetCapacityUtilization_dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.json
index 3d8dc86f9..e43028012 100644
--- a/services/Network/dnszones/templates/arm/RecordSetCapacityUtilization_dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.json
+++ b/services/Network/dnszones/templates/arm/RecordSetCapacityUtilization_dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/dnszones/templates/bicep/QueryVolume_0d1709ed-805e-4ca1-8490-f2d6b393e92f.bicep b/services/Network/dnszones/templates/bicep/QueryVolume_0d1709ed-805e-4ca1-8490-f2d6b393e92f.bicep
index dda677eaf..0cb0a6647 100644
--- a/services/Network/dnszones/templates/bicep/QueryVolume_0d1709ed-805e-4ca1-8490-f2d6b393e92f.bicep
+++ b/services/Network/dnszones/templates/bicep/QueryVolume_0d1709ed-805e-4ca1-8490-f2d6b393e92f.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/dnszones/templates/bicep/RecordSetCapacityUtilization_dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.bicep b/services/Network/dnszones/templates/bicep/RecordSetCapacityUtilization_dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.bicep
index 06ebdacaf..77e3c5b6f 100644
--- a/services/Network/dnszones/templates/bicep/RecordSetCapacityUtilization_dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.bicep
+++ b/services/Network/dnszones/templates/bicep/RecordSetCapacityUtilization_dfbcdbb7-fed8-49c5-8a10-ed34d20fc617.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRouteCircuits/templates/arm/ArpAvailability_efc101c0-0623-4928-86a7-6f2d37faf24b.json b/services/Network/expressRouteCircuits/templates/arm/ArpAvailability_efc101c0-0623-4928-86a7-6f2d37faf24b.json
index ec1556bd0..0be00710b 100644
--- a/services/Network/expressRouteCircuits/templates/arm/ArpAvailability_efc101c0-0623-4928-86a7-6f2d37faf24b.json
+++ b/services/Network/expressRouteCircuits/templates/arm/ArpAvailability_efc101c0-0623-4928-86a7-6f2d37faf24b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRouteCircuits/templates/arm/BgpAvailability_37302f31-86e2-45c8-a39f-d0b41c1271df.json b/services/Network/expressRouteCircuits/templates/arm/BgpAvailability_37302f31-86e2-45c8-a39f-d0b41c1271df.json
index 54cd345d5..ce650e32d 100644
--- a/services/Network/expressRouteCircuits/templates/arm/BgpAvailability_37302f31-86e2-45c8-a39f-d0b41c1271df.json
+++ b/services/Network/expressRouteCircuits/templates/arm/BgpAvailability_37302f31-86e2-45c8-a39f-d0b41c1271df.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRouteCircuits/templates/arm/BitsInPerSecond_2e4ae517-3d35-4677-a4b0-441ca19e7670.json b/services/Network/expressRouteCircuits/templates/arm/BitsInPerSecond_2e4ae517-3d35-4677-a4b0-441ca19e7670.json
index 7a33979e2..15770d24e 100644
--- a/services/Network/expressRouteCircuits/templates/arm/BitsInPerSecond_2e4ae517-3d35-4677-a4b0-441ca19e7670.json
+++ b/services/Network/expressRouteCircuits/templates/arm/BitsInPerSecond_2e4ae517-3d35-4677-a4b0-441ca19e7670.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRouteCircuits/templates/arm/BitsOutPerSecond_cc428042-1a21-43f7-b5f8-598dea50f4a2.json b/services/Network/expressRouteCircuits/templates/arm/BitsOutPerSecond_cc428042-1a21-43f7-b5f8-598dea50f4a2.json
index c1f636dd6..3cfc23d5e 100644
--- a/services/Network/expressRouteCircuits/templates/arm/BitsOutPerSecond_cc428042-1a21-43f7-b5f8-598dea50f4a2.json
+++ b/services/Network/expressRouteCircuits/templates/arm/BitsOutPerSecond_cc428042-1a21-43f7-b5f8-598dea50f4a2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRouteCircuits/templates/arm/QosDropBitsInPerSecond_d56551a8-1355-4aa3-871e-e20e1ce40f05.json b/services/Network/expressRouteCircuits/templates/arm/QosDropBitsInPerSecond_d56551a8-1355-4aa3-871e-e20e1ce40f05.json
index c5952854b..22e409f8f 100644
--- a/services/Network/expressRouteCircuits/templates/arm/QosDropBitsInPerSecond_d56551a8-1355-4aa3-871e-e20e1ce40f05.json
+++ b/services/Network/expressRouteCircuits/templates/arm/QosDropBitsInPerSecond_d56551a8-1355-4aa3-871e-e20e1ce40f05.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRouteCircuits/templates/arm/QosDropBitsOutPerSecond_5808dbdb-712e-4bd3-b92e-4a08388c32c6.json b/services/Network/expressRouteCircuits/templates/arm/QosDropBitsOutPerSecond_5808dbdb-712e-4bd3-b92e-4a08388c32c6.json
index 82d2b1b44..362ca521e 100644
--- a/services/Network/expressRouteCircuits/templates/arm/QosDropBitsOutPerSecond_5808dbdb-712e-4bd3-b92e-4a08388c32c6.json
+++ b/services/Network/expressRouteCircuits/templates/arm/QosDropBitsOutPerSecond_5808dbdb-712e-4bd3-b92e-4a08388c32c6.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRouteCircuits/templates/arm/globalreachbitsinpersecond_47fe6c76-47a0-433f-92d6-a23d9f573771.json b/services/Network/expressRouteCircuits/templates/arm/globalreachbitsinpersecond_47fe6c76-47a0-433f-92d6-a23d9f573771.json
deleted file mode 100644
index 9c204cc41..000000000
--- a/services/Network/expressRouteCircuits/templates/arm/globalreachbitsinpersecond_47fe6c76-47a0-433f-92d6-a23d9f573771.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "alertName": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "Name of the alert"
-      }
-    },
-    "alertDescription": {
-      "type": "string",
-      "defaultValue": "",
-      "metadata": {
-        "description": "Description of alert"
-      }
-    },
-    "targetResourceId": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "List of Azure resource Ids seperated by a comma. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name"
-      }
-    },
-    "targetResourceRegion": {
-      "type": "string",
-      "metadata": {
-        "description": "Azure region in which target resources to be monitored are in (without spaces). For example: EastUS"
-      }
-    },
-    "targetResourceType": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "Resource type of target resources to be monitored."
-      }
-    },
-    "isEnabled": {
-      "type": "bool",
-      "defaultValue": true,
-      "metadata": {
-        "description": "Specifies whether the alert is enabled"
-      }
-    },
-    "alertSeverity": {
-      "type": "int",
-      "defaultValue": ,
-      "allowedValues": [
-        0,
-        1,
-        2,
-        3,
-        4
-      ],
-      "metadata": {
-        "description": "Severity of alert {0,1,2,3,4}"
-      }
-    },
-    "operator": {
-      "type": "string",
-      "defaultValue": "",
-      "allowedValues": [
-        "Equals",
-        "GreaterThan",
-        "GreaterThanOrEqual",
-        "LessThan",
-        "LessThanOrEqual"
-      ],
-      "metadata": {
-        "description": "Operator comparing the current value with the threshold value."
-      }
-    },
-    "threshold": {
-      "type": "string",
-      "defaultValue": "0",
-      "metadata": {
-        "description": "The threshold value at which the alert is activated."
-      }
-    },
-    "timeAggregation": {
-      "type": "string",
-      "defaultValue": "Average",
-      "allowedValues": [
-        "Average",
-        "Minimum",
-        "Maximum",
-        "Total",
-        "Count"
-      ],
-      "metadata": {
-        "description": "How the data that is collected should be combined over time."
-      }
-    },
-    "windowSize": {
-      "type": "string",
-      "defaultValue": "",
-      "allowedValues": [
-        "PT1M",
-        "PT5M",
-        "PT15M",
-        "PT30M",
-        "PT1H",
-        "PT6H",
-        "PT12H",
-        "PT24H",
-        "PT1D"
-      ],
-      "metadata": {
-        "description": "Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format."
-      }
-    },
-    "evaluationFrequency": {
-      "type": "string",
-      "defaultValue": "",
-      "allowedValues": [
-        "PT1M",
-        "PT5M",
-        "PT15M",
-        "PT30M",
-        "PT1H"
-      ],
-      "metadata": {
-        "description": "how often the metric alert is evaluated represented in ISO 8601 duration format"
-      }
-    },
-    "currentDateTimeUtcNow": {
-      "type": "string",
-      "defaultValue": "[utcNow()]",
-      "metadata": {
-          "description": "The current date and time using the utcNow function. Used for deployment name uniqueness"
-      }
-    },
-    "telemetryOptOut": {
-      "type": "string",
-      "defaultValue": "No",
-      "allowedValues": [
-          "Yes",
-          "No"
-      ],
-      "metadata": {
-          "description": "The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry."
-      }
-    }
-  },
-  "variables": {
-    "pidDeploymentName": "[take(concat('pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-', uniqueString(resourceGroup().id, parameters('alertName'), parameters('currentDateTimeUtcNow'))), 64)]",
-    "varTargetResourceId": "[split(parameters('targetResourceId'), ',')]"
-  },
-  "resources": [
-    {
-      "type": "Microsoft.Insights/metricAlerts",
-      "apiVersion": "2018-03-01",
-      "name": "[parameters('alertName')]",
-      "location": "global",
-      "tags": {
-        "_deployed_by_amba": true
-      },
-      "properties": {
-        "description": "[parameters('alertDescription')]",
-        "scopes": "[variables('varTargetResourceId')]",
-        "targetResourceType": "[parameters('targetResourceType')]",
-        "targetResourceRegion": "[parameters('targetResourceRegion')]",
-        "severity": "[parameters('alertSeverity')]",
-        "enabled": "[parameters('isEnabled')]",
-        "evaluationFrequency": "[parameters('evaluationFrequency')]",
-        "windowSize": "[parameters('windowSize')]",
-        "criteria": {
-          "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria",
-          "allOf": [
-            {
-              "name": "1st criterion",
-              "metricName": "globalreachbitsinpersecond",
-              "dimensions": [],
-              "operator": "[parameters('operator')]",
-              "threshold": "[parameters('threshold')]",
-              "timeAggregation": "[parameters('timeAggregation')]",
-              "criterionType": "StaticThresholdCriterion"
-            }
-          ]
-        }
-      }
-    },
-    {
-      "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
-      "name": "[variables('pidDeploymentName')]",
-      "type": "Microsoft.Resources/deployments",
-      "properties": {
-          "mode": "Incremental",
-          "template": {
-              "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-              "contentVersion": "1.0.0.0",
-              "resources": []
-          }
-      }
-    }
-  ]
-}
diff --git a/services/Network/expressRouteCircuits/templates/arm/globalreachbitsoutpersecond_8a586e59-0f53-41bd-8406-174f9f0ecf7e.json b/services/Network/expressRouteCircuits/templates/arm/globalreachbitsoutpersecond_8a586e59-0f53-41bd-8406-174f9f0ecf7e.json
deleted file mode 100644
index 4e1e68fbf..000000000
--- a/services/Network/expressRouteCircuits/templates/arm/globalreachbitsoutpersecond_8a586e59-0f53-41bd-8406-174f9f0ecf7e.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "alertName": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "Name of the alert"
-      }
-    },
-    "alertDescription": {
-      "type": "string",
-      "defaultValue": "",
-      "metadata": {
-        "description": "Description of alert"
-      }
-    },
-    "targetResourceId": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "List of Azure resource Ids seperated by a comma. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name"
-      }
-    },
-    "targetResourceRegion": {
-      "type": "string",
-      "metadata": {
-        "description": "Azure region in which target resources to be monitored are in (without spaces). For example: EastUS"
-      }
-    },
-    "targetResourceType": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "Resource type of target resources to be monitored."
-      }
-    },
-    "isEnabled": {
-      "type": "bool",
-      "defaultValue": true,
-      "metadata": {
-        "description": "Specifies whether the alert is enabled"
-      }
-    },
-    "alertSeverity": {
-      "type": "int",
-      "defaultValue": ,
-      "allowedValues": [
-        0,
-        1,
-        2,
-        3,
-        4
-      ],
-      "metadata": {
-        "description": "Severity of alert {0,1,2,3,4}"
-      }
-    },
-    "operator": {
-      "type": "string",
-      "defaultValue": "",
-      "allowedValues": [
-        "Equals",
-        "GreaterThan",
-        "GreaterThanOrEqual",
-        "LessThan",
-        "LessThanOrEqual"
-      ],
-      "metadata": {
-        "description": "Operator comparing the current value with the threshold value."
-      }
-    },
-    "threshold": {
-      "type": "string",
-      "defaultValue": "0",
-      "metadata": {
-        "description": "The threshold value at which the alert is activated."
-      }
-    },
-    "timeAggregation": {
-      "type": "string",
-      "defaultValue": "Average",
-      "allowedValues": [
-        "Average",
-        "Minimum",
-        "Maximum",
-        "Total",
-        "Count"
-      ],
-      "metadata": {
-        "description": "How the data that is collected should be combined over time."
-      }
-    },
-    "windowSize": {
-      "type": "string",
-      "defaultValue": "",
-      "allowedValues": [
-        "PT1M",
-        "PT5M",
-        "PT15M",
-        "PT30M",
-        "PT1H",
-        "PT6H",
-        "PT12H",
-        "PT24H",
-        "PT1D"
-      ],
-      "metadata": {
-        "description": "Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format."
-      }
-    },
-    "evaluationFrequency": {
-      "type": "string",
-      "defaultValue": "",
-      "allowedValues": [
-        "PT1M",
-        "PT5M",
-        "PT15M",
-        "PT30M",
-        "PT1H"
-      ],
-      "metadata": {
-        "description": "how often the metric alert is evaluated represented in ISO 8601 duration format"
-      }
-    },
-    "currentDateTimeUtcNow": {
-      "type": "string",
-      "defaultValue": "[utcNow()]",
-      "metadata": {
-          "description": "The current date and time using the utcNow function. Used for deployment name uniqueness"
-      }
-    },
-    "telemetryOptOut": {
-      "type": "string",
-      "defaultValue": "No",
-      "allowedValues": [
-          "Yes",
-          "No"
-      ],
-      "metadata": {
-          "description": "The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry."
-      }
-    }
-  },
-  "variables": {
-    "pidDeploymentName": "[take(concat('pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-', uniqueString(resourceGroup().id, parameters('alertName'), parameters('currentDateTimeUtcNow'))), 64)]",
-    "varTargetResourceId": "[split(parameters('targetResourceId'), ',')]"
-  },
-  "resources": [
-    {
-      "type": "Microsoft.Insights/metricAlerts",
-      "apiVersion": "2018-03-01",
-      "name": "[parameters('alertName')]",
-      "location": "global",
-      "tags": {
-        "_deployed_by_amba": true
-      },
-      "properties": {
-        "description": "[parameters('alertDescription')]",
-        "scopes": "[variables('varTargetResourceId')]",
-        "targetResourceType": "[parameters('targetResourceType')]",
-        "targetResourceRegion": "[parameters('targetResourceRegion')]",
-        "severity": "[parameters('alertSeverity')]",
-        "enabled": "[parameters('isEnabled')]",
-        "evaluationFrequency": "[parameters('evaluationFrequency')]",
-        "windowSize": "[parameters('windowSize')]",
-        "criteria": {
-          "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria",
-          "allOf": [
-            {
-              "name": "1st criterion",
-              "metricName": "globalreachbitsoutpersecond",
-              "dimensions": [],
-              "operator": "[parameters('operator')]",
-              "threshold": "[parameters('threshold')]",
-              "timeAggregation": "[parameters('timeAggregation')]",
-              "criterionType": "StaticThresholdCriterion"
-            }
-          ]
-        }
-      }
-    },
-    {
-      "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
-      "name": "[variables('pidDeploymentName')]",
-      "type": "Microsoft.Resources/deployments",
-      "properties": {
-          "mode": "Incremental",
-          "template": {
-              "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-              "contentVersion": "1.0.0.0",
-              "resources": []
-          }
-      }
-    }
-  ]
-}
diff --git a/services/Network/expressRouteCircuits/templates/bicep/ArpAvailability_efc101c0-0623-4928-86a7-6f2d37faf24b.bicep b/services/Network/expressRouteCircuits/templates/bicep/ArpAvailability_efc101c0-0623-4928-86a7-6f2d37faf24b.bicep
index daa53ab9b..f57ad8d4e 100644
--- a/services/Network/expressRouteCircuits/templates/bicep/ArpAvailability_efc101c0-0623-4928-86a7-6f2d37faf24b.bicep
+++ b/services/Network/expressRouteCircuits/templates/bicep/ArpAvailability_efc101c0-0623-4928-86a7-6f2d37faf24b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRouteCircuits/templates/bicep/BgpAvailability_37302f31-86e2-45c8-a39f-d0b41c1271df.bicep b/services/Network/expressRouteCircuits/templates/bicep/BgpAvailability_37302f31-86e2-45c8-a39f-d0b41c1271df.bicep
index 625fe1f21..fd7fa2b2c 100644
--- a/services/Network/expressRouteCircuits/templates/bicep/BgpAvailability_37302f31-86e2-45c8-a39f-d0b41c1271df.bicep
+++ b/services/Network/expressRouteCircuits/templates/bicep/BgpAvailability_37302f31-86e2-45c8-a39f-d0b41c1271df.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRouteCircuits/templates/bicep/BitsInPerSecond_2e4ae517-3d35-4677-a4b0-441ca19e7670.bicep b/services/Network/expressRouteCircuits/templates/bicep/BitsInPerSecond_2e4ae517-3d35-4677-a4b0-441ca19e7670.bicep
index 234875786..6670e5668 100644
--- a/services/Network/expressRouteCircuits/templates/bicep/BitsInPerSecond_2e4ae517-3d35-4677-a4b0-441ca19e7670.bicep
+++ b/services/Network/expressRouteCircuits/templates/bicep/BitsInPerSecond_2e4ae517-3d35-4677-a4b0-441ca19e7670.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRouteCircuits/templates/bicep/BitsOutPerSecond_cc428042-1a21-43f7-b5f8-598dea50f4a2.bicep b/services/Network/expressRouteCircuits/templates/bicep/BitsOutPerSecond_cc428042-1a21-43f7-b5f8-598dea50f4a2.bicep
index 985a80edb..7258e32f4 100644
--- a/services/Network/expressRouteCircuits/templates/bicep/BitsOutPerSecond_cc428042-1a21-43f7-b5f8-598dea50f4a2.bicep
+++ b/services/Network/expressRouteCircuits/templates/bicep/BitsOutPerSecond_cc428042-1a21-43f7-b5f8-598dea50f4a2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRouteCircuits/templates/bicep/QosDropBitsInPerSecond_d56551a8-1355-4aa3-871e-e20e1ce40f05.bicep b/services/Network/expressRouteCircuits/templates/bicep/QosDropBitsInPerSecond_d56551a8-1355-4aa3-871e-e20e1ce40f05.bicep
index bb3f37c93..e223e5a8b 100644
--- a/services/Network/expressRouteCircuits/templates/bicep/QosDropBitsInPerSecond_d56551a8-1355-4aa3-871e-e20e1ce40f05.bicep
+++ b/services/Network/expressRouteCircuits/templates/bicep/QosDropBitsInPerSecond_d56551a8-1355-4aa3-871e-e20e1ce40f05.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRouteCircuits/templates/bicep/QosDropBitsOutPerSecond_5808dbdb-712e-4bd3-b92e-4a08388c32c6.bicep b/services/Network/expressRouteCircuits/templates/bicep/QosDropBitsOutPerSecond_5808dbdb-712e-4bd3-b92e-4a08388c32c6.bicep
index d91becbaf..1c7aaaa34 100644
--- a/services/Network/expressRouteCircuits/templates/bicep/QosDropBitsOutPerSecond_5808dbdb-712e-4bd3-b92e-4a08388c32c6.bicep
+++ b/services/Network/expressRouteCircuits/templates/bicep/QosDropBitsOutPerSecond_5808dbdb-712e-4bd3-b92e-4a08388c32c6.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRouteCircuits/templates/bicep/globalreachbitsinpersecond_47fe6c76-47a0-433f-92d6-a23d9f573771.bicep b/services/Network/expressRouteCircuits/templates/bicep/globalreachbitsinpersecond_47fe6c76-47a0-433f-92d6-a23d9f573771.bicep
deleted file mode 100644
index 95c38f868..000000000
--- a/services/Network/expressRouteCircuits/templates/bicep/globalreachbitsinpersecond_47fe6c76-47a0-433f-92d6-a23d9f573771.bicep
+++ /dev/null
@@ -1,135 +0,0 @@
-@description('Name of the alert')
-@minLength(1)
-param alertName string
-
-@description('Description of alert')
-param alertDescription string = ''
-
-@description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
-@minLength(1)
-param targetResourceId array
-
-@description('Azure region in which target resources to be monitored are in (without spaces). For example: EastUS')
-param targetResourceRegion string
-
-@description('Resource type of target resources to be monitored.')
-@minLength(1)
-param targetResourceType string
-
-@description('Specifies whether the alert is enabled')
-param isEnabled bool = true
-
-@description('Severity of alert {0,1,2,3,4}')
-@allowed([
-  0
-  1
-  2
-  3
-  4
-])
-param alertSeverity int = 
-
-@description('Operator comparing the current value with the threshold value.')
-@allowed([
-  'Equals'
-  'GreaterThan'
-  'GreaterThanOrEqual'
-  'LessThan'
-  'LessThanOrEqual'
-])
-param operator string = ''
-
-@description('The threshold value at which the alert is activated.')
-param threshold int = 0
-
-@description('How the data that is collected should be combined over time.')
-@allowed([
-  'Average'
-  'Minimum'
-  'Maximum'
-  'Total'
-  'Count'
-])
-param timeAggregation string = 'Average'
-
-@description('Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format.')
-@allowed([
-  'PT1M'
-  'PT5M'
-  'PT15M'
-  'PT30M'
-  'PT1H'
-  'PT6H'
-  'PT12H'
-  'PT24H'
-  'P1D'
-])
-param windowSize string = ''
-
-@description('how often the metric alert is evaluated represented in ISO 8601 duration format')
-@allowed([
-  'PT1M'
-  'PT5M'
-  'PT15M'
-  'PT30M'
-  'PT1H'
-])
-param evaluationFrequency string = ''
-
-@description('"The current date and time using the utcNow function. Used for deployment name uniqueness')
-param currentDateTimeUtcNow string = utcNow()
-
-@description('The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry.')
-@allowed([
-  'Yes'
-  'No'
-])
-param telemetryOptOut string = 'No'
-
-resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
-  name: alertName
-  location: 'global'
-  tags: {
-    _deployed_by_amba: 'true'
-  }
-  properties: {
-    description: alertDescription
-    scopes: targetResourceId
-    targetResourceType: targetResourceType
-    targetResourceRegion: targetResourceRegion
-    severity: alertSeverity
-    enabled: isEnabled
-    evaluationFrequency: evaluationFrequency
-    windowSize: windowSize
-    criteria: {
-      'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria'
-      allOf: [
-        {
-          name: '1st criterion'
-          metricName: 'globalreachbitsinpersecond'
-          dimensions: [[]]
-          operator: operator
-          threshold: threshold
-          timeAggregation: timeAggregation
-          criterionType: 'StaticThresholdCriterion'
-        }
-      ]
-    }
-  }
-}
-
-var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
-  name: ambaTelemetryPidName
-  tags: {
-    _deployed_by_amba: 'true'
-  }
-  properties: {
-    mode: 'Incremental'
-    template: {
-      '$schema': 'https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#'
-      contentVersion: '1.0.0.0'
-      resources: []
-    }
-  }
-}
diff --git a/services/Network/expressRouteCircuits/templates/bicep/globalreachbitsoutpersecond_8a586e59-0f53-41bd-8406-174f9f0ecf7e.bicep b/services/Network/expressRouteCircuits/templates/bicep/globalreachbitsoutpersecond_8a586e59-0f53-41bd-8406-174f9f0ecf7e.bicep
deleted file mode 100644
index 766fd21fd..000000000
--- a/services/Network/expressRouteCircuits/templates/bicep/globalreachbitsoutpersecond_8a586e59-0f53-41bd-8406-174f9f0ecf7e.bicep
+++ /dev/null
@@ -1,135 +0,0 @@
-@description('Name of the alert')
-@minLength(1)
-param alertName string
-
-@description('Description of alert')
-param alertDescription string = ''
-
-@description('Array of Azure resource Ids. For example - /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroup/resource-group-name/Microsoft.compute/virtualMachines/vm-name')
-@minLength(1)
-param targetResourceId array
-
-@description('Azure region in which target resources to be monitored are in (without spaces). For example: EastUS')
-param targetResourceRegion string
-
-@description('Resource type of target resources to be monitored.')
-@minLength(1)
-param targetResourceType string
-
-@description('Specifies whether the alert is enabled')
-param isEnabled bool = true
-
-@description('Severity of alert {0,1,2,3,4}')
-@allowed([
-  0
-  1
-  2
-  3
-  4
-])
-param alertSeverity int = 
-
-@description('Operator comparing the current value with the threshold value.')
-@allowed([
-  'Equals'
-  'GreaterThan'
-  'GreaterThanOrEqual'
-  'LessThan'
-  'LessThanOrEqual'
-])
-param operator string = ''
-
-@description('The threshold value at which the alert is activated.')
-param threshold int = 0
-
-@description('How the data that is collected should be combined over time.')
-@allowed([
-  'Average'
-  'Minimum'
-  'Maximum'
-  'Total'
-  'Count'
-])
-param timeAggregation string = 'Average'
-
-@description('Period of time used to monitor alert activity based on the threshold. Must be between one minute and one day. ISO 8601 duration format.')
-@allowed([
-  'PT1M'
-  'PT5M'
-  'PT15M'
-  'PT30M'
-  'PT1H'
-  'PT6H'
-  'PT12H'
-  'PT24H'
-  'P1D'
-])
-param windowSize string = ''
-
-@description('how often the metric alert is evaluated represented in ISO 8601 duration format')
-@allowed([
-  'PT1M'
-  'PT5M'
-  'PT15M'
-  'PT30M'
-  'PT1H'
-])
-param evaluationFrequency string = ''
-
-@description('"The current date and time using the utcNow function. Used for deployment name uniqueness')
-param currentDateTimeUtcNow string = utcNow()
-
-@description('The customer usage identifier used for telemetry purposes. The default value of False enables telemetry. The value of True disables telemetry.')
-@allowed([
-  'Yes'
-  'No'
-])
-param telemetryOptOut string = 'No'
-
-resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
-  name: alertName
-  location: 'global'
-  tags: {
-    _deployed_by_amba: 'true'
-  }
-  properties: {
-    description: alertDescription
-    scopes: targetResourceId
-    targetResourceType: targetResourceType
-    targetResourceRegion: targetResourceRegion
-    severity: alertSeverity
-    enabled: isEnabled
-    evaluationFrequency: evaluationFrequency
-    windowSize: windowSize
-    criteria: {
-      'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria'
-      allOf: [
-        {
-          name: '1st criterion'
-          metricName: 'globalreachbitsoutpersecond'
-          dimensions: [[]]
-          operator: operator
-          threshold: threshold
-          timeAggregation: timeAggregation
-          criterionType: 'StaticThresholdCriterion'
-        }
-      ]
-    }
-  }
-}
-
-var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
-  name: ambaTelemetryPidName
-  tags: {
-    _deployed_by_amba: 'true'
-  }
-  properties: {
-    mode: 'Incremental'
-    template: {
-      '$schema': 'https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#'
-      contentVersion: '1.0.0.0'
-      resources: []
-    }
-  }
-}
diff --git a/services/Network/expressRouteGateways/templates/arm/ERGatewayConnectionBitsInPerSecond_ff147700-c9e6-4063-bb23-45500c00067a.json b/services/Network/expressRouteGateways/templates/arm/ERGatewayConnectionBitsInPerSecond_ff147700-c9e6-4063-bb23-45500c00067a.json
index 210ac1e87..e437f433b 100644
--- a/services/Network/expressRouteGateways/templates/arm/ERGatewayConnectionBitsInPerSecond_ff147700-c9e6-4063-bb23-45500c00067a.json
+++ b/services/Network/expressRouteGateways/templates/arm/ERGatewayConnectionBitsInPerSecond_ff147700-c9e6-4063-bb23-45500c00067a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRouteGateways/templates/arm/ERGatewayConnectionBitsOutPerSecond_4d5c7854-e044-4dd6-971b-df433fa3ad37.json b/services/Network/expressRouteGateways/templates/arm/ERGatewayConnectionBitsOutPerSecond_4d5c7854-e044-4dd6-971b-df433fa3ad37.json
index c4f4f1738..0001d980a 100644
--- a/services/Network/expressRouteGateways/templates/arm/ERGatewayConnectionBitsOutPerSecond_4d5c7854-e044-4dd6-971b-df433fa3ad37.json
+++ b/services/Network/expressRouteGateways/templates/arm/ERGatewayConnectionBitsOutPerSecond_4d5c7854-e044-4dd6-971b-df433fa3ad37.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRouteGateways/templates/arm/ExpressRouteGatewayCpuUtilization_af1ba971-9b73-4b7f-8040-5eff9f5778d5.json b/services/Network/expressRouteGateways/templates/arm/ExpressRouteGatewayCpuUtilization_af1ba971-9b73-4b7f-8040-5eff9f5778d5.json
index d678bba07..5c5cfa9cc 100644
--- a/services/Network/expressRouteGateways/templates/arm/ExpressRouteGatewayCpuUtilization_af1ba971-9b73-4b7f-8040-5eff9f5778d5.json
+++ b/services/Network/expressRouteGateways/templates/arm/ExpressRouteGatewayCpuUtilization_af1ba971-9b73-4b7f-8040-5eff9f5778d5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRouteGateways/templates/bicep/ERGatewayConnectionBitsInPerSecond_ff147700-c9e6-4063-bb23-45500c00067a.bicep b/services/Network/expressRouteGateways/templates/bicep/ERGatewayConnectionBitsInPerSecond_ff147700-c9e6-4063-bb23-45500c00067a.bicep
index 2a7588fef..496c00e7b 100644
--- a/services/Network/expressRouteGateways/templates/bicep/ERGatewayConnectionBitsInPerSecond_ff147700-c9e6-4063-bb23-45500c00067a.bicep
+++ b/services/Network/expressRouteGateways/templates/bicep/ERGatewayConnectionBitsInPerSecond_ff147700-c9e6-4063-bb23-45500c00067a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRouteGateways/templates/bicep/ERGatewayConnectionBitsOutPerSecond_4d5c7854-e044-4dd6-971b-df433fa3ad37.bicep b/services/Network/expressRouteGateways/templates/bicep/ERGatewayConnectionBitsOutPerSecond_4d5c7854-e044-4dd6-971b-df433fa3ad37.bicep
index cd929c6f3..84b9f3fb8 100644
--- a/services/Network/expressRouteGateways/templates/bicep/ERGatewayConnectionBitsOutPerSecond_4d5c7854-e044-4dd6-971b-df433fa3ad37.bicep
+++ b/services/Network/expressRouteGateways/templates/bicep/ERGatewayConnectionBitsOutPerSecond_4d5c7854-e044-4dd6-971b-df433fa3ad37.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRouteGateways/templates/bicep/ExpressRouteGatewayCpuUtilization_af1ba971-9b73-4b7f-8040-5eff9f5778d5.bicep b/services/Network/expressRouteGateways/templates/bicep/ExpressRouteGatewayCpuUtilization_af1ba971-9b73-4b7f-8040-5eff9f5778d5.bicep
index 7b581a9d2..6e22873b5 100644
--- a/services/Network/expressRouteGateways/templates/bicep/ExpressRouteGatewayCpuUtilization_af1ba971-9b73-4b7f-8040-5eff9f5778d5.bicep
+++ b/services/Network/expressRouteGateways/templates/bicep/ExpressRouteGatewayCpuUtilization_af1ba971-9b73-4b7f-8040-5eff9f5778d5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRoutePorts/templates/arm/LineProtocol_0fac138d-cf48-4dc2-ac02-053d0b24e620.json b/services/Network/expressRoutePorts/templates/arm/LineProtocol_0fac138d-cf48-4dc2-ac02-053d0b24e620.json
index 48082d20d..9a1e95466 100644
--- a/services/Network/expressRoutePorts/templates/arm/LineProtocol_0fac138d-cf48-4dc2-ac02-053d0b24e620.json
+++ b/services/Network/expressRoutePorts/templates/arm/LineProtocol_0fac138d-cf48-4dc2-ac02-053d0b24e620.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRoutePorts/templates/arm/PortBitsInPerSecond_08dad105-6416-4348-9feb-339f73e24262.json b/services/Network/expressRoutePorts/templates/arm/PortBitsInPerSecond_08dad105-6416-4348-9feb-339f73e24262.json
index ea83c4221..af25d3abe 100644
--- a/services/Network/expressRoutePorts/templates/arm/PortBitsInPerSecond_08dad105-6416-4348-9feb-339f73e24262.json
+++ b/services/Network/expressRoutePorts/templates/arm/PortBitsInPerSecond_08dad105-6416-4348-9feb-339f73e24262.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRoutePorts/templates/arm/PortBitsOutPerSecond_ca29484c-b6e5-467e-984d-567e262380d7.json b/services/Network/expressRoutePorts/templates/arm/PortBitsOutPerSecond_ca29484c-b6e5-467e-984d-567e262380d7.json
index 98c6014af..89367a300 100644
--- a/services/Network/expressRoutePorts/templates/arm/PortBitsOutPerSecond_ca29484c-b6e5-467e-984d-567e262380d7.json
+++ b/services/Network/expressRoutePorts/templates/arm/PortBitsOutPerSecond_ca29484c-b6e5-467e-984d-567e262380d7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRoutePorts/templates/arm/RxLightLevel-High_ceaeccae-ffa5-4c8c-8415-c7be8266977d.json b/services/Network/expressRoutePorts/templates/arm/RxLightLevel-High_ceaeccae-ffa5-4c8c-8415-c7be8266977d.json
index babbd2106..a7848b3d3 100644
--- a/services/Network/expressRoutePorts/templates/arm/RxLightLevel-High_ceaeccae-ffa5-4c8c-8415-c7be8266977d.json
+++ b/services/Network/expressRoutePorts/templates/arm/RxLightLevel-High_ceaeccae-ffa5-4c8c-8415-c7be8266977d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRoutePorts/templates/arm/RxLightLevel-Low_bf37971c-60f4-4652-a059-7607b1d6d31b.json b/services/Network/expressRoutePorts/templates/arm/RxLightLevel-Low_bf37971c-60f4-4652-a059-7607b1d6d31b.json
index e2c10bd01..8423dd04b 100644
--- a/services/Network/expressRoutePorts/templates/arm/RxLightLevel-Low_bf37971c-60f4-4652-a059-7607b1d6d31b.json
+++ b/services/Network/expressRoutePorts/templates/arm/RxLightLevel-Low_bf37971c-60f4-4652-a059-7607b1d6d31b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRoutePorts/templates/arm/TxLightLevel-High_dee0e83f-8d5c-4735-9730-1a850354e4b1.json b/services/Network/expressRoutePorts/templates/arm/TxLightLevel-High_dee0e83f-8d5c-4735-9730-1a850354e4b1.json
index 688243422..0a663cf9e 100644
--- a/services/Network/expressRoutePorts/templates/arm/TxLightLevel-High_dee0e83f-8d5c-4735-9730-1a850354e4b1.json
+++ b/services/Network/expressRoutePorts/templates/arm/TxLightLevel-High_dee0e83f-8d5c-4735-9730-1a850354e4b1.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRoutePorts/templates/arm/TxLightLevel-Low_378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.json b/services/Network/expressRoutePorts/templates/arm/TxLightLevel-Low_378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.json
index 6437f787f..239a6c5df 100644
--- a/services/Network/expressRoutePorts/templates/arm/TxLightLevel-Low_378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.json
+++ b/services/Network/expressRoutePorts/templates/arm/TxLightLevel-Low_378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/expressRoutePorts/templates/bicep/LineProtocol_0fac138d-cf48-4dc2-ac02-053d0b24e620.bicep b/services/Network/expressRoutePorts/templates/bicep/LineProtocol_0fac138d-cf48-4dc2-ac02-053d0b24e620.bicep
index 20ee0c9e4..eb6054139 100644
--- a/services/Network/expressRoutePorts/templates/bicep/LineProtocol_0fac138d-cf48-4dc2-ac02-053d0b24e620.bicep
+++ b/services/Network/expressRoutePorts/templates/bicep/LineProtocol_0fac138d-cf48-4dc2-ac02-053d0b24e620.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRoutePorts/templates/bicep/PortBitsInPerSecond_08dad105-6416-4348-9feb-339f73e24262.bicep b/services/Network/expressRoutePorts/templates/bicep/PortBitsInPerSecond_08dad105-6416-4348-9feb-339f73e24262.bicep
index ce7c8a119..afc5a6d86 100644
--- a/services/Network/expressRoutePorts/templates/bicep/PortBitsInPerSecond_08dad105-6416-4348-9feb-339f73e24262.bicep
+++ b/services/Network/expressRoutePorts/templates/bicep/PortBitsInPerSecond_08dad105-6416-4348-9feb-339f73e24262.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRoutePorts/templates/bicep/PortBitsOutPerSecond_ca29484c-b6e5-467e-984d-567e262380d7.bicep b/services/Network/expressRoutePorts/templates/bicep/PortBitsOutPerSecond_ca29484c-b6e5-467e-984d-567e262380d7.bicep
index 5b143028f..403f230c8 100644
--- a/services/Network/expressRoutePorts/templates/bicep/PortBitsOutPerSecond_ca29484c-b6e5-467e-984d-567e262380d7.bicep
+++ b/services/Network/expressRoutePorts/templates/bicep/PortBitsOutPerSecond_ca29484c-b6e5-467e-984d-567e262380d7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRoutePorts/templates/bicep/RxLightLevel-High_ceaeccae-ffa5-4c8c-8415-c7be8266977d.bicep b/services/Network/expressRoutePorts/templates/bicep/RxLightLevel-High_ceaeccae-ffa5-4c8c-8415-c7be8266977d.bicep
index a3d7d3620..cffd6feb3 100644
--- a/services/Network/expressRoutePorts/templates/bicep/RxLightLevel-High_ceaeccae-ffa5-4c8c-8415-c7be8266977d.bicep
+++ b/services/Network/expressRoutePorts/templates/bicep/RxLightLevel-High_ceaeccae-ffa5-4c8c-8415-c7be8266977d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRoutePorts/templates/bicep/RxLightLevel-Low_bf37971c-60f4-4652-a059-7607b1d6d31b.bicep b/services/Network/expressRoutePorts/templates/bicep/RxLightLevel-Low_bf37971c-60f4-4652-a059-7607b1d6d31b.bicep
index e0a00f584..1facea625 100644
--- a/services/Network/expressRoutePorts/templates/bicep/RxLightLevel-Low_bf37971c-60f4-4652-a059-7607b1d6d31b.bicep
+++ b/services/Network/expressRoutePorts/templates/bicep/RxLightLevel-Low_bf37971c-60f4-4652-a059-7607b1d6d31b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRoutePorts/templates/bicep/TxLightLevel-High_dee0e83f-8d5c-4735-9730-1a850354e4b1.bicep b/services/Network/expressRoutePorts/templates/bicep/TxLightLevel-High_dee0e83f-8d5c-4735-9730-1a850354e4b1.bicep
index 50fd7582f..e33d88b8f 100644
--- a/services/Network/expressRoutePorts/templates/bicep/TxLightLevel-High_dee0e83f-8d5c-4735-9730-1a850354e4b1.bicep
+++ b/services/Network/expressRoutePorts/templates/bicep/TxLightLevel-High_dee0e83f-8d5c-4735-9730-1a850354e4b1.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/expressRoutePorts/templates/bicep/TxLightLevel-Low_378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.bicep b/services/Network/expressRoutePorts/templates/bicep/TxLightLevel-Low_378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.bicep
index 022bd455e..9a2b6140c 100644
--- a/services/Network/expressRoutePorts/templates/bicep/TxLightLevel-Low_378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.bicep
+++ b/services/Network/expressRoutePorts/templates/bicep/TxLightLevel-Low_378a85f8-f24c-4ce6-bfb0-eb5ccbd61768.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/frontDoors/templates/arm/BackendHealthPercentage_15a67b66-30eb-4d0f-aa98-7350304347d0.json b/services/Network/frontDoors/templates/arm/BackendHealthPercentage_15a67b66-30eb-4d0f-aa98-7350304347d0.json
index 51b07cbfc..7b32441fc 100644
--- a/services/Network/frontDoors/templates/arm/BackendHealthPercentage_15a67b66-30eb-4d0f-aa98-7350304347d0.json
+++ b/services/Network/frontDoors/templates/arm/BackendHealthPercentage_15a67b66-30eb-4d0f-aa98-7350304347d0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/frontDoors/templates/arm/BackendRequestLatency_a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.json b/services/Network/frontDoors/templates/arm/BackendRequestLatency_a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.json
index d4321d386..80c6ab009 100644
--- a/services/Network/frontDoors/templates/arm/BackendRequestLatency_a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.json
+++ b/services/Network/frontDoors/templates/arm/BackendRequestLatency_a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/frontDoors/templates/arm/RequestCount_5ec4f863-ec6f-4fe8-b258-a53b3183138a.json b/services/Network/frontDoors/templates/arm/RequestCount_5ec4f863-ec6f-4fe8-b258-a53b3183138a.json
index 853549f2f..181f64f40 100644
--- a/services/Network/frontDoors/templates/arm/RequestCount_5ec4f863-ec6f-4fe8-b258-a53b3183138a.json
+++ b/services/Network/frontDoors/templates/arm/RequestCount_5ec4f863-ec6f-4fe8-b258-a53b3183138a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/frontDoors/templates/arm/TotalLatency_1987b5a9-bbc3-43c6-af35-cd69e61fe043.json b/services/Network/frontDoors/templates/arm/TotalLatency_1987b5a9-bbc3-43c6-af35-cd69e61fe043.json
index c928ed15b..48eb2a3bd 100644
--- a/services/Network/frontDoors/templates/arm/TotalLatency_1987b5a9-bbc3-43c6-af35-cd69e61fe043.json
+++ b/services/Network/frontDoors/templates/arm/TotalLatency_1987b5a9-bbc3-43c6-af35-cd69e61fe043.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/frontDoors/templates/bicep/BackendHealthPercentage_15a67b66-30eb-4d0f-aa98-7350304347d0.bicep b/services/Network/frontDoors/templates/bicep/BackendHealthPercentage_15a67b66-30eb-4d0f-aa98-7350304347d0.bicep
index ef2535585..b65ed084c 100644
--- a/services/Network/frontDoors/templates/bicep/BackendHealthPercentage_15a67b66-30eb-4d0f-aa98-7350304347d0.bicep
+++ b/services/Network/frontDoors/templates/bicep/BackendHealthPercentage_15a67b66-30eb-4d0f-aa98-7350304347d0.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/frontDoors/templates/bicep/BackendRequestLatency_a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.bicep b/services/Network/frontDoors/templates/bicep/BackendRequestLatency_a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.bicep
index 927ecdb7f..60d6360b5 100644
--- a/services/Network/frontDoors/templates/bicep/BackendRequestLatency_a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.bicep
+++ b/services/Network/frontDoors/templates/bicep/BackendRequestLatency_a4de0a96-9e79-4a03-a91c-cbd09ea3d29a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/frontDoors/templates/bicep/RequestCount_5ec4f863-ec6f-4fe8-b258-a53b3183138a.bicep b/services/Network/frontDoors/templates/bicep/RequestCount_5ec4f863-ec6f-4fe8-b258-a53b3183138a.bicep
index 20871d56d..d4c434222 100644
--- a/services/Network/frontDoors/templates/bicep/RequestCount_5ec4f863-ec6f-4fe8-b258-a53b3183138a.bicep
+++ b/services/Network/frontDoors/templates/bicep/RequestCount_5ec4f863-ec6f-4fe8-b258-a53b3183138a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/frontDoors/templates/bicep/TotalLatency_1987b5a9-bbc3-43c6-af35-cd69e61fe043.bicep b/services/Network/frontDoors/templates/bicep/TotalLatency_1987b5a9-bbc3-43c6-af35-cd69e61fe043.bicep
index f7dc48a74..54dad2364 100644
--- a/services/Network/frontDoors/templates/bicep/TotalLatency_1987b5a9-bbc3-43c6-af35-cd69e61fe043.bicep
+++ b/services/Network/frontDoors/templates/bicep/TotalLatency_1987b5a9-bbc3-43c6-af35-cd69e61fe043.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/loadBalancers/templates/arm/DipAvailability_a39efd3b-04ef-48d4-a862-053092bdd6e5.json b/services/Network/loadBalancers/templates/arm/DipAvailability_a39efd3b-04ef-48d4-a862-053092bdd6e5.json
index 48d607559..a52a59e11 100644
--- a/services/Network/loadBalancers/templates/arm/DipAvailability_a39efd3b-04ef-48d4-a862-053092bdd6e5.json
+++ b/services/Network/loadBalancers/templates/arm/DipAvailability_a39efd3b-04ef-48d4-a862-053092bdd6e5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/loadBalancers/templates/arm/GlobalBackendAvailability_055c20da-0d21-4c6a-a80b-f2c4b3887804.json b/services/Network/loadBalancers/templates/arm/GlobalBackendAvailability_055c20da-0d21-4c6a-a80b-f2c4b3887804.json
index 7db1a37d4..c699e85dd 100644
--- a/services/Network/loadBalancers/templates/arm/GlobalBackendAvailability_055c20da-0d21-4c6a-a80b-f2c4b3887804.json
+++ b/services/Network/loadBalancers/templates/arm/GlobalBackendAvailability_055c20da-0d21-4c6a-a80b-f2c4b3887804.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/loadBalancers/templates/arm/SnatConnectionCount_39d3123b-daaa-4f70-97a3-8a4f326104af.json b/services/Network/loadBalancers/templates/arm/SnatConnectionCount_39d3123b-daaa-4f70-97a3-8a4f326104af.json
index bc36fec82..3e810a079 100644
--- a/services/Network/loadBalancers/templates/arm/SnatConnectionCount_39d3123b-daaa-4f70-97a3-8a4f326104af.json
+++ b/services/Network/loadBalancers/templates/arm/SnatConnectionCount_39d3123b-daaa-4f70-97a3-8a4f326104af.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/loadBalancers/templates/arm/UsedSNATPorts_a92cb746-f19f-450b-b413-8b9710b0176b.json b/services/Network/loadBalancers/templates/arm/UsedSNATPorts_a92cb746-f19f-450b-b413-8b9710b0176b.json
index 81672d4ca..7a5a00d6b 100644
--- a/services/Network/loadBalancers/templates/arm/UsedSNATPorts_a92cb746-f19f-450b-b413-8b9710b0176b.json
+++ b/services/Network/loadBalancers/templates/arm/UsedSNATPorts_a92cb746-f19f-450b-b413-8b9710b0176b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/loadBalancers/templates/arm/VipAvailability_b239797f-e627-4e48-8609-94db72098c3d.json b/services/Network/loadBalancers/templates/arm/VipAvailability_b239797f-e627-4e48-8609-94db72098c3d.json
index 9cf24fcf8..f8206d7c4 100644
--- a/services/Network/loadBalancers/templates/arm/VipAvailability_b239797f-e627-4e48-8609-94db72098c3d.json
+++ b/services/Network/loadBalancers/templates/arm/VipAvailability_b239797f-e627-4e48-8609-94db72098c3d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/loadBalancers/templates/bicep/DipAvailability_a39efd3b-04ef-48d4-a862-053092bdd6e5.bicep b/services/Network/loadBalancers/templates/bicep/DipAvailability_a39efd3b-04ef-48d4-a862-053092bdd6e5.bicep
index 7fb477d4f..7e806c948 100644
--- a/services/Network/loadBalancers/templates/bicep/DipAvailability_a39efd3b-04ef-48d4-a862-053092bdd6e5.bicep
+++ b/services/Network/loadBalancers/templates/bicep/DipAvailability_a39efd3b-04ef-48d4-a862-053092bdd6e5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/loadBalancers/templates/bicep/GlobalBackendAvailability_055c20da-0d21-4c6a-a80b-f2c4b3887804.bicep b/services/Network/loadBalancers/templates/bicep/GlobalBackendAvailability_055c20da-0d21-4c6a-a80b-f2c4b3887804.bicep
index 662622e05..65d2b7bbf 100644
--- a/services/Network/loadBalancers/templates/bicep/GlobalBackendAvailability_055c20da-0d21-4c6a-a80b-f2c4b3887804.bicep
+++ b/services/Network/loadBalancers/templates/bicep/GlobalBackendAvailability_055c20da-0d21-4c6a-a80b-f2c4b3887804.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/loadBalancers/templates/bicep/SnatConnectionCount_39d3123b-daaa-4f70-97a3-8a4f326104af.bicep b/services/Network/loadBalancers/templates/bicep/SnatConnectionCount_39d3123b-daaa-4f70-97a3-8a4f326104af.bicep
index f788cd8e4..3a751ef27 100644
--- a/services/Network/loadBalancers/templates/bicep/SnatConnectionCount_39d3123b-daaa-4f70-97a3-8a4f326104af.bicep
+++ b/services/Network/loadBalancers/templates/bicep/SnatConnectionCount_39d3123b-daaa-4f70-97a3-8a4f326104af.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/loadBalancers/templates/bicep/UsedSNATPorts_a92cb746-f19f-450b-b413-8b9710b0176b.bicep b/services/Network/loadBalancers/templates/bicep/UsedSNATPorts_a92cb746-f19f-450b-b413-8b9710b0176b.bicep
index a66ac607f..03c1a5a07 100644
--- a/services/Network/loadBalancers/templates/bicep/UsedSNATPorts_a92cb746-f19f-450b-b413-8b9710b0176b.bicep
+++ b/services/Network/loadBalancers/templates/bicep/UsedSNATPorts_a92cb746-f19f-450b-b413-8b9710b0176b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/loadBalancers/templates/bicep/VipAvailability_b239797f-e627-4e48-8609-94db72098c3d.bicep b/services/Network/loadBalancers/templates/bicep/VipAvailability_b239797f-e627-4e48-8609-94db72098c3d.bicep
index 99ebe3f0f..dd67923c2 100644
--- a/services/Network/loadBalancers/templates/bicep/VipAvailability_b239797f-e627-4e48-8609-94db72098c3d.bicep
+++ b/services/Network/loadBalancers/templates/bicep/VipAvailability_b239797f-e627-4e48-8609-94db72098c3d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/natGateways/templates/arm/ByteCount_e1808855-9a4d-464d-b75a-a41183c520bd.json b/services/Network/natGateways/templates/arm/ByteCount_e1808855-9a4d-464d-b75a-a41183c520bd.json
index 5f0dca3b3..4e2981935 100644
--- a/services/Network/natGateways/templates/arm/ByteCount_e1808855-9a4d-464d-b75a-a41183c520bd.json
+++ b/services/Network/natGateways/templates/arm/ByteCount_e1808855-9a4d-464d-b75a-a41183c520bd.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/natGateways/templates/arm/DatapathAvailability_7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.json b/services/Network/natGateways/templates/arm/DatapathAvailability_7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.json
index 7eb3554b0..40bbdef64 100644
--- a/services/Network/natGateways/templates/arm/DatapathAvailability_7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.json
+++ b/services/Network/natGateways/templates/arm/DatapathAvailability_7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/natGateways/templates/arm/PacketDropCount_53bb49ec-ed5b-40c3-999b-efefa9be4536.json b/services/Network/natGateways/templates/arm/PacketDropCount_53bb49ec-ed5b-40c3-999b-efefa9be4536.json
index 096085233..00ef83132 100644
--- a/services/Network/natGateways/templates/arm/PacketDropCount_53bb49ec-ed5b-40c3-999b-efefa9be4536.json
+++ b/services/Network/natGateways/templates/arm/PacketDropCount_53bb49ec-ed5b-40c3-999b-efefa9be4536.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/natGateways/templates/arm/SNATConnectionCount_4c2e410b-644e-4331-a55c-19bfdc3e4754.json b/services/Network/natGateways/templates/arm/SNATConnectionCount_4c2e410b-644e-4331-a55c-19bfdc3e4754.json
index 0a278b42a..9c3c10053 100644
--- a/services/Network/natGateways/templates/arm/SNATConnectionCount_4c2e410b-644e-4331-a55c-19bfdc3e4754.json
+++ b/services/Network/natGateways/templates/arm/SNATConnectionCount_4c2e410b-644e-4331-a55c-19bfdc3e4754.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/natGateways/templates/arm/TotalConnectionCount_c57f27b1-151c-4d27-a77e-b85547d817f7.json b/services/Network/natGateways/templates/arm/TotalConnectionCount_c57f27b1-151c-4d27-a77e-b85547d817f7.json
index af8e0258d..8cb8dc867 100644
--- a/services/Network/natGateways/templates/arm/TotalConnectionCount_c57f27b1-151c-4d27-a77e-b85547d817f7.json
+++ b/services/Network/natGateways/templates/arm/TotalConnectionCount_c57f27b1-151c-4d27-a77e-b85547d817f7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/natGateways/templates/bicep/ByteCount_e1808855-9a4d-464d-b75a-a41183c520bd.bicep b/services/Network/natGateways/templates/bicep/ByteCount_e1808855-9a4d-464d-b75a-a41183c520bd.bicep
index 0fa4a4687..000e55f40 100644
--- a/services/Network/natGateways/templates/bicep/ByteCount_e1808855-9a4d-464d-b75a-a41183c520bd.bicep
+++ b/services/Network/natGateways/templates/bicep/ByteCount_e1808855-9a4d-464d-b75a-a41183c520bd.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/natGateways/templates/bicep/DatapathAvailability_7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.bicep b/services/Network/natGateways/templates/bicep/DatapathAvailability_7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.bicep
index f71d3414d..b4dfadabb 100644
--- a/services/Network/natGateways/templates/bicep/DatapathAvailability_7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.bicep
+++ b/services/Network/natGateways/templates/bicep/DatapathAvailability_7cb8821d-c178-4c02-ba8a-1c6fcbcde2e8.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/natGateways/templates/bicep/PacketDropCount_53bb49ec-ed5b-40c3-999b-efefa9be4536.bicep b/services/Network/natGateways/templates/bicep/PacketDropCount_53bb49ec-ed5b-40c3-999b-efefa9be4536.bicep
index 06add4e20..c033f3d30 100644
--- a/services/Network/natGateways/templates/bicep/PacketDropCount_53bb49ec-ed5b-40c3-999b-efefa9be4536.bicep
+++ b/services/Network/natGateways/templates/bicep/PacketDropCount_53bb49ec-ed5b-40c3-999b-efefa9be4536.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/natGateways/templates/bicep/SNATConnectionCount_4c2e410b-644e-4331-a55c-19bfdc3e4754.bicep b/services/Network/natGateways/templates/bicep/SNATConnectionCount_4c2e410b-644e-4331-a55c-19bfdc3e4754.bicep
index 0fed2fb3f..68365b85f 100644
--- a/services/Network/natGateways/templates/bicep/SNATConnectionCount_4c2e410b-644e-4331-a55c-19bfdc3e4754.bicep
+++ b/services/Network/natGateways/templates/bicep/SNATConnectionCount_4c2e410b-644e-4331-a55c-19bfdc3e4754.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/natGateways/templates/bicep/TotalConnectionCount_c57f27b1-151c-4d27-a77e-b85547d817f7.bicep b/services/Network/natGateways/templates/bicep/TotalConnectionCount_c57f27b1-151c-4d27-a77e-b85547d817f7.bicep
index e27141749..0c7675fcc 100644
--- a/services/Network/natGateways/templates/bicep/TotalConnectionCount_c57f27b1-151c-4d27-a77e-b85547d817f7.bicep
+++ b/services/Network/natGateways/templates/bicep/TotalConnectionCount_c57f27b1-151c-4d27-a77e-b85547d817f7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/networkSecurityGroups/templates/arm/ActivityLogNSGDelete_4c54dd21-b5ce-4185-aa70-605b167f168f.json b/services/Network/networkSecurityGroups/templates/arm/ActivityLogNSGDelete_4c54dd21-b5ce-4185-aa70-605b167f168f.json
index da04c21b8..8e1b91253 100644
--- a/services/Network/networkSecurityGroups/templates/arm/ActivityLogNSGDelete_4c54dd21-b5ce-4185-aa70-605b167f168f.json
+++ b/services/Network/networkSecurityGroups/templates/arm/ActivityLogNSGDelete_4c54dd21-b5ce-4185-aa70-605b167f168f.json
@@ -79,7 +79,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/networkSecurityGroups/templates/bicep/ActivityLogNSGDelete_4c54dd21-b5ce-4185-aa70-605b167f168f.bicep b/services/Network/networkSecurityGroups/templates/bicep/ActivityLogNSGDelete_4c54dd21-b5ce-4185-aa70-605b167f168f.bicep
index a47449572..17c5e108b 100644
--- a/services/Network/networkSecurityGroups/templates/bicep/ActivityLogNSGDelete_4c54dd21-b5ce-4185-aa70-605b167f168f.bicep
+++ b/services/Network/networkSecurityGroups/templates/bicep/ActivityLogNSGDelete_4c54dd21-b5ce-4185-aa70-605b167f168f.bicep
@@ -52,7 +52,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/networkWatchers/templates/arm/connectionMonitors-ChecksFailedPercent_61cbc62a-1382-4581-850f-4ea69d8a9615.json b/services/Network/networkWatchers/templates/arm/connectionMonitors-ChecksFailedPercent_61cbc62a-1382-4581-850f-4ea69d8a9615.json
index 9650df74a..b78514cc5 100644
--- a/services/Network/networkWatchers/templates/arm/connectionMonitors-ChecksFailedPercent_61cbc62a-1382-4581-850f-4ea69d8a9615.json
+++ b/services/Network/networkWatchers/templates/arm/connectionMonitors-ChecksFailedPercent_61cbc62a-1382-4581-850f-4ea69d8a9615.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/networkWatchers/templates/arm/connectionMonitors-ProbesFailedPercent_7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.json b/services/Network/networkWatchers/templates/arm/connectionMonitors-ProbesFailedPercent_7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.json
index 333507991..45dc4c4a2 100644
--- a/services/Network/networkWatchers/templates/arm/connectionMonitors-ProbesFailedPercent_7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.json
+++ b/services/Network/networkWatchers/templates/arm/connectionMonitors-ProbesFailedPercent_7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/networkWatchers/templates/arm/connectionMonitors-RoundTripTimeMs_1744119b-cabb-4ac4-97c6-a61249a6c5be.json b/services/Network/networkWatchers/templates/arm/connectionMonitors-RoundTripTimeMs_1744119b-cabb-4ac4-97c6-a61249a6c5be.json
index 0857adb4e..4275e007f 100644
--- a/services/Network/networkWatchers/templates/arm/connectionMonitors-RoundTripTimeMs_1744119b-cabb-4ac4-97c6-a61249a6c5be.json
+++ b/services/Network/networkWatchers/templates/arm/connectionMonitors-RoundTripTimeMs_1744119b-cabb-4ac4-97c6-a61249a6c5be.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/networkWatchers/templates/arm/connectionMonitors-TestResult_370ff9a8-11ea-469a-9f52-b1c39d61c39d.json b/services/Network/networkWatchers/templates/arm/connectionMonitors-TestResult_370ff9a8-11ea-469a-9f52-b1c39d61c39d.json
index 57096d73c..b572ae4a2 100644
--- a/services/Network/networkWatchers/templates/arm/connectionMonitors-TestResult_370ff9a8-11ea-469a-9f52-b1c39d61c39d.json
+++ b/services/Network/networkWatchers/templates/arm/connectionMonitors-TestResult_370ff9a8-11ea-469a-9f52-b1c39d61c39d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/networkWatchers/templates/bicep/connectionMonitors-ChecksFailedPercent_61cbc62a-1382-4581-850f-4ea69d8a9615.bicep b/services/Network/networkWatchers/templates/bicep/connectionMonitors-ChecksFailedPercent_61cbc62a-1382-4581-850f-4ea69d8a9615.bicep
index 23144974f..2359aaed9 100644
--- a/services/Network/networkWatchers/templates/bicep/connectionMonitors-ChecksFailedPercent_61cbc62a-1382-4581-850f-4ea69d8a9615.bicep
+++ b/services/Network/networkWatchers/templates/bicep/connectionMonitors-ChecksFailedPercent_61cbc62a-1382-4581-850f-4ea69d8a9615.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/networkWatchers/templates/bicep/connectionMonitors-ProbesFailedPercent_7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.bicep b/services/Network/networkWatchers/templates/bicep/connectionMonitors-ProbesFailedPercent_7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.bicep
index b44ce8fd8..eb21e7b18 100644
--- a/services/Network/networkWatchers/templates/bicep/connectionMonitors-ProbesFailedPercent_7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.bicep
+++ b/services/Network/networkWatchers/templates/bicep/connectionMonitors-ProbesFailedPercent_7659c9f8-c257-4f0b-a8d9-1ceae6177ff5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/networkWatchers/templates/bicep/connectionMonitors-RoundTripTimeMs_1744119b-cabb-4ac4-97c6-a61249a6c5be.bicep b/services/Network/networkWatchers/templates/bicep/connectionMonitors-RoundTripTimeMs_1744119b-cabb-4ac4-97c6-a61249a6c5be.bicep
index 5cffd3a2c..626e8ba32 100644
--- a/services/Network/networkWatchers/templates/bicep/connectionMonitors-RoundTripTimeMs_1744119b-cabb-4ac4-97c6-a61249a6c5be.bicep
+++ b/services/Network/networkWatchers/templates/bicep/connectionMonitors-RoundTripTimeMs_1744119b-cabb-4ac4-97c6-a61249a6c5be.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/networkWatchers/templates/bicep/connectionMonitors-TestResult_370ff9a8-11ea-469a-9f52-b1c39d61c39d.bicep b/services/Network/networkWatchers/templates/bicep/connectionMonitors-TestResult_370ff9a8-11ea-469a-9f52-b1c39d61c39d.bicep
index 36f8f008d..6a185873f 100644
--- a/services/Network/networkWatchers/templates/bicep/connectionMonitors-TestResult_370ff9a8-11ea-469a-9f52-b1c39d61c39d.bicep
+++ b/services/Network/networkWatchers/templates/bicep/connectionMonitors-TestResult_370ff9a8-11ea-469a-9f52-b1c39d61c39d.bicep
@@ -139,7 +139,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/privateDnsZones/templates/arm/QueryVolume_4d219611-6487-4fcf-9bac-29cd9e5046a9.json b/services/Network/privateDnsZones/templates/arm/QueryVolume_4d219611-6487-4fcf-9bac-29cd9e5046a9.json
index 80e6a8d4d..d2d1ef866 100644
--- a/services/Network/privateDnsZones/templates/arm/QueryVolume_4d219611-6487-4fcf-9bac-29cd9e5046a9.json
+++ b/services/Network/privateDnsZones/templates/arm/QueryVolume_4d219611-6487-4fcf-9bac-29cd9e5046a9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/privateDnsZones/templates/arm/RecordSetCapacityUtilization_95473b2f-74ea-4929-bf22-f6f3be4ccbd5.json b/services/Network/privateDnsZones/templates/arm/RecordSetCapacityUtilization_95473b2f-74ea-4929-bf22-f6f3be4ccbd5.json
index c7ac762c4..fd8b2827b 100644
--- a/services/Network/privateDnsZones/templates/arm/RecordSetCapacityUtilization_95473b2f-74ea-4929-bf22-f6f3be4ccbd5.json
+++ b/services/Network/privateDnsZones/templates/arm/RecordSetCapacityUtilization_95473b2f-74ea-4929-bf22-f6f3be4ccbd5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/privateDnsZones/templates/arm/RecordSetCount_b410b69e-8bd5-44fe-899d-f4d5dce9931a.json b/services/Network/privateDnsZones/templates/arm/RecordSetCount_b410b69e-8bd5-44fe-899d-f4d5dce9931a.json
index 044116f1f..c7e28f9dc 100644
--- a/services/Network/privateDnsZones/templates/arm/RecordSetCount_b410b69e-8bd5-44fe-899d-f4d5dce9931a.json
+++ b/services/Network/privateDnsZones/templates/arm/RecordSetCount_b410b69e-8bd5-44fe-899d-f4d5dce9931a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/privateDnsZones/templates/arm/VirtualNetworkLinkCapacityUtilization_e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.json b/services/Network/privateDnsZones/templates/arm/VirtualNetworkLinkCapacityUtilization_e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.json
index c8db97852..fc3f383fc 100644
--- a/services/Network/privateDnsZones/templates/arm/VirtualNetworkLinkCapacityUtilization_e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.json
+++ b/services/Network/privateDnsZones/templates/arm/VirtualNetworkLinkCapacityUtilization_e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/privateDnsZones/templates/arm/VirtualNetworkWithRegistrationCapacityUtilization_c064753f-ea6a-4940-b603-975adb5127ae.json b/services/Network/privateDnsZones/templates/arm/VirtualNetworkWithRegistrationCapacityUtilization_c064753f-ea6a-4940-b603-975adb5127ae.json
index 7b282d58b..7f35ec33a 100644
--- a/services/Network/privateDnsZones/templates/arm/VirtualNetworkWithRegistrationCapacityUtilization_c064753f-ea6a-4940-b603-975adb5127ae.json
+++ b/services/Network/privateDnsZones/templates/arm/VirtualNetworkWithRegistrationCapacityUtilization_c064753f-ea6a-4940-b603-975adb5127ae.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/privateDnsZones/templates/bicep/QueryVolume_4d219611-6487-4fcf-9bac-29cd9e5046a9.bicep b/services/Network/privateDnsZones/templates/bicep/QueryVolume_4d219611-6487-4fcf-9bac-29cd9e5046a9.bicep
index 4515a926a..a9c517785 100644
--- a/services/Network/privateDnsZones/templates/bicep/QueryVolume_4d219611-6487-4fcf-9bac-29cd9e5046a9.bicep
+++ b/services/Network/privateDnsZones/templates/bicep/QueryVolume_4d219611-6487-4fcf-9bac-29cd9e5046a9.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/privateDnsZones/templates/bicep/RecordSetCapacityUtilization_95473b2f-74ea-4929-bf22-f6f3be4ccbd5.bicep b/services/Network/privateDnsZones/templates/bicep/RecordSetCapacityUtilization_95473b2f-74ea-4929-bf22-f6f3be4ccbd5.bicep
index ff1cd8a69..ccbeabcd5 100644
--- a/services/Network/privateDnsZones/templates/bicep/RecordSetCapacityUtilization_95473b2f-74ea-4929-bf22-f6f3be4ccbd5.bicep
+++ b/services/Network/privateDnsZones/templates/bicep/RecordSetCapacityUtilization_95473b2f-74ea-4929-bf22-f6f3be4ccbd5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/privateDnsZones/templates/bicep/RecordSetCount_b410b69e-8bd5-44fe-899d-f4d5dce9931a.bicep b/services/Network/privateDnsZones/templates/bicep/RecordSetCount_b410b69e-8bd5-44fe-899d-f4d5dce9931a.bicep
index 814eb708f..0d04752f9 100644
--- a/services/Network/privateDnsZones/templates/bicep/RecordSetCount_b410b69e-8bd5-44fe-899d-f4d5dce9931a.bicep
+++ b/services/Network/privateDnsZones/templates/bicep/RecordSetCount_b410b69e-8bd5-44fe-899d-f4d5dce9931a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/privateDnsZones/templates/bicep/VirtualNetworkLinkCapacityUtilization_e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.bicep b/services/Network/privateDnsZones/templates/bicep/VirtualNetworkLinkCapacityUtilization_e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.bicep
index 63a6ef6d9..3f212e237 100644
--- a/services/Network/privateDnsZones/templates/bicep/VirtualNetworkLinkCapacityUtilization_e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.bicep
+++ b/services/Network/privateDnsZones/templates/bicep/VirtualNetworkLinkCapacityUtilization_e71f87d1-81bb-4ee6-802d-9da4ab1cb3e3.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/privateDnsZones/templates/bicep/VirtualNetworkWithRegistrationCapacityUtilization_c064753f-ea6a-4940-b603-975adb5127ae.bicep b/services/Network/privateDnsZones/templates/bicep/VirtualNetworkWithRegistrationCapacityUtilization_c064753f-ea6a-4940-b603-975adb5127ae.bicep
index 79dbe462b..c51739523 100644
--- a/services/Network/privateDnsZones/templates/bicep/VirtualNetworkWithRegistrationCapacityUtilization_c064753f-ea6a-4940-b603-975adb5127ae.bicep
+++ b/services/Network/privateDnsZones/templates/bicep/VirtualNetworkWithRegistrationCapacityUtilization_c064753f-ea6a-4940-b603-975adb5127ae.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/publicIPAddresses/templates/arm/BytesInDDoS_652acaf1-c5a1-4a88-b3bb-822a14dece19.json b/services/Network/publicIPAddresses/templates/arm/BytesInDDoS_652acaf1-c5a1-4a88-b3bb-822a14dece19.json
index 3991c57b3..a896b3672 100644
--- a/services/Network/publicIPAddresses/templates/arm/BytesInDDoS_652acaf1-c5a1-4a88-b3bb-822a14dece19.json
+++ b/services/Network/publicIPAddresses/templates/arm/BytesInDDoS_652acaf1-c5a1-4a88-b3bb-822a14dece19.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/publicIPAddresses/templates/arm/IfUnderDDoSAttack_cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.json b/services/Network/publicIPAddresses/templates/arm/IfUnderDDoSAttack_cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.json
index 2d6346118..29e3f7314 100644
--- a/services/Network/publicIPAddresses/templates/arm/IfUnderDDoSAttack_cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.json
+++ b/services/Network/publicIPAddresses/templates/arm/IfUnderDDoSAttack_cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/publicIPAddresses/templates/arm/PacketsInDDoS_a78addf1-4632-4fc2-9afc-d1fb75049872.json b/services/Network/publicIPAddresses/templates/arm/PacketsInDDoS_a78addf1-4632-4fc2-9afc-d1fb75049872.json
index 3de7d2738..9059c0775 100644
--- a/services/Network/publicIPAddresses/templates/arm/PacketsInDDoS_a78addf1-4632-4fc2-9afc-d1fb75049872.json
+++ b/services/Network/publicIPAddresses/templates/arm/PacketsInDDoS_a78addf1-4632-4fc2-9afc-d1fb75049872.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/publicIPAddresses/templates/arm/TCPBytesInDDoS_54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.json b/services/Network/publicIPAddresses/templates/arm/TCPBytesInDDoS_54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.json
index 817359c4f..fcaa061b1 100644
--- a/services/Network/publicIPAddresses/templates/arm/TCPBytesInDDoS_54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.json
+++ b/services/Network/publicIPAddresses/templates/arm/TCPBytesInDDoS_54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/publicIPAddresses/templates/arm/TCPPacketsInDDoS_529b0b1f-46fc-423f-94ab-dd71dd7894e2.json b/services/Network/publicIPAddresses/templates/arm/TCPPacketsInDDoS_529b0b1f-46fc-423f-94ab-dd71dd7894e2.json
index 18ac1f9f6..967e0a734 100644
--- a/services/Network/publicIPAddresses/templates/arm/TCPPacketsInDDoS_529b0b1f-46fc-423f-94ab-dd71dd7894e2.json
+++ b/services/Network/publicIPAddresses/templates/arm/TCPPacketsInDDoS_529b0b1f-46fc-423f-94ab-dd71dd7894e2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/publicIPAddresses/templates/arm/UDPBytesInDDoS_8020f41e-ca61-43b4-88ca-f520057dfa92.json b/services/Network/publicIPAddresses/templates/arm/UDPBytesInDDoS_8020f41e-ca61-43b4-88ca-f520057dfa92.json
index 6eddbac0c..321587c86 100644
--- a/services/Network/publicIPAddresses/templates/arm/UDPBytesInDDoS_8020f41e-ca61-43b4-88ca-f520057dfa92.json
+++ b/services/Network/publicIPAddresses/templates/arm/UDPBytesInDDoS_8020f41e-ca61-43b4-88ca-f520057dfa92.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/publicIPAddresses/templates/arm/UDPPacketsInDDoS_27181c58-ca7a-433f-a0ee-a7a33102cb36.json b/services/Network/publicIPAddresses/templates/arm/UDPPacketsInDDoS_27181c58-ca7a-433f-a0ee-a7a33102cb36.json
index 8d64ac275..17fe70660 100644
--- a/services/Network/publicIPAddresses/templates/arm/UDPPacketsInDDoS_27181c58-ca7a-433f-a0ee-a7a33102cb36.json
+++ b/services/Network/publicIPAddresses/templates/arm/UDPPacketsInDDoS_27181c58-ca7a-433f-a0ee-a7a33102cb36.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/publicIPAddresses/templates/arm/VipAvailability_7f4c355a-5411-4400-826a-b82007bbd83d.json b/services/Network/publicIPAddresses/templates/arm/VipAvailability_7f4c355a-5411-4400-826a-b82007bbd83d.json
index 79dacfb10..fed0cb621 100644
--- a/services/Network/publicIPAddresses/templates/arm/VipAvailability_7f4c355a-5411-4400-826a-b82007bbd83d.json
+++ b/services/Network/publicIPAddresses/templates/arm/VipAvailability_7f4c355a-5411-4400-826a-b82007bbd83d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/publicIPAddresses/templates/bicep/BytesInDDoS_652acaf1-c5a1-4a88-b3bb-822a14dece19.bicep b/services/Network/publicIPAddresses/templates/bicep/BytesInDDoS_652acaf1-c5a1-4a88-b3bb-822a14dece19.bicep
index a09353d7b..04fe07694 100644
--- a/services/Network/publicIPAddresses/templates/bicep/BytesInDDoS_652acaf1-c5a1-4a88-b3bb-822a14dece19.bicep
+++ b/services/Network/publicIPAddresses/templates/bicep/BytesInDDoS_652acaf1-c5a1-4a88-b3bb-822a14dece19.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/publicIPAddresses/templates/bicep/IfUnderDDoSAttack_cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.bicep b/services/Network/publicIPAddresses/templates/bicep/IfUnderDDoSAttack_cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.bicep
index 46d7a6ea1..3757ffa18 100644
--- a/services/Network/publicIPAddresses/templates/bicep/IfUnderDDoSAttack_cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.bicep
+++ b/services/Network/publicIPAddresses/templates/bicep/IfUnderDDoSAttack_cb9a5dd7-4ae2-4adf-ab11-95363032ee5d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/publicIPAddresses/templates/bicep/PacketsInDDoS_a78addf1-4632-4fc2-9afc-d1fb75049872.bicep b/services/Network/publicIPAddresses/templates/bicep/PacketsInDDoS_a78addf1-4632-4fc2-9afc-d1fb75049872.bicep
index 512fba0b7..b7d86719c 100644
--- a/services/Network/publicIPAddresses/templates/bicep/PacketsInDDoS_a78addf1-4632-4fc2-9afc-d1fb75049872.bicep
+++ b/services/Network/publicIPAddresses/templates/bicep/PacketsInDDoS_a78addf1-4632-4fc2-9afc-d1fb75049872.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/publicIPAddresses/templates/bicep/TCPBytesInDDoS_54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.bicep b/services/Network/publicIPAddresses/templates/bicep/TCPBytesInDDoS_54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.bicep
index 5c6f8514e..019c1b4e5 100644
--- a/services/Network/publicIPAddresses/templates/bicep/TCPBytesInDDoS_54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.bicep
+++ b/services/Network/publicIPAddresses/templates/bicep/TCPBytesInDDoS_54d85ec1-6c8d-4372-bdab-f6f0b5cc12c4.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/publicIPAddresses/templates/bicep/TCPPacketsInDDoS_529b0b1f-46fc-423f-94ab-dd71dd7894e2.bicep b/services/Network/publicIPAddresses/templates/bicep/TCPPacketsInDDoS_529b0b1f-46fc-423f-94ab-dd71dd7894e2.bicep
index 67aec0946..0b7415fcb 100644
--- a/services/Network/publicIPAddresses/templates/bicep/TCPPacketsInDDoS_529b0b1f-46fc-423f-94ab-dd71dd7894e2.bicep
+++ b/services/Network/publicIPAddresses/templates/bicep/TCPPacketsInDDoS_529b0b1f-46fc-423f-94ab-dd71dd7894e2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/publicIPAddresses/templates/bicep/UDPBytesInDDoS_8020f41e-ca61-43b4-88ca-f520057dfa92.bicep b/services/Network/publicIPAddresses/templates/bicep/UDPBytesInDDoS_8020f41e-ca61-43b4-88ca-f520057dfa92.bicep
index 2f7217b95..98c572bdb 100644
--- a/services/Network/publicIPAddresses/templates/bicep/UDPBytesInDDoS_8020f41e-ca61-43b4-88ca-f520057dfa92.bicep
+++ b/services/Network/publicIPAddresses/templates/bicep/UDPBytesInDDoS_8020f41e-ca61-43b4-88ca-f520057dfa92.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/publicIPAddresses/templates/bicep/UDPPacketsInDDoS_27181c58-ca7a-433f-a0ee-a7a33102cb36.bicep b/services/Network/publicIPAddresses/templates/bicep/UDPPacketsInDDoS_27181c58-ca7a-433f-a0ee-a7a33102cb36.bicep
index 801bd1496..7a1c0495e 100644
--- a/services/Network/publicIPAddresses/templates/bicep/UDPPacketsInDDoS_27181c58-ca7a-433f-a0ee-a7a33102cb36.bicep
+++ b/services/Network/publicIPAddresses/templates/bicep/UDPPacketsInDDoS_27181c58-ca7a-433f-a0ee-a7a33102cb36.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/publicIPAddresses/templates/bicep/VipAvailability_7f4c355a-5411-4400-826a-b82007bbd83d.bicep b/services/Network/publicIPAddresses/templates/bicep/VipAvailability_7f4c355a-5411-4400-826a-b82007bbd83d.bicep
index 4a8cee54c..997f9311b 100644
--- a/services/Network/publicIPAddresses/templates/bicep/VipAvailability_7f4c355a-5411-4400-826a-b82007bbd83d.bicep
+++ b/services/Network/publicIPAddresses/templates/bicep/VipAvailability_7f4c355a-5411-4400-826a-b82007bbd83d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/routeTables/templates/arm/ActivityLogRouteTableUpdate_6c81eeff-a3a7-4c72-a58e-f2e547ab2799.json b/services/Network/routeTables/templates/arm/ActivityLogRouteTableUpdate_6c81eeff-a3a7-4c72-a58e-f2e547ab2799.json
index 1fdcff558..7308199cb 100644
--- a/services/Network/routeTables/templates/arm/ActivityLogRouteTableUpdate_6c81eeff-a3a7-4c72-a58e-f2e547ab2799.json
+++ b/services/Network/routeTables/templates/arm/ActivityLogRouteTableUpdate_6c81eeff-a3a7-4c72-a58e-f2e547ab2799.json
@@ -79,7 +79,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/routeTables/templates/bicep/ActivityLogRouteTableUpdate_6c81eeff-a3a7-4c72-a58e-f2e547ab2799.bicep b/services/Network/routeTables/templates/bicep/ActivityLogRouteTableUpdate_6c81eeff-a3a7-4c72-a58e-f2e547ab2799.bicep
index e93f61975..0b821ca7b 100644
--- a/services/Network/routeTables/templates/bicep/ActivityLogRouteTableUpdate_6c81eeff-a3a7-4c72-a58e-f2e547ab2799.bicep
+++ b/services/Network/routeTables/templates/bicep/ActivityLogRouteTableUpdate_6c81eeff-a3a7-4c72-a58e-f2e547ab2799.bicep
@@ -52,7 +52,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/trafficmanagerprofiles/templates/arm/ProbeAgentCurrentEndpointStateByProfileResourceId_dd3f294f-d12e-4e34-8f6a-c304d3d977e2.json b/services/Network/trafficmanagerprofiles/templates/arm/ProbeAgentCurrentEndpointStateByProfileResourceId_dd3f294f-d12e-4e34-8f6a-c304d3d977e2.json
index 7b6644cf8..6715f11b1 100644
--- a/services/Network/trafficmanagerprofiles/templates/arm/ProbeAgentCurrentEndpointStateByProfileResourceId_dd3f294f-d12e-4e34-8f6a-c304d3d977e2.json
+++ b/services/Network/trafficmanagerprofiles/templates/arm/ProbeAgentCurrentEndpointStateByProfileResourceId_dd3f294f-d12e-4e34-8f6a-c304d3d977e2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/trafficmanagerprofiles/templates/arm/QpsByEndpoint_f4699243-1ba2-49a8-85f8-c4a22a563925.json b/services/Network/trafficmanagerprofiles/templates/arm/QpsByEndpoint_f4699243-1ba2-49a8-85f8-c4a22a563925.json
index 57d76381f..a98f27624 100644
--- a/services/Network/trafficmanagerprofiles/templates/arm/QpsByEndpoint_f4699243-1ba2-49a8-85f8-c4a22a563925.json
+++ b/services/Network/trafficmanagerprofiles/templates/arm/QpsByEndpoint_f4699243-1ba2-49a8-85f8-c4a22a563925.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/trafficmanagerprofiles/templates/bicep/ProbeAgentCurrentEndpointStateByProfileResourceId_dd3f294f-d12e-4e34-8f6a-c304d3d977e2.bicep b/services/Network/trafficmanagerprofiles/templates/bicep/ProbeAgentCurrentEndpointStateByProfileResourceId_dd3f294f-d12e-4e34-8f6a-c304d3d977e2.bicep
index a945478d2..b1c33ce3c 100644
--- a/services/Network/trafficmanagerprofiles/templates/bicep/ProbeAgentCurrentEndpointStateByProfileResourceId_dd3f294f-d12e-4e34-8f6a-c304d3d977e2.bicep
+++ b/services/Network/trafficmanagerprofiles/templates/bicep/ProbeAgentCurrentEndpointStateByProfileResourceId_dd3f294f-d12e-4e34-8f6a-c304d3d977e2.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/trafficmanagerprofiles/templates/bicep/QpsByEndpoint_f4699243-1ba2-49a8-85f8-c4a22a563925.bicep b/services/Network/trafficmanagerprofiles/templates/bicep/QpsByEndpoint_f4699243-1ba2-49a8-85f8-c4a22a563925.bicep
index 06043a36c..ead665fca 100644
--- a/services/Network/trafficmanagerprofiles/templates/bicep/QpsByEndpoint_f4699243-1ba2-49a8-85f8-c4a22a563925.bicep
+++ b/services/Network/trafficmanagerprofiles/templates/bicep/QpsByEndpoint_f4699243-1ba2-49a8-85f8-c4a22a563925.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/arm/AverageBandwidth_88642ff7-6c08-486a-9bf2-37764d5bf6a3.json b/services/Network/virtualNetworkGateways/templates/arm/AverageBandwidth_88642ff7-6c08-486a-9bf2-37764d5bf6a3.json
index 84d924d65..5955f8605 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/AverageBandwidth_88642ff7-6c08-486a-9bf2-37764d5bf6a3.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/AverageBandwidth_88642ff7-6c08-486a-9bf2-37764d5bf6a3.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/arm/ExpressRouteGatewayBitsPerSecond_4c3c25d2-7473-4d0c-9174-609162571859.json b/services/Network/virtualNetworkGateways/templates/arm/ExpressRouteGatewayBitsPerSecond_4c3c25d2-7473-4d0c-9174-609162571859.json
index 0b69df891..b37aa6190 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/ExpressRouteGatewayBitsPerSecond_4c3c25d2-7473-4d0c-9174-609162571859.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/ExpressRouteGatewayBitsPerSecond_4c3c25d2-7473-4d0c-9174-609162571859.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/arm/ExpressRouteGatewayCpuUtilization_56491bc7-1267-42a2-92c6-fe9efe822ff1.json b/services/Network/virtualNetworkGateways/templates/arm/ExpressRouteGatewayCpuUtilization_56491bc7-1267-42a2-92c6-fe9efe822ff1.json
index 1cc32df05..29f60cdf5 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/ExpressRouteGatewayCpuUtilization_56491bc7-1267-42a2-92c6-fe9efe822ff1.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/ExpressRouteGatewayCpuUtilization_56491bc7-1267-42a2-92c6-fe9efe822ff1.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/arm/TunnelAverageBandwidth_09bb7f01-a715-437d-b692-325f89e1869e.json b/services/Network/virtualNetworkGateways/templates/arm/TunnelAverageBandwidth_09bb7f01-a715-437d-b692-325f89e1869e.json
index 1423070a9..d2f5db862 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/TunnelAverageBandwidth_09bb7f01-a715-437d-b692-325f89e1869e.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/TunnelAverageBandwidth_09bb7f01-a715-437d-b692-325f89e1869e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressBytes_092f6e09-1eb5-436d-b7c2-eadb70318920.json b/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressBytes_092f6e09-1eb5-436d-b7c2-eadb70318920.json
index 6e5edfde8..52ad4ff2f 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressBytes_092f6e09-1eb5-436d-b7c2-eadb70318920.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressBytes_092f6e09-1eb5-436d-b7c2-eadb70318920.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressPacketDropCount_6f02e3e8-9bfa-4312-a352-6506139e3dba.json b/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressPacketDropCount_6f02e3e8-9bfa-4312-a352-6506139e3dba.json
index 71476092e..4a6ebf930 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressPacketDropCount_6f02e3e8-9bfa-4312-a352-6506139e3dba.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressPacketDropCount_6f02e3e8-9bfa-4312-a352-6506139e3dba.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressPacketDropTSMismatch_ca909c09-89c4-467e-bdca-9140e72d6c82.json b/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressPacketDropTSMismatch_ca909c09-89c4-467e-bdca-9140e72d6c82.json
index 382d9bf09..0aa63f5d0 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressPacketDropTSMismatch_ca909c09-89c4-467e-bdca-9140e72d6c82.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/TunnelEgressPacketDropTSMismatch_ca909c09-89c4-467e-bdca-9140e72d6c82.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressBytes_a34fa329-da3e-4947-8d06-9bd2bee6c8a7.json b/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressBytes_a34fa329-da3e-4947-8d06-9bd2bee6c8a7.json
index 3c65ece6b..eeacaa8ac 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressBytes_a34fa329-da3e-4947-8d06-9bd2bee6c8a7.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressBytes_a34fa329-da3e-4947-8d06-9bd2bee6c8a7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressPacketDropCount_b511650f-535c-45d1-a089-0ea402245deb.json b/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressPacketDropCount_b511650f-535c-45d1-a089-0ea402245deb.json
index a3df2adf1..f72ebdc5c 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressPacketDropCount_b511650f-535c-45d1-a089-0ea402245deb.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressPacketDropCount_b511650f-535c-45d1-a089-0ea402245deb.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressPacketDropTSMismatch_1cc4a539-e4bf-40e8-a280-f4e9e178fb51.json b/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressPacketDropTSMismatch_1cc4a539-e4bf-40e8-a280-f4e9e178fb51.json
index 1aff0df33..09a483e34 100644
--- a/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressPacketDropTSMismatch_1cc4a539-e4bf-40e8-a280-f4e9e178fb51.json
+++ b/services/Network/virtualNetworkGateways/templates/arm/TunnelIngressPacketDropTSMismatch_1cc4a539-e4bf-40e8-a280-f4e9e178fb51.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/AverageBandwidth_88642ff7-6c08-486a-9bf2-37764d5bf6a3.bicep b/services/Network/virtualNetworkGateways/templates/bicep/AverageBandwidth_88642ff7-6c08-486a-9bf2-37764d5bf6a3.bicep
index e5eabfe09..66ad3ddb3 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/AverageBandwidth_88642ff7-6c08-486a-9bf2-37764d5bf6a3.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/AverageBandwidth_88642ff7-6c08-486a-9bf2-37764d5bf6a3.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/ExpressRouteGatewayBitsPerSecond_4c3c25d2-7473-4d0c-9174-609162571859.bicep b/services/Network/virtualNetworkGateways/templates/bicep/ExpressRouteGatewayBitsPerSecond_4c3c25d2-7473-4d0c-9174-609162571859.bicep
index 84f655472..0d6ba7f16 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/ExpressRouteGatewayBitsPerSecond_4c3c25d2-7473-4d0c-9174-609162571859.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/ExpressRouteGatewayBitsPerSecond_4c3c25d2-7473-4d0c-9174-609162571859.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/ExpressRouteGatewayCpuUtilization_56491bc7-1267-42a2-92c6-fe9efe822ff1.bicep b/services/Network/virtualNetworkGateways/templates/bicep/ExpressRouteGatewayCpuUtilization_56491bc7-1267-42a2-92c6-fe9efe822ff1.bicep
index 0249b7633..feb8a8194 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/ExpressRouteGatewayCpuUtilization_56491bc7-1267-42a2-92c6-fe9efe822ff1.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/ExpressRouteGatewayCpuUtilization_56491bc7-1267-42a2-92c6-fe9efe822ff1.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/TunnelAverageBandwidth_09bb7f01-a715-437d-b692-325f89e1869e.bicep b/services/Network/virtualNetworkGateways/templates/bicep/TunnelAverageBandwidth_09bb7f01-a715-437d-b692-325f89e1869e.bicep
index fd7bd71d0..40535360f 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/TunnelAverageBandwidth_09bb7f01-a715-437d-b692-325f89e1869e.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/TunnelAverageBandwidth_09bb7f01-a715-437d-b692-325f89e1869e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressBytes_092f6e09-1eb5-436d-b7c2-eadb70318920.bicep b/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressBytes_092f6e09-1eb5-436d-b7c2-eadb70318920.bicep
index 2f32a7bd4..32c7c3a33 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressBytes_092f6e09-1eb5-436d-b7c2-eadb70318920.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressBytes_092f6e09-1eb5-436d-b7c2-eadb70318920.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressPacketDropCount_6f02e3e8-9bfa-4312-a352-6506139e3dba.bicep b/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressPacketDropCount_6f02e3e8-9bfa-4312-a352-6506139e3dba.bicep
index bfc390276..8a9b5c5ee 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressPacketDropCount_6f02e3e8-9bfa-4312-a352-6506139e3dba.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressPacketDropCount_6f02e3e8-9bfa-4312-a352-6506139e3dba.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressPacketDropTSMismatch_ca909c09-89c4-467e-bdca-9140e72d6c82.bicep b/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressPacketDropTSMismatch_ca909c09-89c4-467e-bdca-9140e72d6c82.bicep
index 85d72c210..8f70ad3ed 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressPacketDropTSMismatch_ca909c09-89c4-467e-bdca-9140e72d6c82.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/TunnelEgressPacketDropTSMismatch_ca909c09-89c4-467e-bdca-9140e72d6c82.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressBytes_a34fa329-da3e-4947-8d06-9bd2bee6c8a7.bicep b/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressBytes_a34fa329-da3e-4947-8d06-9bd2bee6c8a7.bicep
index c5dbc8b56..ca273f747 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressBytes_a34fa329-da3e-4947-8d06-9bd2bee6c8a7.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressBytes_a34fa329-da3e-4947-8d06-9bd2bee6c8a7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressPacketDropCount_b511650f-535c-45d1-a089-0ea402245deb.bicep b/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressPacketDropCount_b511650f-535c-45d1-a089-0ea402245deb.bicep
index 04c6b5b40..260da3e0a 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressPacketDropCount_b511650f-535c-45d1-a089-0ea402245deb.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressPacketDropCount_b511650f-535c-45d1-a089-0ea402245deb.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressPacketDropTSMismatch_1cc4a539-e4bf-40e8-a280-f4e9e178fb51.bicep b/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressPacketDropTSMismatch_1cc4a539-e4bf-40e8-a280-f4e9e178fb51.bicep
index 0ae80a7a6..bd5a7881d 100644
--- a/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressPacketDropTSMismatch_1cc4a539-e4bf-40e8-a280-f4e9e178fb51.bicep
+++ b/services/Network/virtualNetworkGateways/templates/bicep/TunnelIngressPacketDropTSMismatch_1cc4a539-e4bf-40e8-a280-f4e9e178fb51.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/virtualNetworks/templates/arm/IfUnderDDoSAttack_72dea6f4-858c-423f-8189-406aac7d20ac.json b/services/Network/virtualNetworks/templates/arm/IfUnderDDoSAttack_72dea6f4-858c-423f-8189-406aac7d20ac.json
index 8d1811338..3412d2c31 100644
--- a/services/Network/virtualNetworks/templates/arm/IfUnderDDoSAttack_72dea6f4-858c-423f-8189-406aac7d20ac.json
+++ b/services/Network/virtualNetworks/templates/arm/IfUnderDDoSAttack_72dea6f4-858c-423f-8189-406aac7d20ac.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/virtualNetworks/templates/bicep/IfUnderDDoSAttack_72dea6f4-858c-423f-8189-406aac7d20ac.bicep b/services/Network/virtualNetworks/templates/bicep/IfUnderDDoSAttack_72dea6f4-858c-423f-8189-406aac7d20ac.bicep
index 6b38554de..e86f9946f 100644
--- a/services/Network/virtualNetworks/templates/bicep/IfUnderDDoSAttack_72dea6f4-858c-423f-8189-406aac7d20ac.bicep
+++ b/services/Network/virtualNetworks/templates/bicep/IfUnderDDoSAttack_72dea6f4-858c-423f-8189-406aac7d20ac.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/vpnGateways/templates/arm/ActivityLogVPNGatewayDelete_50c8313a-bbe7-4981-8eee-4b4d44fda37f.json b/services/Network/vpnGateways/templates/arm/ActivityLogVPNGatewayDelete_50c8313a-bbe7-4981-8eee-4b4d44fda37f.json
index 130cb4986..ecf8e2c70 100644
--- a/services/Network/vpnGateways/templates/arm/ActivityLogVPNGatewayDelete_50c8313a-bbe7-4981-8eee-4b4d44fda37f.json
+++ b/services/Network/vpnGateways/templates/arm/ActivityLogVPNGatewayDelete_50c8313a-bbe7-4981-8eee-4b4d44fda37f.json
@@ -79,7 +79,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/vpnGateways/templates/arm/BGPPeerStatus_b0ea832c-aae8-42c0-ad83-0bb13d66d56e.json b/services/Network/vpnGateways/templates/arm/BGPPeerStatus_b0ea832c-aae8-42c0-ad83-0bb13d66d56e.json
index 09043ea6f..fb74cf381 100644
--- a/services/Network/vpnGateways/templates/arm/BGPPeerStatus_b0ea832c-aae8-42c0-ad83-0bb13d66d56e.json
+++ b/services/Network/vpnGateways/templates/arm/BGPPeerStatus_b0ea832c-aae8-42c0-ad83-0bb13d66d56e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/vpnGateways/templates/arm/TunnelAverageBandwidth_d74fd111-125f-45b8-8bbc-e23bd40aa869.json b/services/Network/vpnGateways/templates/arm/TunnelAverageBandwidth_d74fd111-125f-45b8-8bbc-e23bd40aa869.json
index ed4d1ffd1..3abe434ca 100644
--- a/services/Network/vpnGateways/templates/arm/TunnelAverageBandwidth_d74fd111-125f-45b8-8bbc-e23bd40aa869.json
+++ b/services/Network/vpnGateways/templates/arm/TunnelAverageBandwidth_d74fd111-125f-45b8-8bbc-e23bd40aa869.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/vpnGateways/templates/arm/TunnelEgressBytes_cd3b834d-f34f-4a67-af01-b1c5d32195a9.json b/services/Network/vpnGateways/templates/arm/TunnelEgressBytes_cd3b834d-f34f-4a67-af01-b1c5d32195a9.json
index 981ad38b0..d15515ba6 100644
--- a/services/Network/vpnGateways/templates/arm/TunnelEgressBytes_cd3b834d-f34f-4a67-af01-b1c5d32195a9.json
+++ b/services/Network/vpnGateways/templates/arm/TunnelEgressBytes_cd3b834d-f34f-4a67-af01-b1c5d32195a9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/vpnGateways/templates/arm/TunnelEgressPacketDropCount_c5ae6d80-59db-4087-8e9b-0df36c54ebe9.json b/services/Network/vpnGateways/templates/arm/TunnelEgressPacketDropCount_c5ae6d80-59db-4087-8e9b-0df36c54ebe9.json
index c4571d8a3..6feef702e 100644
--- a/services/Network/vpnGateways/templates/arm/TunnelEgressPacketDropCount_c5ae6d80-59db-4087-8e9b-0df36c54ebe9.json
+++ b/services/Network/vpnGateways/templates/arm/TunnelEgressPacketDropCount_c5ae6d80-59db-4087-8e9b-0df36c54ebe9.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/vpnGateways/templates/arm/TunnelEgressPacketDropTSMismatch_7b361791-127e-4a6f-9c1b-c8d9f41ec223.json b/services/Network/vpnGateways/templates/arm/TunnelEgressPacketDropTSMismatch_7b361791-127e-4a6f-9c1b-c8d9f41ec223.json
index 810a50f5c..f3139867d 100644
--- a/services/Network/vpnGateways/templates/arm/TunnelEgressPacketDropTSMismatch_7b361791-127e-4a6f-9c1b-c8d9f41ec223.json
+++ b/services/Network/vpnGateways/templates/arm/TunnelEgressPacketDropTSMismatch_7b361791-127e-4a6f-9c1b-c8d9f41ec223.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/vpnGateways/templates/arm/TunnelIngressBytes_a05d97b8-37b9-4100-a860-d57363aaaf5f.json b/services/Network/vpnGateways/templates/arm/TunnelIngressBytes_a05d97b8-37b9-4100-a860-d57363aaaf5f.json
index 9ef07aab9..6ad8731a8 100644
--- a/services/Network/vpnGateways/templates/arm/TunnelIngressBytes_a05d97b8-37b9-4100-a860-d57363aaaf5f.json
+++ b/services/Network/vpnGateways/templates/arm/TunnelIngressBytes_a05d97b8-37b9-4100-a860-d57363aaaf5f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/vpnGateways/templates/arm/TunnelIngressPacketDropCount_c2c9a09d-7fad-4c67-9a29-4c2c376a7214.json b/services/Network/vpnGateways/templates/arm/TunnelIngressPacketDropCount_c2c9a09d-7fad-4c67-9a29-4c2c376a7214.json
index 5cc928a4c..267371724 100644
--- a/services/Network/vpnGateways/templates/arm/TunnelIngressPacketDropCount_c2c9a09d-7fad-4c67-9a29-4c2c376a7214.json
+++ b/services/Network/vpnGateways/templates/arm/TunnelIngressPacketDropCount_c2c9a09d-7fad-4c67-9a29-4c2c376a7214.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/vpnGateways/templates/arm/TunnelIngressPacketDropTSMismatch_7affb4da-2058-4f12-b15b-ca58e92b63e5.json b/services/Network/vpnGateways/templates/arm/TunnelIngressPacketDropTSMismatch_7affb4da-2058-4f12-b15b-ca58e92b63e5.json
index 1aff0df33..09a483e34 100644
--- a/services/Network/vpnGateways/templates/arm/TunnelIngressPacketDropTSMismatch_7affb4da-2058-4f12-b15b-ca58e92b63e5.json
+++ b/services/Network/vpnGateways/templates/arm/TunnelIngressPacketDropTSMismatch_7affb4da-2058-4f12-b15b-ca58e92b63e5.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Network/vpnGateways/templates/bicep/ActivityLogVPNGatewayDelete_50c8313a-bbe7-4981-8eee-4b4d44fda37f.bicep b/services/Network/vpnGateways/templates/bicep/ActivityLogVPNGatewayDelete_50c8313a-bbe7-4981-8eee-4b4d44fda37f.bicep
index 6ff486a60..1ddd9c12a 100644
--- a/services/Network/vpnGateways/templates/bicep/ActivityLogVPNGatewayDelete_50c8313a-bbe7-4981-8eee-4b4d44fda37f.bicep
+++ b/services/Network/vpnGateways/templates/bicep/ActivityLogVPNGatewayDelete_50c8313a-bbe7-4981-8eee-4b4d44fda37f.bicep
@@ -52,7 +52,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/vpnGateways/templates/bicep/BGPPeerStatus_b0ea832c-aae8-42c0-ad83-0bb13d66d56e.bicep b/services/Network/vpnGateways/templates/bicep/BGPPeerStatus_b0ea832c-aae8-42c0-ad83-0bb13d66d56e.bicep
index f1d4f0c4b..1c58f3c66 100644
--- a/services/Network/vpnGateways/templates/bicep/BGPPeerStatus_b0ea832c-aae8-42c0-ad83-0bb13d66d56e.bicep
+++ b/services/Network/vpnGateways/templates/bicep/BGPPeerStatus_b0ea832c-aae8-42c0-ad83-0bb13d66d56e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/vpnGateways/templates/bicep/TunnelAverageBandwidth_d74fd111-125f-45b8-8bbc-e23bd40aa869.bicep b/services/Network/vpnGateways/templates/bicep/TunnelAverageBandwidth_d74fd111-125f-45b8-8bbc-e23bd40aa869.bicep
index 5e1f00e67..b79b86cf7 100644
--- a/services/Network/vpnGateways/templates/bicep/TunnelAverageBandwidth_d74fd111-125f-45b8-8bbc-e23bd40aa869.bicep
+++ b/services/Network/vpnGateways/templates/bicep/TunnelAverageBandwidth_d74fd111-125f-45b8-8bbc-e23bd40aa869.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/vpnGateways/templates/bicep/TunnelEgressBytes_cd3b834d-f34f-4a67-af01-b1c5d32195a9.bicep b/services/Network/vpnGateways/templates/bicep/TunnelEgressBytes_cd3b834d-f34f-4a67-af01-b1c5d32195a9.bicep
index fe858c530..761cdccb9 100644
--- a/services/Network/vpnGateways/templates/bicep/TunnelEgressBytes_cd3b834d-f34f-4a67-af01-b1c5d32195a9.bicep
+++ b/services/Network/vpnGateways/templates/bicep/TunnelEgressBytes_cd3b834d-f34f-4a67-af01-b1c5d32195a9.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/vpnGateways/templates/bicep/TunnelEgressPacketDropCount_c5ae6d80-59db-4087-8e9b-0df36c54ebe9.bicep b/services/Network/vpnGateways/templates/bicep/TunnelEgressPacketDropCount_c5ae6d80-59db-4087-8e9b-0df36c54ebe9.bicep
index 85d33fec6..e5a13ec10 100644
--- a/services/Network/vpnGateways/templates/bicep/TunnelEgressPacketDropCount_c5ae6d80-59db-4087-8e9b-0df36c54ebe9.bicep
+++ b/services/Network/vpnGateways/templates/bicep/TunnelEgressPacketDropCount_c5ae6d80-59db-4087-8e9b-0df36c54ebe9.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/vpnGateways/templates/bicep/TunnelEgressPacketDropTSMismatch_7b361791-127e-4a6f-9c1b-c8d9f41ec223.bicep b/services/Network/vpnGateways/templates/bicep/TunnelEgressPacketDropTSMismatch_7b361791-127e-4a6f-9c1b-c8d9f41ec223.bicep
index 31015a0a7..58a068278 100644
--- a/services/Network/vpnGateways/templates/bicep/TunnelEgressPacketDropTSMismatch_7b361791-127e-4a6f-9c1b-c8d9f41ec223.bicep
+++ b/services/Network/vpnGateways/templates/bicep/TunnelEgressPacketDropTSMismatch_7b361791-127e-4a6f-9c1b-c8d9f41ec223.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/vpnGateways/templates/bicep/TunnelIngressBytes_a05d97b8-37b9-4100-a860-d57363aaaf5f.bicep b/services/Network/vpnGateways/templates/bicep/TunnelIngressBytes_a05d97b8-37b9-4100-a860-d57363aaaf5f.bicep
index 2f08bfddf..32830a4fc 100644
--- a/services/Network/vpnGateways/templates/bicep/TunnelIngressBytes_a05d97b8-37b9-4100-a860-d57363aaaf5f.bicep
+++ b/services/Network/vpnGateways/templates/bicep/TunnelIngressBytes_a05d97b8-37b9-4100-a860-d57363aaaf5f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/vpnGateways/templates/bicep/TunnelIngressPacketDropCount_c2c9a09d-7fad-4c67-9a29-4c2c376a7214.bicep b/services/Network/vpnGateways/templates/bicep/TunnelIngressPacketDropCount_c2c9a09d-7fad-4c67-9a29-4c2c376a7214.bicep
index 270f1d3f4..930f96b90 100644
--- a/services/Network/vpnGateways/templates/bicep/TunnelIngressPacketDropCount_c2c9a09d-7fad-4c67-9a29-4c2c376a7214.bicep
+++ b/services/Network/vpnGateways/templates/bicep/TunnelIngressPacketDropCount_c2c9a09d-7fad-4c67-9a29-4c2c376a7214.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Network/vpnGateways/templates/bicep/TunnelIngressPacketDropTSMismatch_7affb4da-2058-4f12-b15b-ca58e92b63e5.bicep b/services/Network/vpnGateways/templates/bicep/TunnelIngressPacketDropTSMismatch_7affb4da-2058-4f12-b15b-ca58e92b63e5.bicep
index 0ae80a7a6..bd5a7881d 100644
--- a/services/Network/vpnGateways/templates/bicep/TunnelIngressPacketDropTSMismatch_7affb4da-2058-4f12-b15b-ca58e92b63e5.bicep
+++ b/services/Network/vpnGateways/templates/bicep/TunnelIngressPacketDropTSMismatch_7affb4da-2058-4f12-b15b-ca58e92b63e5.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/arm/ActivityLogLAWorkspaceDelete_63cdfaa7-f029-4c4b-8f34-fff71fe401af.json b/services/OperationalInsights/workspaces/templates/arm/ActivityLogLAWorkspaceDelete_63cdfaa7-f029-4c4b-8f34-fff71fe401af.json
index fd4709dcb..1035d51b4 100644
--- a/services/OperationalInsights/workspaces/templates/arm/ActivityLogLAWorkspaceDelete_63cdfaa7-f029-4c4b-8f34-fff71fe401af.json
+++ b/services/OperationalInsights/workspaces/templates/arm/ActivityLogLAWorkspaceDelete_63cdfaa7-f029-4c4b-8f34-fff71fe401af.json
@@ -79,7 +79,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/ActivityLogLAWorkspaceRegenerateKey_04a98577-458a-4a5d-88b2-22b2d140f9f3.json b/services/OperationalInsights/workspaces/templates/arm/ActivityLogLAWorkspaceRegenerateKey_04a98577-458a-4a5d-88b2-22b2d140f9f3.json
index 556864bed..d80c2bc91 100644
--- a/services/OperationalInsights/workspaces/templates/arm/ActivityLogLAWorkspaceRegenerateKey_04a98577-458a-4a5d-88b2-22b2d140f9f3.json
+++ b/services/OperationalInsights/workspaces/templates/arm/ActivityLogLAWorkspaceRegenerateKey_04a98577-458a-4a5d-88b2-22b2d140f9f3.json
@@ -79,7 +79,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMBytesMemory_99ba0b14-4b3c-49b5-8763-3161b9aae538.json b/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMBytesMemory_99ba0b14-4b3c-49b5-8763-3161b9aae538.json
index 9b6f1bd35..cb9fc0daa 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMBytesMemory_99ba0b14-4b3c-49b5-8763-3161b9aae538.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMBytesMemory_99ba0b14-4b3c-49b5-8763-3161b9aae538.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMBytes_b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.json b/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMBytes_b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.json
index c72430a5f..7e23b5dfb 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMBytes_b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMBytes_b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMemory_91044c16-83bc-457f-80a9-360bad5dedb4.json b/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMemory_91044c16-83bc-457f-80a9-360bad5dedb4.json
index da5dfd1a9..1259c2644 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMemory_91044c16-83bc-457f-80a9-360bad5dedb4.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageAvailableMemory_91044c16-83bc-457f-80a9-360bad5dedb4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageAvgDisksecRead_8b472051-ff68-4059-9e50-243bfb64bae4.json b/services/OperationalInsights/workspaces/templates/arm/AverageAvgDisksecRead_8b472051-ff68-4059-9e50-243bfb64bae4.json
index 71d2eccf5..d585329ab 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageAvgDisksecRead_8b472051-ff68-4059-9e50-243bfb64bae4.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageAvgDisksecRead_8b472051-ff68-4059-9e50-243bfb64bae4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageAvgDisksecWrite_aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.json b/services/OperationalInsights/workspaces/templates/arm/AverageAvgDisksecWrite_aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.json
index 1aac931ed..3218060c3 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageAvgDisksecWrite_aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageAvgDisksecWrite_aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageBytesReceivedsec_60ec2790-dc83-419c-bdb5-38da9a477c68.json b/services/OperationalInsights/workspaces/templates/arm/AverageBytesReceivedsec_60ec2790-dc83-419c-bdb5-38da9a477c68.json
index 5d6a7acae..a0e79fb5e 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageBytesReceivedsec_60ec2790-dc83-419c-bdb5-38da9a477c68.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageBytesReceivedsec_60ec2790-dc83-419c-bdb5-38da9a477c68.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageBytesSentsec_de6d5087-bc5a-474f-9319-248a3c03ab44.json b/services/OperationalInsights/workspaces/templates/arm/AverageBytesSentsec_de6d5087-bc5a-474f-9319-248a3c03ab44.json
index ff198b5bc..4764db6b8 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageBytesSentsec_de6d5087-bc5a-474f-9319-248a3c03ab44.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageBytesSentsec_de6d5087-bc5a-474f-9319-248a3c03ab44.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageCommittedBytesInUse_a70e406c-a0ae-4e0f-99cd-8b0836812c59.json b/services/OperationalInsights/workspaces/templates/arm/AverageCommittedBytesInUse_a70e406c-a0ae-4e0f-99cd-8b0836812c59.json
index 5b5989407..2419ef5e7 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageCommittedBytesInUse_a70e406c-a0ae-4e0f-99cd-8b0836812c59.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageCommittedBytesInUse_a70e406c-a0ae-4e0f-99cd-8b0836812c59.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageCurrentDiskQueueLength_08a4f049-9bb8-45d0-9dfb-320f385cc71f.json b/services/OperationalInsights/workspaces/templates/arm/AverageCurrentDiskQueueLength_08a4f049-9bb8-45d0-9dfb-320f385cc71f.json
index eba405e90..d6d952987 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageCurrentDiskQueueLength_08a4f049-9bb8-45d0-9dfb-320f385cc71f.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageCurrentDiskQueueLength_08a4f049-9bb8-45d0-9dfb-320f385cc71f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageDiskTransferssec_30b462dd-d026-4122-9bcf-3a114517e04c.json b/services/OperationalInsights/workspaces/templates/arm/AverageDiskTransferssec_30b462dd-d026-4122-9bcf-3a114517e04c.json
index 3f6a03741..02d3fcc26 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageDiskTransferssec_30b462dd-d026-4122-9bcf-3a114517e04c.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageDiskTransferssec_30b462dd-d026-4122-9bcf-3a114517e04c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageFreeMegabytes_969677fe-d1e0-42f6-92af-c9269780411b.json b/services/OperationalInsights/workspaces/templates/arm/AverageFreeMegabytes_969677fe-d1e0-42f6-92af-c9269780411b.json
index 3e15612f4..986433706 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageFreeMegabytes_969677fe-d1e0-42f6-92af-c9269780411b.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageFreeMegabytes_969677fe-d1e0-42f6-92af-c9269780411b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageFreeSpace_db621663-ec0a-4fa3-82a7-b6b110726568.json b/services/OperationalInsights/workspaces/templates/arm/AverageFreeSpace_db621663-ec0a-4fa3-82a7-b6b110726568.json
index 9b06c6231..110c47732 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageFreeSpace_db621663-ec0a-4fa3-82a7-b6b110726568.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageFreeSpace_db621663-ec0a-4fa3-82a7-b6b110726568.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageIOWaitTime_1116a5eb-9e12-415a-af46-fad552421d36.json b/services/OperationalInsights/workspaces/templates/arm/AverageIOWaitTime_1116a5eb-9e12-415a-af46-fad552421d36.json
index f87af9f36..53b6559e7 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageIOWaitTime_1116a5eb-9e12-415a-af46-fad552421d36.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageIOWaitTime_1116a5eb-9e12-415a-af46-fad552421d36.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageIdleTime_732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.json b/services/OperationalInsights/workspaces/templates/arm/AverageIdleTime_732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.json
index a6dc6695b..c06546bb8 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageIdleTime_732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageIdleTime_732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AveragePagessec_88b7198b-32a5-4ae2-aaa5-7925066cc08c.json b/services/OperationalInsights/workspaces/templates/arm/AveragePagessec_88b7198b-32a5-4ae2-aaa5-7925066cc08c.json
index d15e4a9e4..4fb65d5bf 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AveragePagessec_88b7198b-32a5-4ae2-aaa5-7925066cc08c.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AveragePagessec_88b7198b-32a5-4ae2-aaa5-7925066cc08c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageProcessorTime_0c416177-e7ce-40d5-8f15-8566b3d7c03c.json b/services/OperationalInsights/workspaces/templates/arm/AverageProcessorTime_0c416177-e7ce-40d5-8f15-8566b3d7c03c.json
index 607be0d3a..cd11f35ad 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageProcessorTime_0c416177-e7ce-40d5-8f15-8566b3d7c03c.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageProcessorTime_0c416177-e7ce-40d5-8f15-8566b3d7c03c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageTotalBytesReceived_593b6885-3fb8-4562-89f1-8b0b68649185.json b/services/OperationalInsights/workspaces/templates/arm/AverageTotalBytesReceived_593b6885-3fb8-4562-89f1-8b0b68649185.json
index 0b5482352..d672d9da5 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageTotalBytesReceived_593b6885-3fb8-4562-89f1-8b0b68649185.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageTotalBytesReceived_593b6885-3fb8-4562-89f1-8b0b68649185.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageTotalBytesTransmitted_76583e85-8be6-4d02-8e09-aff0ce8574f8.json b/services/OperationalInsights/workspaces/templates/arm/AverageTotalBytesTransmitted_76583e85-8be6-4d02-8e09-aff0ce8574f8.json
index d4fd7878c..5dd4b7848 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageTotalBytesTransmitted_76583e85-8be6-4d02-8e09-aff0ce8574f8.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageTotalBytesTransmitted_76583e85-8be6-4d02-8e09-aff0ce8574f8.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageUsedInodes_af5d055f-0e1f-4c48-808a-d21f8268357d.json b/services/OperationalInsights/workspaces/templates/arm/AverageUsedInodes_af5d055f-0e1f-4c48-808a-d21f8268357d.json
index 2e7c92bd8..805b5b39d 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageUsedInodes_af5d055f-0e1f-4c48-808a-d21f8268357d.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageUsedInodes_af5d055f-0e1f-4c48-808a-d21f8268357d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageUsedMemory_171e5b5c-78cc-44a1-b7fb-7d750914ed5e.json b/services/OperationalInsights/workspaces/templates/arm/AverageUsedMemory_171e5b5c-78cc-44a1-b7fb-7d750914ed5e.json
index 9d0855e92..2dd07a79a 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageUsedMemory_171e5b5c-78cc-44a1-b7fb-7d750914ed5e.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageUsedMemory_171e5b5c-78cc-44a1-b7fb-7d750914ed5e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageUsedSpace_49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.json b/services/OperationalInsights/workspaces/templates/arm/AverageUsedSpace_49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.json
index 0d6a0377c..a6d52dd4e 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageUsedSpace_49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageUsedSpace_49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageUsedSwapSpace_04f64694-48a2-48ee-9455-ccce8e59b66f.json b/services/OperationalInsights/workspaces/templates/arm/AverageUsedSwapSpace_04f64694-48a2-48ee-9455-ccce8e59b66f.json
index 2aa014e27..0a5453392 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageUsedSwapSpace_04f64694-48a2-48ee-9455-ccce8e59b66f.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageUsedSwapSpace_04f64694-48a2-48ee-9455-ccce8e59b66f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/AverageUserTime_b8140cdb-5492-4177-881f-8668372947a8.json b/services/OperationalInsights/workspaces/templates/arm/AverageUserTime_b8140cdb-5492-4177-881f-8668372947a8.json
index 39c3430ea..1407af606 100644
--- a/services/OperationalInsights/workspaces/templates/arm/AverageUserTime_b8140cdb-5492-4177-881f-8668372947a8.json
+++ b/services/OperationalInsights/workspaces/templates/arm/AverageUserTime_b8140cdb-5492-4177-881f-8668372947a8.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/Event_0b608189-b028-4851-8854-9ce1a48c3dd6.json b/services/OperationalInsights/workspaces/templates/arm/Event_0b608189-b028-4851-8854-9ce1a48c3dd6.json
index 89c28d3d5..7993bd07b 100644
--- a/services/OperationalInsights/workspaces/templates/arm/Event_0b608189-b028-4851-8854-9ce1a48c3dd6.json
+++ b/services/OperationalInsights/workspaces/templates/arm/Event_0b608189-b028-4851-8854-9ce1a48c3dd6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/arm/Heartbeat_83703f70-9ea8-44aa-b88a-a8e56eb42858.json b/services/OperationalInsights/workspaces/templates/arm/Heartbeat_83703f70-9ea8-44aa-b88a-a8e56eb42858.json
index df8cff122..e6e888bde 100644
--- a/services/OperationalInsights/workspaces/templates/arm/Heartbeat_83703f70-9ea8-44aa-b88a-a8e56eb42858.json
+++ b/services/OperationalInsights/workspaces/templates/arm/Heartbeat_83703f70-9ea8-44aa-b88a-a8e56eb42858.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/OperationalInsights/workspaces/templates/bicep/ActivityLogLAWorkspaceDelete_63cdfaa7-f029-4c4b-8f34-fff71fe401af.bicep b/services/OperationalInsights/workspaces/templates/bicep/ActivityLogLAWorkspaceDelete_63cdfaa7-f029-4c4b-8f34-fff71fe401af.bicep
index b4e2324c6..65ad98afd 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/ActivityLogLAWorkspaceDelete_63cdfaa7-f029-4c4b-8f34-fff71fe401af.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/ActivityLogLAWorkspaceDelete_63cdfaa7-f029-4c4b-8f34-fff71fe401af.bicep
@@ -52,7 +52,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/ActivityLogLAWorkspaceRegenerateKey_04a98577-458a-4a5d-88b2-22b2d140f9f3.bicep b/services/OperationalInsights/workspaces/templates/bicep/ActivityLogLAWorkspaceRegenerateKey_04a98577-458a-4a5d-88b2-22b2d140f9f3.bicep
index 73cd43777..76e5a4bee 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/ActivityLogLAWorkspaceRegenerateKey_04a98577-458a-4a5d-88b2-22b2d140f9f3.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/ActivityLogLAWorkspaceRegenerateKey_04a98577-458a-4a5d-88b2-22b2d140f9f3.bicep
@@ -52,7 +52,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMBytesMemory_99ba0b14-4b3c-49b5-8763-3161b9aae538.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMBytesMemory_99ba0b14-4b3c-49b5-8763-3161b9aae538.bicep
index fbd706b55..0790f52c0 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMBytesMemory_99ba0b14-4b3c-49b5-8763-3161b9aae538.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMBytesMemory_99ba0b14-4b3c-49b5-8763-3161b9aae538.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMBytes_b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMBytes_b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.bicep
index 16451ebfb..2f2054033 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMBytes_b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMBytes_b0c5e86f-eb2d-41ea-a4a0-9819ad841c70.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMemory_91044c16-83bc-457f-80a9-360bad5dedb4.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMemory_91044c16-83bc-457f-80a9-360bad5dedb4.bicep
index e1f034c27..9e24fb173 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMemory_91044c16-83bc-457f-80a9-360bad5dedb4.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageAvailableMemory_91044c16-83bc-457f-80a9-360bad5dedb4.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageAvgDisksecRead_8b472051-ff68-4059-9e50-243bfb64bae4.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageAvgDisksecRead_8b472051-ff68-4059-9e50-243bfb64bae4.bicep
index a5b3d4c32..c58679e60 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageAvgDisksecRead_8b472051-ff68-4059-9e50-243bfb64bae4.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageAvgDisksecRead_8b472051-ff68-4059-9e50-243bfb64bae4.bicep
@@ -129,7 +129,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageAvgDisksecWrite_aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageAvgDisksecWrite_aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.bicep
index b22d357cf..fee677d9c 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageAvgDisksecWrite_aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageAvgDisksecWrite_aad0e64e-3cda-45bf-b6bd-8cff29ee35e5.bicep
@@ -129,7 +129,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageBytesReceivedsec_60ec2790-dc83-419c-bdb5-38da9a477c68.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageBytesReceivedsec_60ec2790-dc83-419c-bdb5-38da9a477c68.bicep
index 512e12c7f..49d10d1b9 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageBytesReceivedsec_60ec2790-dc83-419c-bdb5-38da9a477c68.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageBytesReceivedsec_60ec2790-dc83-419c-bdb5-38da9a477c68.bicep
@@ -151,7 +151,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageBytesSentsec_de6d5087-bc5a-474f-9319-248a3c03ab44.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageBytesSentsec_de6d5087-bc5a-474f-9319-248a3c03ab44.bicep
index 76b7d80a5..ab86948ab 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageBytesSentsec_de6d5087-bc5a-474f-9319-248a3c03ab44.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageBytesSentsec_de6d5087-bc5a-474f-9319-248a3c03ab44.bicep
@@ -151,7 +151,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageCommittedBytesInUse_a70e406c-a0ae-4e0f-99cd-8b0836812c59.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageCommittedBytesInUse_a70e406c-a0ae-4e0f-99cd-8b0836812c59.bicep
index b2af56c01..bd2415a3e 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageCommittedBytesInUse_a70e406c-a0ae-4e0f-99cd-8b0836812c59.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageCommittedBytesInUse_a70e406c-a0ae-4e0f-99cd-8b0836812c59.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageCurrentDiskQueueLength_08a4f049-9bb8-45d0-9dfb-320f385cc71f.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageCurrentDiskQueueLength_08a4f049-9bb8-45d0-9dfb-320f385cc71f.bicep
index 5a8f920de..3c9dfdb27 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageCurrentDiskQueueLength_08a4f049-9bb8-45d0-9dfb-320f385cc71f.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageCurrentDiskQueueLength_08a4f049-9bb8-45d0-9dfb-320f385cc71f.bicep
@@ -134,7 +134,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageDiskTransferssec_30b462dd-d026-4122-9bcf-3a114517e04c.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageDiskTransferssec_30b462dd-d026-4122-9bcf-3a114517e04c.bicep
index 9b49ebea2..b299eebe4 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageDiskTransferssec_30b462dd-d026-4122-9bcf-3a114517e04c.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageDiskTransferssec_30b462dd-d026-4122-9bcf-3a114517e04c.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageFreeMegabytes_969677fe-d1e0-42f6-92af-c9269780411b.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageFreeMegabytes_969677fe-d1e0-42f6-92af-c9269780411b.bicep
index 5d15016e7..ca187b7e4 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageFreeMegabytes_969677fe-d1e0-42f6-92af-c9269780411b.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageFreeMegabytes_969677fe-d1e0-42f6-92af-c9269780411b.bicep
@@ -129,7 +129,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageFreeSpace_db621663-ec0a-4fa3-82a7-b6b110726568.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageFreeSpace_db621663-ec0a-4fa3-82a7-b6b110726568.bicep
index 7110e1027..5e7d35c20 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageFreeSpace_db621663-ec0a-4fa3-82a7-b6b110726568.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageFreeSpace_db621663-ec0a-4fa3-82a7-b6b110726568.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageIOWaitTime_1116a5eb-9e12-415a-af46-fad552421d36.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageIOWaitTime_1116a5eb-9e12-415a-af46-fad552421d36.bicep
index 84f70554b..fc56183f6 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageIOWaitTime_1116a5eb-9e12-415a-af46-fad552421d36.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageIOWaitTime_1116a5eb-9e12-415a-af46-fad552421d36.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageIdleTime_732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageIdleTime_732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.bicep
index baf01ab19..4f345e474 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageIdleTime_732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageIdleTime_732c0a7b-ac17-47cb-bf78-2ebaa839fa0d.bicep
@@ -129,7 +129,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AveragePagessec_88b7198b-32a5-4ae2-aaa5-7925066cc08c.bicep b/services/OperationalInsights/workspaces/templates/bicep/AveragePagessec_88b7198b-32a5-4ae2-aaa5-7925066cc08c.bicep
index 6d0fd48b3..1ce5dafe3 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AveragePagessec_88b7198b-32a5-4ae2-aaa5-7925066cc08c.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AveragePagessec_88b7198b-32a5-4ae2-aaa5-7925066cc08c.bicep
@@ -129,7 +129,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageProcessorTime_0c416177-e7ce-40d5-8f15-8566b3d7c03c.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageProcessorTime_0c416177-e7ce-40d5-8f15-8566b3d7c03c.bicep
index 81a62effa..b8dd5454b 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageProcessorTime_0c416177-e7ce-40d5-8f15-8566b3d7c03c.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageProcessorTime_0c416177-e7ce-40d5-8f15-8566b3d7c03c.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageTotalBytesReceived_593b6885-3fb8-4562-89f1-8b0b68649185.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageTotalBytesReceived_593b6885-3fb8-4562-89f1-8b0b68649185.bicep
index 66ff6189d..e199b4b23 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageTotalBytesReceived_593b6885-3fb8-4562-89f1-8b0b68649185.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageTotalBytesReceived_593b6885-3fb8-4562-89f1-8b0b68649185.bicep
@@ -151,7 +151,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageTotalBytesTransmitted_76583e85-8be6-4d02-8e09-aff0ce8574f8.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageTotalBytesTransmitted_76583e85-8be6-4d02-8e09-aff0ce8574f8.bicep
index e89e4ab23..e93de5405 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageTotalBytesTransmitted_76583e85-8be6-4d02-8e09-aff0ce8574f8.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageTotalBytesTransmitted_76583e85-8be6-4d02-8e09-aff0ce8574f8.bicep
@@ -151,7 +151,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageUsedInodes_af5d055f-0e1f-4c48-808a-d21f8268357d.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageUsedInodes_af5d055f-0e1f-4c48-808a-d21f8268357d.bicep
index cffb768be..fb36a11fc 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageUsedInodes_af5d055f-0e1f-4c48-808a-d21f8268357d.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageUsedInodes_af5d055f-0e1f-4c48-808a-d21f8268357d.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageUsedMemory_171e5b5c-78cc-44a1-b7fb-7d750914ed5e.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageUsedMemory_171e5b5c-78cc-44a1-b7fb-7d750914ed5e.bicep
index 17b616c90..ba04072d7 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageUsedMemory_171e5b5c-78cc-44a1-b7fb-7d750914ed5e.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageUsedMemory_171e5b5c-78cc-44a1-b7fb-7d750914ed5e.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageUsedSpace_49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageUsedSpace_49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.bicep
index 0c1faedb6..ef0f4d3d4 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageUsedSpace_49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageUsedSpace_49ba0df7-18bf-4b3e-9d0f-f8c055762fd5.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageUsedSwapSpace_04f64694-48a2-48ee-9455-ccce8e59b66f.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageUsedSwapSpace_04f64694-48a2-48ee-9455-ccce8e59b66f.bicep
index e8847a694..30f0e952d 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageUsedSwapSpace_04f64694-48a2-48ee-9455-ccce8e59b66f.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageUsedSwapSpace_04f64694-48a2-48ee-9455-ccce8e59b66f.bicep
@@ -134,7 +134,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/AverageUserTime_b8140cdb-5492-4177-881f-8668372947a8.bicep b/services/OperationalInsights/workspaces/templates/bicep/AverageUserTime_b8140cdb-5492-4177-881f-8668372947a8.bicep
index 8d42d045c..a264258a5 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/AverageUserTime_b8140cdb-5492-4177-881f-8668372947a8.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/AverageUserTime_b8140cdb-5492-4177-881f-8668372947a8.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/Event_0b608189-b028-4851-8854-9ce1a48c3dd6.bicep b/services/OperationalInsights/workspaces/templates/bicep/Event_0b608189-b028-4851-8854-9ce1a48c3dd6.bicep
index c63a033f0..2e3dc7ebe 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/Event_0b608189-b028-4851-8854-9ce1a48c3dd6.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/Event_0b608189-b028-4851-8854-9ce1a48c3dd6.bicep
@@ -139,7 +139,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/OperationalInsights/workspaces/templates/bicep/Heartbeat_83703f70-9ea8-44aa-b88a-a8e56eb42858.bicep b/services/OperationalInsights/workspaces/templates/bicep/Heartbeat_83703f70-9ea8-44aa-b88a-a8e56eb42858.bicep
index 6b5357ae9..547f8d6f0 100644
--- a/services/OperationalInsights/workspaces/templates/bicep/Heartbeat_83703f70-9ea8-44aa-b88a-a8e56eb42858.bicep
+++ b/services/OperationalInsights/workspaces/templates/bicep/Heartbeat_83703f70-9ea8-44aa-b88a-a8e56eb42858.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/PowerBIDedicated/capacities/templates/arm/cpumetric_2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.json b/services/PowerBIDedicated/capacities/templates/arm/cpumetric_2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.json
index 9867d4f47..b5bd21b9c 100644
--- a/services/PowerBIDedicated/capacities/templates/arm/cpumetric_2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.json
+++ b/services/PowerBIDedicated/capacities/templates/arm/cpumetric_2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/PowerBIDedicated/capacities/templates/bicep/cpumetric_2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.bicep b/services/PowerBIDedicated/capacities/templates/bicep/cpumetric_2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.bicep
index 824eec72b..4f06c6613 100644
--- a/services/PowerBIDedicated/capacities/templates/bicep/cpumetric_2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.bicep
+++ b/services/PowerBIDedicated/capacities/templates/bicep/cpumetric_2993107e-d54f-4fc4-af7a-6a9bc6b4ea46.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/RecoveryServices/vaults/templates/arm/BackupHealthEvent_8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.json b/services/RecoveryServices/vaults/templates/arm/BackupHealthEvent_8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.json
index fa0f7417a..fec041bc9 100644
--- a/services/RecoveryServices/vaults/templates/arm/BackupHealthEvent_8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.json
+++ b/services/RecoveryServices/vaults/templates/arm/BackupHealthEvent_8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/RecoveryServices/vaults/templates/arm/RestoreHealthEvent_805aa9c8-4d52-411d-9811-cc02b33952e3.json b/services/RecoveryServices/vaults/templates/arm/RestoreHealthEvent_805aa9c8-4d52-411d-9811-cc02b33952e3.json
index e83415b1a..1e01a23da 100644
--- a/services/RecoveryServices/vaults/templates/arm/RestoreHealthEvent_805aa9c8-4d52-411d-9811-cc02b33952e3.json
+++ b/services/RecoveryServices/vaults/templates/arm/RestoreHealthEvent_805aa9c8-4d52-411d-9811-cc02b33952e3.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/RecoveryServices/vaults/templates/bicep/BackupHealthEvent_8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.bicep b/services/RecoveryServices/vaults/templates/bicep/BackupHealthEvent_8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.bicep
index cbd9c411b..8d7d8970e 100644
--- a/services/RecoveryServices/vaults/templates/bicep/BackupHealthEvent_8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.bicep
+++ b/services/RecoveryServices/vaults/templates/bicep/BackupHealthEvent_8f9b2819-9c51-4f30-91fd-195b7bc5d7a5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/RecoveryServices/vaults/templates/bicep/RestoreHealthEvent_805aa9c8-4d52-411d-9811-cc02b33952e3.bicep b/services/RecoveryServices/vaults/templates/bicep/RestoreHealthEvent_805aa9c8-4d52-411d-9811-cc02b33952e3.bicep
index 5ebd67f90..2fdb93820 100644
--- a/services/RecoveryServices/vaults/templates/bicep/RestoreHealthEvent_805aa9c8-4d52-411d-9811-cc02b33952e3.bicep
+++ b/services/RecoveryServices/vaults/templates/bicep/RestoreHealthEvent_805aa9c8-4d52-411d-9811-cc02b33952e3.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Resources/subscriptions/templates/arm/ResourceHealthUnhealthy_afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.json b/services/Resources/subscriptions/templates/arm/ResourceHealthUnhealthy_afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.json
index 73b325a43..4f91b4c21 100644
--- a/services/Resources/subscriptions/templates/arm/ResourceHealthUnhealthy_afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.json
+++ b/services/Resources/subscriptions/templates/arm/ResourceHealthUnhealthy_afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.json
@@ -95,7 +95,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Resources/subscriptions/templates/arm/ServiceHealthAdvisory_7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.json b/services/Resources/subscriptions/templates/arm/ServiceHealthAdvisory_7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.json
index 2c6816dde..6b90a8716 100644
--- a/services/Resources/subscriptions/templates/arm/ServiceHealthAdvisory_7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.json
+++ b/services/Resources/subscriptions/templates/arm/ServiceHealthAdvisory_7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.json
@@ -75,7 +75,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Resources/subscriptions/templates/arm/ServiceHealthIncident_f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.json b/services/Resources/subscriptions/templates/arm/ServiceHealthIncident_f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.json
index 1e9acbc5c..b40144b77 100644
--- a/services/Resources/subscriptions/templates/arm/ServiceHealthIncident_f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.json
+++ b/services/Resources/subscriptions/templates/arm/ServiceHealthIncident_f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.json
@@ -75,7 +75,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Resources/subscriptions/templates/arm/ServiceHealthMaintenance_26a33edf-0698-424d-aae2-6bcd5af323d5.json b/services/Resources/subscriptions/templates/arm/ServiceHealthMaintenance_26a33edf-0698-424d-aae2-6bcd5af323d5.json
index fe9c5cab5..0fea6dae8 100644
--- a/services/Resources/subscriptions/templates/arm/ServiceHealthMaintenance_26a33edf-0698-424d-aae2-6bcd5af323d5.json
+++ b/services/Resources/subscriptions/templates/arm/ServiceHealthMaintenance_26a33edf-0698-424d-aae2-6bcd5af323d5.json
@@ -75,7 +75,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Resources/subscriptions/templates/arm/ServiceHealthSecurity_89dbd4e4-f709-47c6-a243-4207678c8473.json b/services/Resources/subscriptions/templates/arm/ServiceHealthSecurity_89dbd4e4-f709-47c6-a243-4207678c8473.json
index a28f6f8ce..598b9d4f4 100644
--- a/services/Resources/subscriptions/templates/arm/ServiceHealthSecurity_89dbd4e4-f709-47c6-a243-4207678c8473.json
+++ b/services/Resources/subscriptions/templates/arm/ServiceHealthSecurity_89dbd4e4-f709-47c6-a243-4207678c8473.json
@@ -75,7 +75,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Resources/subscriptions/templates/bicep/ResourceHealthUnhealthy_afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.bicep b/services/Resources/subscriptions/templates/bicep/ResourceHealthUnhealthy_afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.bicep
index 9086def85..834fa2a60 100644
--- a/services/Resources/subscriptions/templates/bicep/ResourceHealthUnhealthy_afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.bicep
+++ b/services/Resources/subscriptions/templates/bicep/ResourceHealthUnhealthy_afcf3ad4-93c9-46e4-bdb7-3a8e9af405d1.bicep
@@ -66,7 +66,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Resources/subscriptions/templates/bicep/ServiceHealthAdvisory_7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.bicep b/services/Resources/subscriptions/templates/bicep/ServiceHealthAdvisory_7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.bicep
index 8f0bf3328..1c0a1a3b3 100644
--- a/services/Resources/subscriptions/templates/bicep/ServiceHealthAdvisory_7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.bicep
+++ b/services/Resources/subscriptions/templates/bicep/ServiceHealthAdvisory_7b56e46e-8fbf-404d-a1e5-fbb3d9ea8d7e.bicep
@@ -48,7 +48,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Resources/subscriptions/templates/bicep/ServiceHealthIncident_f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.bicep b/services/Resources/subscriptions/templates/bicep/ServiceHealthIncident_f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.bicep
index 25b383411..ba70bf9da 100644
--- a/services/Resources/subscriptions/templates/bicep/ServiceHealthIncident_f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.bicep
+++ b/services/Resources/subscriptions/templates/bicep/ServiceHealthIncident_f0dfdd7b-8e50-4a96-ba7f-9a58280f0df0.bicep
@@ -48,7 +48,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Resources/subscriptions/templates/bicep/ServiceHealthMaintenance_26a33edf-0698-424d-aae2-6bcd5af323d5.bicep b/services/Resources/subscriptions/templates/bicep/ServiceHealthMaintenance_26a33edf-0698-424d-aae2-6bcd5af323d5.bicep
index 39aac2d44..e38e97b0d 100644
--- a/services/Resources/subscriptions/templates/bicep/ServiceHealthMaintenance_26a33edf-0698-424d-aae2-6bcd5af323d5.bicep
+++ b/services/Resources/subscriptions/templates/bicep/ServiceHealthMaintenance_26a33edf-0698-424d-aae2-6bcd5af323d5.bicep
@@ -48,7 +48,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Resources/subscriptions/templates/bicep/ServiceHealthSecurity_89dbd4e4-f709-47c6-a243-4207678c8473.bicep b/services/Resources/subscriptions/templates/bicep/ServiceHealthSecurity_89dbd4e4-f709-47c6-a243-4207678c8473.bicep
index dba58288d..2511ad24e 100644
--- a/services/Resources/subscriptions/templates/bicep/ServiceHealthSecurity_89dbd4e4-f709-47c6-a243-4207678c8473.bicep
+++ b/services/Resources/subscriptions/templates/bicep/ServiceHealthSecurity_89dbd4e4-f709-47c6-a243-4207678c8473.bicep
@@ -48,7 +48,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Search/searchServices/templates/arm/ActivityLogSearchServiceDelete_5611eb31-51c7-4279-ab8c-97dba0a2c044.json b/services/Search/searchServices/templates/arm/ActivityLogSearchServiceDelete_5611eb31-51c7-4279-ab8c-97dba0a2c044.json
index 1a057c27b..281cf15cc 100644
--- a/services/Search/searchServices/templates/arm/ActivityLogSearchServiceDelete_5611eb31-51c7-4279-ab8c-97dba0a2c044.json
+++ b/services/Search/searchServices/templates/arm/ActivityLogSearchServiceDelete_5611eb31-51c7-4279-ab8c-97dba0a2c044.json
@@ -79,7 +79,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Search/searchServices/templates/arm/SearchLatency_d3985fe5-c7f0-47a1-b52e-26098345a433.json b/services/Search/searchServices/templates/arm/SearchLatency_d3985fe5-c7f0-47a1-b52e-26098345a433.json
index 53f3f9053..c1bf67700 100644
--- a/services/Search/searchServices/templates/arm/SearchLatency_d3985fe5-c7f0-47a1-b52e-26098345a433.json
+++ b/services/Search/searchServices/templates/arm/SearchLatency_d3985fe5-c7f0-47a1-b52e-26098345a433.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Search/searchServices/templates/arm/ThrottledSearchQueriesPercentage_7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.json b/services/Search/searchServices/templates/arm/ThrottledSearchQueriesPercentage_7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.json
index e43ec52fb..ad692800b 100644
--- a/services/Search/searchServices/templates/arm/ThrottledSearchQueriesPercentage_7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.json
+++ b/services/Search/searchServices/templates/arm/ThrottledSearchQueriesPercentage_7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Search/searchServices/templates/bicep/ActivityLogSearchServiceDelete_5611eb31-51c7-4279-ab8c-97dba0a2c044.bicep b/services/Search/searchServices/templates/bicep/ActivityLogSearchServiceDelete_5611eb31-51c7-4279-ab8c-97dba0a2c044.bicep
index e9da93e1e..43659d55d 100644
--- a/services/Search/searchServices/templates/bicep/ActivityLogSearchServiceDelete_5611eb31-51c7-4279-ab8c-97dba0a2c044.bicep
+++ b/services/Search/searchServices/templates/bicep/ActivityLogSearchServiceDelete_5611eb31-51c7-4279-ab8c-97dba0a2c044.bicep
@@ -52,7 +52,7 @@ resource symbolicname 'Microsoft.Insights/activityLogAlerts@2023-01-01-preview'
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Search/searchServices/templates/bicep/SearchLatency_d3985fe5-c7f0-47a1-b52e-26098345a433.bicep b/services/Search/searchServices/templates/bicep/SearchLatency_d3985fe5-c7f0-47a1-b52e-26098345a433.bicep
index 12e89ff8a..0fa4106ee 100644
--- a/services/Search/searchServices/templates/bicep/SearchLatency_d3985fe5-c7f0-47a1-b52e-26098345a433.bicep
+++ b/services/Search/searchServices/templates/bicep/SearchLatency_d3985fe5-c7f0-47a1-b52e-26098345a433.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Search/searchServices/templates/bicep/ThrottledSearchQueriesPercentage_7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.bicep b/services/Search/searchServices/templates/bicep/ThrottledSearchQueriesPercentage_7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.bicep
index 0a04dba61..18b957b2b 100644
--- a/services/Search/searchServices/templates/bicep/ThrottledSearchQueriesPercentage_7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.bicep
+++ b/services/Search/searchServices/templates/bicep/ThrottledSearchQueriesPercentage_7a044f2f-f38f-4f13-82eb-c7f49bf17ad0.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/arm/AbandonMessage_172396a9-27f0-4c01-9510-94ba4a0d4738.json b/services/ServiceBus/namespaces/templates/arm/AbandonMessage_172396a9-27f0-4c01-9510-94ba4a0d4738.json
index 0cbe97153..622a30160 100644
--- a/services/ServiceBus/namespaces/templates/arm/AbandonMessage_172396a9-27f0-4c01-9510-94ba4a0d4738.json
+++ b/services/ServiceBus/namespaces/templates/arm/AbandonMessage_172396a9-27f0-4c01-9510-94ba4a0d4738.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/ActiveConnections_784a29e7-5799-4fde-90ee-b6ebcb2a8747.json b/services/ServiceBus/namespaces/templates/arm/ActiveConnections_784a29e7-5799-4fde-90ee-b6ebcb2a8747.json
index 79ac3c627..c7b5b7f5c 100644
--- a/services/ServiceBus/namespaces/templates/arm/ActiveConnections_784a29e7-5799-4fde-90ee-b6ebcb2a8747.json
+++ b/services/ServiceBus/namespaces/templates/arm/ActiveConnections_784a29e7-5799-4fde-90ee-b6ebcb2a8747.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/ActiveMessages_0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.json b/services/ServiceBus/namespaces/templates/arm/ActiveMessages_0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.json
index e4142bba5..7111ed28e 100644
--- a/services/ServiceBus/namespaces/templates/arm/ActiveMessages_0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.json
+++ b/services/ServiceBus/namespaces/templates/arm/ActiveMessages_0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/DeadletteredMessages_868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.json b/services/ServiceBus/namespaces/templates/arm/DeadletteredMessages_868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.json
index 9a5e82483..f1439d7bc 100644
--- a/services/ServiceBus/namespaces/templates/arm/DeadletteredMessages_868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.json
+++ b/services/ServiceBus/namespaces/templates/arm/DeadletteredMessages_868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/IncomingMessages_c1095936-da8d-4c63-ac70-cf97d5b1f630.json b/services/ServiceBus/namespaces/templates/arm/IncomingMessages_c1095936-da8d-4c63-ac70-cf97d5b1f630.json
index 77e0f6e9b..f80dc72cf 100644
--- a/services/ServiceBus/namespaces/templates/arm/IncomingMessages_c1095936-da8d-4c63-ac70-cf97d5b1f630.json
+++ b/services/ServiceBus/namespaces/templates/arm/IncomingMessages_c1095936-da8d-4c63-ac70-cf97d5b1f630.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/Messages_67872571-d13d-4123-81c5-60404c4eea45.json b/services/ServiceBus/namespaces/templates/arm/Messages_67872571-d13d-4123-81c5-60404c4eea45.json
index 6206cc946..991720193 100644
--- a/services/ServiceBus/namespaces/templates/arm/Messages_67872571-d13d-4123-81c5-60404c4eea45.json
+++ b/services/ServiceBus/namespaces/templates/arm/Messages_67872571-d13d-4123-81c5-60404c4eea45.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/NamespaceCpuUsage_52ec94f5-0d89-434b-9d51-df92d69ba284.json b/services/ServiceBus/namespaces/templates/arm/NamespaceCpuUsage_52ec94f5-0d89-434b-9d51-df92d69ba284.json
index 06a7c4804..8417a0dfd 100644
--- a/services/ServiceBus/namespaces/templates/arm/NamespaceCpuUsage_52ec94f5-0d89-434b-9d51-df92d69ba284.json
+++ b/services/ServiceBus/namespaces/templates/arm/NamespaceCpuUsage_52ec94f5-0d89-434b-9d51-df92d69ba284.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/NamespaceMemoryUsage_860d21ea-8c6a-4c78-ac40-f556eb02c3ac.json b/services/ServiceBus/namespaces/templates/arm/NamespaceMemoryUsage_860d21ea-8c6a-4c78-ac40-f556eb02c3ac.json
index 688bb2807..4237098db 100644
--- a/services/ServiceBus/namespaces/templates/arm/NamespaceMemoryUsage_860d21ea-8c6a-4c78-ac40-f556eb02c3ac.json
+++ b/services/ServiceBus/namespaces/templates/arm/NamespaceMemoryUsage_860d21ea-8c6a-4c78-ac40-f556eb02c3ac.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/OutgoingMessages_fdde6805-edf8-4277-adb8-ad2f44e3f977.json b/services/ServiceBus/namespaces/templates/arm/OutgoingMessages_fdde6805-edf8-4277-adb8-ad2f44e3f977.json
index 486b5288a..4458893e1 100644
--- a/services/ServiceBus/namespaces/templates/arm/OutgoingMessages_fdde6805-edf8-4277-adb8-ad2f44e3f977.json
+++ b/services/ServiceBus/namespaces/templates/arm/OutgoingMessages_fdde6805-edf8-4277-adb8-ad2f44e3f977.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/ScheduledMessages_5543b815-f2c8-420e-847e-7507a9724557.json b/services/ServiceBus/namespaces/templates/arm/ScheduledMessages_5543b815-f2c8-420e-847e-7507a9724557.json
index 4f2c580fb..200ddc0e7 100644
--- a/services/ServiceBus/namespaces/templates/arm/ScheduledMessages_5543b815-f2c8-420e-847e-7507a9724557.json
+++ b/services/ServiceBus/namespaces/templates/arm/ScheduledMessages_5543b815-f2c8-420e-847e-7507a9724557.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/ServerErrors_c51c3514-1730-42f3-b8ae-f2980bd22d83.json b/services/ServiceBus/namespaces/templates/arm/ServerErrors_c51c3514-1730-42f3-b8ae-f2980bd22d83.json
index ec5bcdb98..2e3aaf657 100644
--- a/services/ServiceBus/namespaces/templates/arm/ServerErrors_c51c3514-1730-42f3-b8ae-f2980bd22d83.json
+++ b/services/ServiceBus/namespaces/templates/arm/ServerErrors_c51c3514-1730-42f3-b8ae-f2980bd22d83.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/ServerSendLatency_487c6beb-1468-4167-8eb6-e9b3ad8743b1.json b/services/ServiceBus/namespaces/templates/arm/ServerSendLatency_487c6beb-1468-4167-8eb6-e9b3ad8743b1.json
index fc7aed177..dab257046 100644
--- a/services/ServiceBus/namespaces/templates/arm/ServerSendLatency_487c6beb-1468-4167-8eb6-e9b3ad8743b1.json
+++ b/services/ServiceBus/namespaces/templates/arm/ServerSendLatency_487c6beb-1468-4167-8eb6-e9b3ad8743b1.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/Size_950586ee-6926-4483-96d4-82838afe1ca6.json b/services/ServiceBus/namespaces/templates/arm/Size_950586ee-6926-4483-96d4-82838afe1ca6.json
index 7c402b532..11f98ee79 100644
--- a/services/ServiceBus/namespaces/templates/arm/Size_950586ee-6926-4483-96d4-82838afe1ca6.json
+++ b/services/ServiceBus/namespaces/templates/arm/Size_950586ee-6926-4483-96d4-82838afe1ca6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/ThrottledRequests_19785707-24c9-4852-b92a-31732b86ee04.json b/services/ServiceBus/namespaces/templates/arm/ThrottledRequests_19785707-24c9-4852-b92a-31732b86ee04.json
index 9eded32ad..c08a6de97 100644
--- a/services/ServiceBus/namespaces/templates/arm/ThrottledRequests_19785707-24c9-4852-b92a-31732b86ee04.json
+++ b/services/ServiceBus/namespaces/templates/arm/ThrottledRequests_19785707-24c9-4852-b92a-31732b86ee04.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/arm/UserErrors_a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.json b/services/ServiceBus/namespaces/templates/arm/UserErrors_a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.json
index d311e5e1d..b64ce41ed 100644
--- a/services/ServiceBus/namespaces/templates/arm/UserErrors_a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.json
+++ b/services/ServiceBus/namespaces/templates/arm/UserErrors_a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/ServiceBus/namespaces/templates/bicep/AbandonMessage_172396a9-27f0-4c01-9510-94ba4a0d4738.bicep b/services/ServiceBus/namespaces/templates/bicep/AbandonMessage_172396a9-27f0-4c01-9510-94ba4a0d4738.bicep
index c0370ff20..e4065f801 100644
--- a/services/ServiceBus/namespaces/templates/bicep/AbandonMessage_172396a9-27f0-4c01-9510-94ba4a0d4738.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/AbandonMessage_172396a9-27f0-4c01-9510-94ba4a0d4738.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/ActiveConnections_784a29e7-5799-4fde-90ee-b6ebcb2a8747.bicep b/services/ServiceBus/namespaces/templates/bicep/ActiveConnections_784a29e7-5799-4fde-90ee-b6ebcb2a8747.bicep
index cba9fffab..6e6bfeca0 100644
--- a/services/ServiceBus/namespaces/templates/bicep/ActiveConnections_784a29e7-5799-4fde-90ee-b6ebcb2a8747.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/ActiveConnections_784a29e7-5799-4fde-90ee-b6ebcb2a8747.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/ActiveMessages_0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.bicep b/services/ServiceBus/namespaces/templates/bicep/ActiveMessages_0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.bicep
index 66a1a8a84..89aa60fdb 100644
--- a/services/ServiceBus/namespaces/templates/bicep/ActiveMessages_0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/ActiveMessages_0b3362f7-b1ff-4d78-8c25-f14ee9300ae1.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/DeadletteredMessages_868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.bicep b/services/ServiceBus/namespaces/templates/bicep/DeadletteredMessages_868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.bicep
index 298cfa6cd..4ac3a9d28 100644
--- a/services/ServiceBus/namespaces/templates/bicep/DeadletteredMessages_868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/DeadletteredMessages_868a7fc3-9c5c-4fb4-9289-fbe10dd4db82.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/IncomingMessages_c1095936-da8d-4c63-ac70-cf97d5b1f630.bicep b/services/ServiceBus/namespaces/templates/bicep/IncomingMessages_c1095936-da8d-4c63-ac70-cf97d5b1f630.bicep
index 743761175..f08e948ef 100644
--- a/services/ServiceBus/namespaces/templates/bicep/IncomingMessages_c1095936-da8d-4c63-ac70-cf97d5b1f630.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/IncomingMessages_c1095936-da8d-4c63-ac70-cf97d5b1f630.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/Messages_67872571-d13d-4123-81c5-60404c4eea45.bicep b/services/ServiceBus/namespaces/templates/bicep/Messages_67872571-d13d-4123-81c5-60404c4eea45.bicep
index daa0d6021..4d381697b 100644
--- a/services/ServiceBus/namespaces/templates/bicep/Messages_67872571-d13d-4123-81c5-60404c4eea45.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/Messages_67872571-d13d-4123-81c5-60404c4eea45.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/NamespaceCpuUsage_52ec94f5-0d89-434b-9d51-df92d69ba284.bicep b/services/ServiceBus/namespaces/templates/bicep/NamespaceCpuUsage_52ec94f5-0d89-434b-9d51-df92d69ba284.bicep
index f9cfb017f..03ac984da 100644
--- a/services/ServiceBus/namespaces/templates/bicep/NamespaceCpuUsage_52ec94f5-0d89-434b-9d51-df92d69ba284.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/NamespaceCpuUsage_52ec94f5-0d89-434b-9d51-df92d69ba284.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/NamespaceMemoryUsage_860d21ea-8c6a-4c78-ac40-f556eb02c3ac.bicep b/services/ServiceBus/namespaces/templates/bicep/NamespaceMemoryUsage_860d21ea-8c6a-4c78-ac40-f556eb02c3ac.bicep
index a88faff00..80b6f9418 100644
--- a/services/ServiceBus/namespaces/templates/bicep/NamespaceMemoryUsage_860d21ea-8c6a-4c78-ac40-f556eb02c3ac.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/NamespaceMemoryUsage_860d21ea-8c6a-4c78-ac40-f556eb02c3ac.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/OutgoingMessages_fdde6805-edf8-4277-adb8-ad2f44e3f977.bicep b/services/ServiceBus/namespaces/templates/bicep/OutgoingMessages_fdde6805-edf8-4277-adb8-ad2f44e3f977.bicep
index efd98572d..35ab17d0d 100644
--- a/services/ServiceBus/namespaces/templates/bicep/OutgoingMessages_fdde6805-edf8-4277-adb8-ad2f44e3f977.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/OutgoingMessages_fdde6805-edf8-4277-adb8-ad2f44e3f977.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/ScheduledMessages_5543b815-f2c8-420e-847e-7507a9724557.bicep b/services/ServiceBus/namespaces/templates/bicep/ScheduledMessages_5543b815-f2c8-420e-847e-7507a9724557.bicep
index 7c73e4128..ab0ddb5f7 100644
--- a/services/ServiceBus/namespaces/templates/bicep/ScheduledMessages_5543b815-f2c8-420e-847e-7507a9724557.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/ScheduledMessages_5543b815-f2c8-420e-847e-7507a9724557.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/ServerErrors_c51c3514-1730-42f3-b8ae-f2980bd22d83.bicep b/services/ServiceBus/namespaces/templates/bicep/ServerErrors_c51c3514-1730-42f3-b8ae-f2980bd22d83.bicep
index f1020b25a..ebe09add1 100644
--- a/services/ServiceBus/namespaces/templates/bicep/ServerErrors_c51c3514-1730-42f3-b8ae-f2980bd22d83.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/ServerErrors_c51c3514-1730-42f3-b8ae-f2980bd22d83.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/ServerSendLatency_487c6beb-1468-4167-8eb6-e9b3ad8743b1.bicep b/services/ServiceBus/namespaces/templates/bicep/ServerSendLatency_487c6beb-1468-4167-8eb6-e9b3ad8743b1.bicep
index 6956ba9f6..d0a3834c7 100644
--- a/services/ServiceBus/namespaces/templates/bicep/ServerSendLatency_487c6beb-1468-4167-8eb6-e9b3ad8743b1.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/ServerSendLatency_487c6beb-1468-4167-8eb6-e9b3ad8743b1.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/Size_950586ee-6926-4483-96d4-82838afe1ca6.bicep b/services/ServiceBus/namespaces/templates/bicep/Size_950586ee-6926-4483-96d4-82838afe1ca6.bicep
index ceeadee5c..c6c51248f 100644
--- a/services/ServiceBus/namespaces/templates/bicep/Size_950586ee-6926-4483-96d4-82838afe1ca6.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/Size_950586ee-6926-4483-96d4-82838afe1ca6.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/ThrottledRequests_19785707-24c9-4852-b92a-31732b86ee04.bicep b/services/ServiceBus/namespaces/templates/bicep/ThrottledRequests_19785707-24c9-4852-b92a-31732b86ee04.bicep
index 8efeab64c..8850a5b16 100644
--- a/services/ServiceBus/namespaces/templates/bicep/ThrottledRequests_19785707-24c9-4852-b92a-31732b86ee04.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/ThrottledRequests_19785707-24c9-4852-b92a-31732b86ee04.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/ServiceBus/namespaces/templates/bicep/UserErrors_a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.bicep b/services/ServiceBus/namespaces/templates/bicep/UserErrors_a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.bicep
index 478463c9c..e899ba627 100644
--- a/services/ServiceBus/namespaces/templates/bicep/UserErrors_a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.bicep
+++ b/services/ServiceBus/namespaces/templates/bicep/UserErrors_a57a1cc4-4ec9-4d8f-a81d-7e18afe54948.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/SignalRService/SignalR/templates/arm/ConnectionCount_b7581df7-f127-405e-9408-9d484122be74.json b/services/SignalRService/SignalR/templates/arm/ConnectionCount_b7581df7-f127-405e-9408-9d484122be74.json
index dc41e37f4..f64d947c4 100644
--- a/services/SignalRService/SignalR/templates/arm/ConnectionCount_b7581df7-f127-405e-9408-9d484122be74.json
+++ b/services/SignalRService/SignalR/templates/arm/ConnectionCount_b7581df7-f127-405e-9408-9d484122be74.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/SignalRService/SignalR/templates/bicep/ConnectionCount_b7581df7-f127-405e-9408-9d484122be74.bicep b/services/SignalRService/SignalR/templates/bicep/ConnectionCount_b7581df7-f127-405e-9408-9d484122be74.bicep
index 7a67aeaf2..ea274f66d 100644
--- a/services/SignalRService/SignalR/templates/bicep/ConnectionCount_b7581df7-f127-405e-9408-9d484122be74.bicep
+++ b/services/SignalRService/SignalR/templates/bicep/ConnectionCount_b7581df7-f127-405e-9408-9d484122be74.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/managedInstances/templates/arm/avgcpupercent_dfd37715-0d5c-4ec5-98ae-836cd626a27f.json b/services/Sql/managedInstances/templates/arm/avgcpupercent_dfd37715-0d5c-4ec5-98ae-836cd626a27f.json
index ff10c9b7f..e2567e5a4 100644
--- a/services/Sql/managedInstances/templates/arm/avgcpupercent_dfd37715-0d5c-4ec5-98ae-836cd626a27f.json
+++ b/services/Sql/managedInstances/templates/arm/avgcpupercent_dfd37715-0d5c-4ec5-98ae-836cd626a27f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/managedInstances/templates/arm/storagespaceusedmb_641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.json b/services/Sql/managedInstances/templates/arm/storagespaceusedmb_641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.json
index 6ce795c27..a1e0714c7 100644
--- a/services/Sql/managedInstances/templates/arm/storagespaceusedmb_641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.json
+++ b/services/Sql/managedInstances/templates/arm/storagespaceusedmb_641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/managedInstances/templates/bicep/avgcpupercent_dfd37715-0d5c-4ec5-98ae-836cd626a27f.bicep b/services/Sql/managedInstances/templates/bicep/avgcpupercent_dfd37715-0d5c-4ec5-98ae-836cd626a27f.bicep
index d942ae311..d46f96911 100644
--- a/services/Sql/managedInstances/templates/bicep/avgcpupercent_dfd37715-0d5c-4ec5-98ae-836cd626a27f.bicep
+++ b/services/Sql/managedInstances/templates/bicep/avgcpupercent_dfd37715-0d5c-4ec5-98ae-836cd626a27f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/managedInstances/templates/bicep/storagespaceusedmb_641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.bicep b/services/Sql/managedInstances/templates/bicep/storagespaceusedmb_641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.bicep
index 4b9dce537..c5465a10c 100644
--- a/services/Sql/managedInstances/templates/bicep/storagespaceusedmb_641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.bicep
+++ b/services/Sql/managedInstances/templates/bicep/storagespaceusedmb_641ca3dc-a00f-43ac-b6bd-4f5d16f35cac.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/arm/databases-appcpupercent_05591510-5fe2-454a-96d8-bbda8201c6a4.json b/services/Sql/servers/templates/arm/databases-appcpupercent_05591510-5fe2-454a-96d8-bbda8201c6a4.json
index 5cd0f6075..19b92b537 100644
--- a/services/Sql/servers/templates/arm/databases-appcpupercent_05591510-5fe2-454a-96d8-bbda8201c6a4.json
+++ b/services/Sql/servers/templates/arm/databases-appcpupercent_05591510-5fe2-454a-96d8-bbda8201c6a4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-appmemorypercent_c5c95fe9-a4b4-4afa-a07a-a0d18804d416.json b/services/Sql/servers/templates/arm/databases-appmemorypercent_c5c95fe9-a4b4-4afa-a07a-a0d18804d416.json
index 72efc401a..22e386693 100644
--- a/services/Sql/servers/templates/arm/databases-appmemorypercent_c5c95fe9-a4b4-4afa-a07a-a0d18804d416.json
+++ b/services/Sql/servers/templates/arm/databases-appmemorypercent_c5c95fe9-a4b4-4afa-a07a-a0d18804d416.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-blockedbyfirewall_2cda2f3a-8657-431a-a50f-56835aea9a81.json b/services/Sql/servers/templates/arm/databases-blockedbyfirewall_2cda2f3a-8657-431a-a50f-56835aea9a81.json
index d73f91d56..68a2e3302 100644
--- a/services/Sql/servers/templates/arm/databases-blockedbyfirewall_2cda2f3a-8657-431a-a50f-56835aea9a81.json
+++ b/services/Sql/servers/templates/arm/databases-blockedbyfirewall_2cda2f3a-8657-431a-a50f-56835aea9a81.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-connectionfailed_7157dc17-9d5a-4835-a122-1d0d904d61ff.json b/services/Sql/servers/templates/arm/databases-connectionfailed_7157dc17-9d5a-4835-a122-1d0d904d61ff.json
index fe8287642..ccf62aead 100644
--- a/services/Sql/servers/templates/arm/databases-connectionfailed_7157dc17-9d5a-4835-a122-1d0d904d61ff.json
+++ b/services/Sql/servers/templates/arm/databases-connectionfailed_7157dc17-9d5a-4835-a122-1d0d904d61ff.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-connectionfailedusererror_d528ffcb-3a99-4356-96d1-981499139ffb.json b/services/Sql/servers/templates/arm/databases-connectionfailedusererror_d528ffcb-3a99-4356-96d1-981499139ffb.json
index 4d67e96be..69d5efdc1 100644
--- a/services/Sql/servers/templates/arm/databases-connectionfailedusererror_d528ffcb-3a99-4356-96d1-981499139ffb.json
+++ b/services/Sql/servers/templates/arm/databases-connectionfailedusererror_d528ffcb-3a99-4356-96d1-981499139ffb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-connectionsuccessful_460b6b29-a602-4409-b748-6b47b232a984.json b/services/Sql/servers/templates/arm/databases-connectionsuccessful_460b6b29-a602-4409-b748-6b47b232a984.json
index 7e444ed33..f742d3b2e 100644
--- a/services/Sql/servers/templates/arm/databases-connectionsuccessful_460b6b29-a602-4409-b748-6b47b232a984.json
+++ b/services/Sql/servers/templates/arm/databases-connectionsuccessful_460b6b29-a602-4409-b748-6b47b232a984.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-cpuused_3ddd3f95-989c-4777-b6b8-728439aae1df.json b/services/Sql/servers/templates/arm/databases-cpuused_3ddd3f95-989c-4777-b6b8-728439aae1df.json
index 00ba0cc4f..2cea8e84a 100644
--- a/services/Sql/servers/templates/arm/databases-cpuused_3ddd3f95-989c-4777-b6b8-728439aae1df.json
+++ b/services/Sql/servers/templates/arm/databases-cpuused_3ddd3f95-989c-4777-b6b8-728439aae1df.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-deadlock_ce44fc81-3610-4165-a107-9dd4b8ab3972.json b/services/Sql/servers/templates/arm/databases-deadlock_ce44fc81-3610-4165-a107-9dd4b8ab3972.json
index 8f91fa056..5bc673031 100644
--- a/services/Sql/servers/templates/arm/databases-deadlock_ce44fc81-3610-4165-a107-9dd4b8ab3972.json
+++ b/services/Sql/servers/templates/arm/databases-deadlock_ce44fc81-3610-4165-a107-9dd4b8ab3972.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-dtulimit_50124594-a291-4183-a8e3-195f5e6f5204.json b/services/Sql/servers/templates/arm/databases-dtulimit_50124594-a291-4183-a8e3-195f5e6f5204.json
index e65aa8d5b..702493c68 100644
--- a/services/Sql/servers/templates/arm/databases-dtulimit_50124594-a291-4183-a8e3-195f5e6f5204.json
+++ b/services/Sql/servers/templates/arm/databases-dtulimit_50124594-a291-4183-a8e3-195f5e6f5204.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-dtuused_d26f4c8b-0461-4c57-b230-cbd1a5424db1.json b/services/Sql/servers/templates/arm/databases-dtuused_d26f4c8b-0461-4c57-b230-cbd1a5424db1.json
index 31a119b4f..a117a879f 100644
--- a/services/Sql/servers/templates/arm/databases-dtuused_d26f4c8b-0461-4c57-b230-cbd1a5424db1.json
+++ b/services/Sql/servers/templates/arm/databases-dtuused_d26f4c8b-0461-4c57-b230-cbd1a5424db1.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-dwuconsumptionpercent_70f88865-7a8b-4e03-9252-a9369df503ef.json b/services/Sql/servers/templates/arm/databases-dwuconsumptionpercent_70f88865-7a8b-4e03-9252-a9369df503ef.json
index fc87896fa..32f524f9e 100644
--- a/services/Sql/servers/templates/arm/databases-dwuconsumptionpercent_70f88865-7a8b-4e03-9252-a9369df503ef.json
+++ b/services/Sql/servers/templates/arm/databases-dwuconsumptionpercent_70f88865-7a8b-4e03-9252-a9369df503ef.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-memoryusagepercent_f5c13b49-8528-457d-9d7d-083b8433bf96.json b/services/Sql/servers/templates/arm/databases-memoryusagepercent_f5c13b49-8528-457d-9d7d-083b8433bf96.json
index 3ee1a3d30..a15d2850e 100644
--- a/services/Sql/servers/templates/arm/databases-memoryusagepercent_f5c13b49-8528-457d-9d7d-083b8433bf96.json
+++ b/services/Sql/servers/templates/arm/databases-memoryusagepercent_f5c13b49-8528-457d-9d7d-083b8433bf96.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-sessionscount_07eeae07-010e-47ca-ad90-fa7adb5a6c52.json b/services/Sql/servers/templates/arm/databases-sessionscount_07eeae07-010e-47ca-ad90-fa7adb5a6c52.json
index 030be4dd8..19e168086 100644
--- a/services/Sql/servers/templates/arm/databases-sessionscount_07eeae07-010e-47ca-ad90-fa7adb5a6c52.json
+++ b/services/Sql/servers/templates/arm/databases-sessionscount_07eeae07-010e-47ca-ad90-fa7adb5a6c52.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-sqlinstancecpupercent_1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.json b/services/Sql/servers/templates/arm/databases-sqlinstancecpupercent_1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.json
index e1b48a573..554e1bc2b 100644
--- a/services/Sql/servers/templates/arm/databases-sqlinstancecpupercent_1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.json
+++ b/services/Sql/servers/templates/arm/databases-sqlinstancecpupercent_1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-sqlinstancememorypercent_f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.json b/services/Sql/servers/templates/arm/databases-sqlinstancememorypercent_f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.json
index 49bfcfa43..71ba30617 100644
--- a/services/Sql/servers/templates/arm/databases-sqlinstancememorypercent_f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.json
+++ b/services/Sql/servers/templates/arm/databases-sqlinstancememorypercent_f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-storage_86922a27-41bb-4834-bc54-0b602b275597.json b/services/Sql/servers/templates/arm/databases-storage_86922a27-41bb-4834-bc54-0b602b275597.json
index 085a8e123..ca29e988a 100644
--- a/services/Sql/servers/templates/arm/databases-storage_86922a27-41bb-4834-bc54-0b602b275597.json
+++ b/services/Sql/servers/templates/arm/databases-storage_86922a27-41bb-4834-bc54-0b602b275597.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/databases-tempdbdatasize_0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.json b/services/Sql/servers/templates/arm/databases-tempdbdatasize_0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.json
index 8bb98d752..9ad4dc46d 100644
--- a/services/Sql/servers/templates/arm/databases-tempdbdatasize_0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.json
+++ b/services/Sql/servers/templates/arm/databases-tempdbdatasize_0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-allocateddatastorage_3743016a-a056-43fe-b53a-36dd9a17626d.json b/services/Sql/servers/templates/arm/elasticpools-allocateddatastorage_3743016a-a056-43fe-b53a-36dd9a17626d.json
index 12f827c1e..2a8840175 100644
--- a/services/Sql/servers/templates/arm/elasticpools-allocateddatastorage_3743016a-a056-43fe-b53a-36dd9a17626d.json
+++ b/services/Sql/servers/templates/arm/elasticpools-allocateddatastorage_3743016a-a056-43fe-b53a-36dd9a17626d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-allocateddatastoragepercent_7e9d0710-3243-4cf2-8b73-6be1539b8545.json b/services/Sql/servers/templates/arm/elasticpools-allocateddatastoragepercent_7e9d0710-3243-4cf2-8b73-6be1539b8545.json
index bf409677b..2dff73704 100644
--- a/services/Sql/servers/templates/arm/elasticpools-allocateddatastoragepercent_7e9d0710-3243-4cf2-8b73-6be1539b8545.json
+++ b/services/Sql/servers/templates/arm/elasticpools-allocateddatastoragepercent_7e9d0710-3243-4cf2-8b73-6be1539b8545.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-cpupercent_805c4ae5-a852-43bd-ad1c-0f7f381d8f32.json b/services/Sql/servers/templates/arm/elasticpools-cpupercent_805c4ae5-a852-43bd-ad1c-0f7f381d8f32.json
index 5c041742b..55fc5e391 100644
--- a/services/Sql/servers/templates/arm/elasticpools-cpupercent_805c4ae5-a852-43bd-ad1c-0f7f381d8f32.json
+++ b/services/Sql/servers/templates/arm/elasticpools-cpupercent_805c4ae5-a852-43bd-ad1c-0f7f381d8f32.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-dtuconsumptionpercent_5d9075b5-3c19-4cf6-9c2e-50ba4c175691.json b/services/Sql/servers/templates/arm/elasticpools-dtuconsumptionpercent_5d9075b5-3c19-4cf6-9c2e-50ba4c175691.json
index b0911e48b..0f9bcbc52 100644
--- a/services/Sql/servers/templates/arm/elasticpools-dtuconsumptionpercent_5d9075b5-3c19-4cf6-9c2e-50ba4c175691.json
+++ b/services/Sql/servers/templates/arm/elasticpools-dtuconsumptionpercent_5d9075b5-3c19-4cf6-9c2e-50ba4c175691.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-eDTUused_16a64053-1905-4d8e-8198-810584cad108.json b/services/Sql/servers/templates/arm/elasticpools-eDTUused_16a64053-1905-4d8e-8198-810584cad108.json
index 6c8f6cfbf..aafdc294a 100644
--- a/services/Sql/servers/templates/arm/elasticpools-eDTUused_16a64053-1905-4d8e-8198-810584cad108.json
+++ b/services/Sql/servers/templates/arm/elasticpools-eDTUused_16a64053-1905-4d8e-8198-810584cad108.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-logwritepercent_47cd814e-1991-437e-8feb-e589a250d2a3.json b/services/Sql/servers/templates/arm/elasticpools-logwritepercent_47cd814e-1991-437e-8feb-e589a250d2a3.json
index 16ede7623..713e285ce 100644
--- a/services/Sql/servers/templates/arm/elasticpools-logwritepercent_47cd814e-1991-437e-8feb-e589a250d2a3.json
+++ b/services/Sql/servers/templates/arm/elasticpools-logwritepercent_47cd814e-1991-437e-8feb-e589a250d2a3.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-physicaldatareadpercent_92efc2ea-b6ed-41aa-921c-6d40e7b58c27.json b/services/Sql/servers/templates/arm/elasticpools-physicaldatareadpercent_92efc2ea-b6ed-41aa-921c-6d40e7b58c27.json
index 2ac105677..872b592e9 100644
--- a/services/Sql/servers/templates/arm/elasticpools-physicaldatareadpercent_92efc2ea-b6ed-41aa-921c-6d40e7b58c27.json
+++ b/services/Sql/servers/templates/arm/elasticpools-physicaldatareadpercent_92efc2ea-b6ed-41aa-921c-6d40e7b58c27.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-sessionspercent_6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.json b/services/Sql/servers/templates/arm/elasticpools-sessionspercent_6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.json
index f0cc02928..86d9b8228 100644
--- a/services/Sql/servers/templates/arm/elasticpools-sessionspercent_6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.json
+++ b/services/Sql/servers/templates/arm/elasticpools-sessionspercent_6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-sqlserverprocesscorepercent_73ec4301-872a-4bea-928e-420255aae8cb.json b/services/Sql/servers/templates/arm/elasticpools-sqlserverprocesscorepercent_73ec4301-872a-4bea-928e-420255aae8cb.json
index 1d2f90959..3460021f9 100644
--- a/services/Sql/servers/templates/arm/elasticpools-sqlserverprocesscorepercent_73ec4301-872a-4bea-928e-420255aae8cb.json
+++ b/services/Sql/servers/templates/arm/elasticpools-sqlserverprocesscorepercent_73ec4301-872a-4bea-928e-420255aae8cb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-sqlserverprocessmemorypercent_fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.json b/services/Sql/servers/templates/arm/elasticpools-sqlserverprocessmemorypercent_fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.json
index b5ef183c2..063ac43fa 100644
--- a/services/Sql/servers/templates/arm/elasticpools-sqlserverprocessmemorypercent_fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.json
+++ b/services/Sql/servers/templates/arm/elasticpools-sqlserverprocessmemorypercent_fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-storagepercent_88f3cbc0-bcfb-482f-b6f4-709a335afcad.json b/services/Sql/servers/templates/arm/elasticpools-storagepercent_88f3cbc0-bcfb-482f-b6f4-709a335afcad.json
index b6bbb734d..4779b1afe 100644
--- a/services/Sql/servers/templates/arm/elasticpools-storagepercent_88f3cbc0-bcfb-482f-b6f4-709a335afcad.json
+++ b/services/Sql/servers/templates/arm/elasticpools-storagepercent_88f3cbc0-bcfb-482f-b6f4-709a335afcad.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-tempdblogusedpercent_af66de51-079c-4d34-af92-f52f887642dc.json b/services/Sql/servers/templates/arm/elasticpools-tempdblogusedpercent_af66de51-079c-4d34-af92-f52f887642dc.json
index 29cfc6609..933c4a95e 100644
--- a/services/Sql/servers/templates/arm/elasticpools-tempdblogusedpercent_af66de51-079c-4d34-af92-f52f887642dc.json
+++ b/services/Sql/servers/templates/arm/elasticpools-tempdblogusedpercent_af66de51-079c-4d34-af92-f52f887642dc.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-workerspercent_1b37038e-6e5c-4463-97d4-8a632251d70e.json b/services/Sql/servers/templates/arm/elasticpools-workerspercent_1b37038e-6e5c-4463-97d4-8a632251d70e.json
index bf1bb42f6..13ff5a5e0 100644
--- a/services/Sql/servers/templates/arm/elasticpools-workerspercent_1b37038e-6e5c-4463-97d4-8a632251d70e.json
+++ b/services/Sql/servers/templates/arm/elasticpools-workerspercent_1b37038e-6e5c-4463-97d4-8a632251d70e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/arm/elasticpools-xtpstoragepercent_db517009-30ad-4cbc-b282-7f212052c3b4.json b/services/Sql/servers/templates/arm/elasticpools-xtpstoragepercent_db517009-30ad-4cbc-b282-7f212052c3b4.json
index 68ab0a9ae..4ee981bb1 100644
--- a/services/Sql/servers/templates/arm/elasticpools-xtpstoragepercent_db517009-30ad-4cbc-b282-7f212052c3b4.json
+++ b/services/Sql/servers/templates/arm/elasticpools-xtpstoragepercent_db517009-30ad-4cbc-b282-7f212052c3b4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Sql/servers/templates/bicep/databases-appcpupercent_05591510-5fe2-454a-96d8-bbda8201c6a4.bicep b/services/Sql/servers/templates/bicep/databases-appcpupercent_05591510-5fe2-454a-96d8-bbda8201c6a4.bicep
index 49ee776d8..6caadddc7 100644
--- a/services/Sql/servers/templates/bicep/databases-appcpupercent_05591510-5fe2-454a-96d8-bbda8201c6a4.bicep
+++ b/services/Sql/servers/templates/bicep/databases-appcpupercent_05591510-5fe2-454a-96d8-bbda8201c6a4.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-appmemorypercent_c5c95fe9-a4b4-4afa-a07a-a0d18804d416.bicep b/services/Sql/servers/templates/bicep/databases-appmemorypercent_c5c95fe9-a4b4-4afa-a07a-a0d18804d416.bicep
index 14490cedc..c16bcbe47 100644
--- a/services/Sql/servers/templates/bicep/databases-appmemorypercent_c5c95fe9-a4b4-4afa-a07a-a0d18804d416.bicep
+++ b/services/Sql/servers/templates/bicep/databases-appmemorypercent_c5c95fe9-a4b4-4afa-a07a-a0d18804d416.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-blockedbyfirewall_2cda2f3a-8657-431a-a50f-56835aea9a81.bicep b/services/Sql/servers/templates/bicep/databases-blockedbyfirewall_2cda2f3a-8657-431a-a50f-56835aea9a81.bicep
index 3d702d3a5..c0187d478 100644
--- a/services/Sql/servers/templates/bicep/databases-blockedbyfirewall_2cda2f3a-8657-431a-a50f-56835aea9a81.bicep
+++ b/services/Sql/servers/templates/bicep/databases-blockedbyfirewall_2cda2f3a-8657-431a-a50f-56835aea9a81.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-connectionfailed_7157dc17-9d5a-4835-a122-1d0d904d61ff.bicep b/services/Sql/servers/templates/bicep/databases-connectionfailed_7157dc17-9d5a-4835-a122-1d0d904d61ff.bicep
index bec1b0b18..ead81a2a1 100644
--- a/services/Sql/servers/templates/bicep/databases-connectionfailed_7157dc17-9d5a-4835-a122-1d0d904d61ff.bicep
+++ b/services/Sql/servers/templates/bicep/databases-connectionfailed_7157dc17-9d5a-4835-a122-1d0d904d61ff.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-connectionfailedusererror_d528ffcb-3a99-4356-96d1-981499139ffb.bicep b/services/Sql/servers/templates/bicep/databases-connectionfailedusererror_d528ffcb-3a99-4356-96d1-981499139ffb.bicep
index ba572297b..630a9a94a 100644
--- a/services/Sql/servers/templates/bicep/databases-connectionfailedusererror_d528ffcb-3a99-4356-96d1-981499139ffb.bicep
+++ b/services/Sql/servers/templates/bicep/databases-connectionfailedusererror_d528ffcb-3a99-4356-96d1-981499139ffb.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-connectionsuccessful_460b6b29-a602-4409-b748-6b47b232a984.bicep b/services/Sql/servers/templates/bicep/databases-connectionsuccessful_460b6b29-a602-4409-b748-6b47b232a984.bicep
index 26401274a..e26149fb1 100644
--- a/services/Sql/servers/templates/bicep/databases-connectionsuccessful_460b6b29-a602-4409-b748-6b47b232a984.bicep
+++ b/services/Sql/servers/templates/bicep/databases-connectionsuccessful_460b6b29-a602-4409-b748-6b47b232a984.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-cpuused_3ddd3f95-989c-4777-b6b8-728439aae1df.bicep b/services/Sql/servers/templates/bicep/databases-cpuused_3ddd3f95-989c-4777-b6b8-728439aae1df.bicep
index 5f51cefc0..02c4f73b9 100644
--- a/services/Sql/servers/templates/bicep/databases-cpuused_3ddd3f95-989c-4777-b6b8-728439aae1df.bicep
+++ b/services/Sql/servers/templates/bicep/databases-cpuused_3ddd3f95-989c-4777-b6b8-728439aae1df.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-deadlock_ce44fc81-3610-4165-a107-9dd4b8ab3972.bicep b/services/Sql/servers/templates/bicep/databases-deadlock_ce44fc81-3610-4165-a107-9dd4b8ab3972.bicep
index 90544b78a..c193448b7 100644
--- a/services/Sql/servers/templates/bicep/databases-deadlock_ce44fc81-3610-4165-a107-9dd4b8ab3972.bicep
+++ b/services/Sql/servers/templates/bicep/databases-deadlock_ce44fc81-3610-4165-a107-9dd4b8ab3972.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-dtulimit_50124594-a291-4183-a8e3-195f5e6f5204.bicep b/services/Sql/servers/templates/bicep/databases-dtulimit_50124594-a291-4183-a8e3-195f5e6f5204.bicep
index f761dcd7d..c61fa9056 100644
--- a/services/Sql/servers/templates/bicep/databases-dtulimit_50124594-a291-4183-a8e3-195f5e6f5204.bicep
+++ b/services/Sql/servers/templates/bicep/databases-dtulimit_50124594-a291-4183-a8e3-195f5e6f5204.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-dtuused_d26f4c8b-0461-4c57-b230-cbd1a5424db1.bicep b/services/Sql/servers/templates/bicep/databases-dtuused_d26f4c8b-0461-4c57-b230-cbd1a5424db1.bicep
index b6c2abba8..6363c431e 100644
--- a/services/Sql/servers/templates/bicep/databases-dtuused_d26f4c8b-0461-4c57-b230-cbd1a5424db1.bicep
+++ b/services/Sql/servers/templates/bicep/databases-dtuused_d26f4c8b-0461-4c57-b230-cbd1a5424db1.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-dwuconsumptionpercent_70f88865-7a8b-4e03-9252-a9369df503ef.bicep b/services/Sql/servers/templates/bicep/databases-dwuconsumptionpercent_70f88865-7a8b-4e03-9252-a9369df503ef.bicep
index 7b6e4d6f5..b5513c3a8 100644
--- a/services/Sql/servers/templates/bicep/databases-dwuconsumptionpercent_70f88865-7a8b-4e03-9252-a9369df503ef.bicep
+++ b/services/Sql/servers/templates/bicep/databases-dwuconsumptionpercent_70f88865-7a8b-4e03-9252-a9369df503ef.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-memoryusagepercent_f5c13b49-8528-457d-9d7d-083b8433bf96.bicep b/services/Sql/servers/templates/bicep/databases-memoryusagepercent_f5c13b49-8528-457d-9d7d-083b8433bf96.bicep
index d3f5af4cb..d099c97a3 100644
--- a/services/Sql/servers/templates/bicep/databases-memoryusagepercent_f5c13b49-8528-457d-9d7d-083b8433bf96.bicep
+++ b/services/Sql/servers/templates/bicep/databases-memoryusagepercent_f5c13b49-8528-457d-9d7d-083b8433bf96.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-sessionscount_07eeae07-010e-47ca-ad90-fa7adb5a6c52.bicep b/services/Sql/servers/templates/bicep/databases-sessionscount_07eeae07-010e-47ca-ad90-fa7adb5a6c52.bicep
index 63cce2644..639bd45c5 100644
--- a/services/Sql/servers/templates/bicep/databases-sessionscount_07eeae07-010e-47ca-ad90-fa7adb5a6c52.bicep
+++ b/services/Sql/servers/templates/bicep/databases-sessionscount_07eeae07-010e-47ca-ad90-fa7adb5a6c52.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-sqlinstancecpupercent_1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.bicep b/services/Sql/servers/templates/bicep/databases-sqlinstancecpupercent_1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.bicep
index b2ee846cd..62c4ff70e 100644
--- a/services/Sql/servers/templates/bicep/databases-sqlinstancecpupercent_1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.bicep
+++ b/services/Sql/servers/templates/bicep/databases-sqlinstancecpupercent_1a8132b9-fbd2-4ac5-9e08-96358e16b7f7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-sqlinstancememorypercent_f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.bicep b/services/Sql/servers/templates/bicep/databases-sqlinstancememorypercent_f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.bicep
index 473971b68..03863900c 100644
--- a/services/Sql/servers/templates/bicep/databases-sqlinstancememorypercent_f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.bicep
+++ b/services/Sql/servers/templates/bicep/databases-sqlinstancememorypercent_f44a3cb0-6e99-4a5e-a691-c5d7d5bf7e64.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-storage_86922a27-41bb-4834-bc54-0b602b275597.bicep b/services/Sql/servers/templates/bicep/databases-storage_86922a27-41bb-4834-bc54-0b602b275597.bicep
index 0d11ddf39..7af0f294e 100644
--- a/services/Sql/servers/templates/bicep/databases-storage_86922a27-41bb-4834-bc54-0b602b275597.bicep
+++ b/services/Sql/servers/templates/bicep/databases-storage_86922a27-41bb-4834-bc54-0b602b275597.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/databases-tempdbdatasize_0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.bicep b/services/Sql/servers/templates/bicep/databases-tempdbdatasize_0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.bicep
index c52441e18..86de72f4a 100644
--- a/services/Sql/servers/templates/bicep/databases-tempdbdatasize_0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.bicep
+++ b/services/Sql/servers/templates/bicep/databases-tempdbdatasize_0fe27fd1-e4f7-48c1-bbd2-a6953755d5e8.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-allocateddatastorage_3743016a-a056-43fe-b53a-36dd9a17626d.bicep b/services/Sql/servers/templates/bicep/elasticpools-allocateddatastorage_3743016a-a056-43fe-b53a-36dd9a17626d.bicep
index 8abbd64a8..299413e10 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-allocateddatastorage_3743016a-a056-43fe-b53a-36dd9a17626d.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-allocateddatastorage_3743016a-a056-43fe-b53a-36dd9a17626d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-allocateddatastoragepercent_7e9d0710-3243-4cf2-8b73-6be1539b8545.bicep b/services/Sql/servers/templates/bicep/elasticpools-allocateddatastoragepercent_7e9d0710-3243-4cf2-8b73-6be1539b8545.bicep
index 1886f8f7e..a276872a1 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-allocateddatastoragepercent_7e9d0710-3243-4cf2-8b73-6be1539b8545.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-allocateddatastoragepercent_7e9d0710-3243-4cf2-8b73-6be1539b8545.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-cpupercent_805c4ae5-a852-43bd-ad1c-0f7f381d8f32.bicep b/services/Sql/servers/templates/bicep/elasticpools-cpupercent_805c4ae5-a852-43bd-ad1c-0f7f381d8f32.bicep
index c45db599a..23176f059 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-cpupercent_805c4ae5-a852-43bd-ad1c-0f7f381d8f32.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-cpupercent_805c4ae5-a852-43bd-ad1c-0f7f381d8f32.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-dtuconsumptionpercent_5d9075b5-3c19-4cf6-9c2e-50ba4c175691.bicep b/services/Sql/servers/templates/bicep/elasticpools-dtuconsumptionpercent_5d9075b5-3c19-4cf6-9c2e-50ba4c175691.bicep
index 03ebef8f7..40db74696 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-dtuconsumptionpercent_5d9075b5-3c19-4cf6-9c2e-50ba4c175691.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-dtuconsumptionpercent_5d9075b5-3c19-4cf6-9c2e-50ba4c175691.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-eDTUused_16a64053-1905-4d8e-8198-810584cad108.bicep b/services/Sql/servers/templates/bicep/elasticpools-eDTUused_16a64053-1905-4d8e-8198-810584cad108.bicep
index efc10ad98..2ac4bb9d3 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-eDTUused_16a64053-1905-4d8e-8198-810584cad108.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-eDTUused_16a64053-1905-4d8e-8198-810584cad108.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-logwritepercent_47cd814e-1991-437e-8feb-e589a250d2a3.bicep b/services/Sql/servers/templates/bicep/elasticpools-logwritepercent_47cd814e-1991-437e-8feb-e589a250d2a3.bicep
index 2b2a29cde..a75b64726 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-logwritepercent_47cd814e-1991-437e-8feb-e589a250d2a3.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-logwritepercent_47cd814e-1991-437e-8feb-e589a250d2a3.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-physicaldatareadpercent_92efc2ea-b6ed-41aa-921c-6d40e7b58c27.bicep b/services/Sql/servers/templates/bicep/elasticpools-physicaldatareadpercent_92efc2ea-b6ed-41aa-921c-6d40e7b58c27.bicep
index f9d067583..f5b31fbd8 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-physicaldatareadpercent_92efc2ea-b6ed-41aa-921c-6d40e7b58c27.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-physicaldatareadpercent_92efc2ea-b6ed-41aa-921c-6d40e7b58c27.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-sessionspercent_6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.bicep b/services/Sql/servers/templates/bicep/elasticpools-sessionspercent_6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.bicep
index 7cfe97d09..c247aeaf0 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-sessionspercent_6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-sessionspercent_6b2e0ce9-d1b8-4061-b3ce-c39f9c5c1763.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-sqlserverprocesscorepercent_73ec4301-872a-4bea-928e-420255aae8cb.bicep b/services/Sql/servers/templates/bicep/elasticpools-sqlserverprocesscorepercent_73ec4301-872a-4bea-928e-420255aae8cb.bicep
index 795e41bc8..4a035618f 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-sqlserverprocesscorepercent_73ec4301-872a-4bea-928e-420255aae8cb.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-sqlserverprocesscorepercent_73ec4301-872a-4bea-928e-420255aae8cb.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-sqlserverprocessmemorypercent_fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.bicep b/services/Sql/servers/templates/bicep/elasticpools-sqlserverprocessmemorypercent_fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.bicep
index f01fd913c..a9c532869 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-sqlserverprocessmemorypercent_fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-sqlserverprocessmemorypercent_fa056aaf-57c4-4abe-9bc5-23ba413a1f5b.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-storagepercent_88f3cbc0-bcfb-482f-b6f4-709a335afcad.bicep b/services/Sql/servers/templates/bicep/elasticpools-storagepercent_88f3cbc0-bcfb-482f-b6f4-709a335afcad.bicep
index 3cdaffe40..32557d343 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-storagepercent_88f3cbc0-bcfb-482f-b6f4-709a335afcad.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-storagepercent_88f3cbc0-bcfb-482f-b6f4-709a335afcad.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-tempdblogusedpercent_af66de51-079c-4d34-af92-f52f887642dc.bicep b/services/Sql/servers/templates/bicep/elasticpools-tempdblogusedpercent_af66de51-079c-4d34-af92-f52f887642dc.bicep
index e6848cd1e..e5dfdfe5a 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-tempdblogusedpercent_af66de51-079c-4d34-af92-f52f887642dc.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-tempdblogusedpercent_af66de51-079c-4d34-af92-f52f887642dc.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-workerspercent_1b37038e-6e5c-4463-97d4-8a632251d70e.bicep b/services/Sql/servers/templates/bicep/elasticpools-workerspercent_1b37038e-6e5c-4463-97d4-8a632251d70e.bicep
index 3751d6242..5cdbd6a2a 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-workerspercent_1b37038e-6e5c-4463-97d4-8a632251d70e.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-workerspercent_1b37038e-6e5c-4463-97d4-8a632251d70e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Sql/servers/templates/bicep/elasticpools-xtpstoragepercent_db517009-30ad-4cbc-b282-7f212052c3b4.bicep b/services/Sql/servers/templates/bicep/elasticpools-xtpstoragepercent_db517009-30ad-4cbc-b282-7f212052c3b4.bicep
index 2ba14ce38..dcbfa84c6 100644
--- a/services/Sql/servers/templates/bicep/elasticpools-xtpstoragepercent_db517009-30ad-4cbc-b282-7f212052c3b4.bicep
+++ b/services/Sql/servers/templates/bicep/elasticpools-xtpstoragepercent_db517009-30ad-4cbc-b282-7f212052c3b4.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/arm/Availability_b1a4849b-78a8-437f-8113-7c6f2dc34927.json b/services/Storage/storageAccounts/templates/arm/Availability_b1a4849b-78a8-437f-8113-7c6f2dc34927.json
index 22c1bc480..b2cd6116d 100644
--- a/services/Storage/storageAccounts/templates/arm/Availability_b1a4849b-78a8-437f-8113-7c6f2dc34927.json
+++ b/services/Storage/storageAccounts/templates/arm/Availability_b1a4849b-78a8-437f-8113-7c6f2dc34927.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/Egress_eb186756-b63b-408a-bbaf-ac94c1010287.json b/services/Storage/storageAccounts/templates/arm/Egress_eb186756-b63b-408a-bbaf-ac94c1010287.json
index d96c771e5..989bfa6b6 100644
--- a/services/Storage/storageAccounts/templates/arm/Egress_eb186756-b63b-408a-bbaf-ac94c1010287.json
+++ b/services/Storage/storageAccounts/templates/arm/Egress_eb186756-b63b-408a-bbaf-ac94c1010287.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/FileShareCount_a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.json b/services/Storage/storageAccounts/templates/arm/FileShareCount_a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.json
index dc38af8d8..4aeb1a19d 100644
--- a/services/Storage/storageAccounts/templates/arm/FileShareCount_a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.json
+++ b/services/Storage/storageAccounts/templates/arm/FileShareCount_a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/Ingress_5d872cb4-7f71-4275-81eb-98c968c0cadd.json b/services/Storage/storageAccounts/templates/arm/Ingress_5d872cb4-7f71-4275-81eb-98c968c0cadd.json
index d690ee29c..6ee61a28c 100644
--- a/services/Storage/storageAccounts/templates/arm/Ingress_5d872cb4-7f71-4275-81eb-98c968c0cadd.json
+++ b/services/Storage/storageAccounts/templates/arm/Ingress_5d872cb4-7f71-4275-81eb-98c968c0cadd.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/QueueCount_f75dec98-78a3-4e42-954d-375fe3352857.json b/services/Storage/storageAccounts/templates/arm/QueueCount_f75dec98-78a3-4e42-954d-375fe3352857.json
index f8f5bb7c8..7dd454ca5 100644
--- a/services/Storage/storageAccounts/templates/arm/QueueCount_f75dec98-78a3-4e42-954d-375fe3352857.json
+++ b/services/Storage/storageAccounts/templates/arm/QueueCount_f75dec98-78a3-4e42-954d-375fe3352857.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/Throttling_5e544473-d84f-427d-869d-9d982619e4cb.json b/services/Storage/storageAccounts/templates/arm/Throttling_5e544473-d84f-427d-869d-9d982619e4cb.json
index 2efa042cf..6b12871a6 100644
--- a/services/Storage/storageAccounts/templates/arm/Throttling_5e544473-d84f-427d-869d-9d982619e4cb.json
+++ b/services/Storage/storageAccounts/templates/arm/Throttling_5e544473-d84f-427d-869d-9d982619e4cb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/UsedCapacity_b663a689-6db8-467d-8b5d-8cd34afe4b0e.json b/services/Storage/storageAccounts/templates/arm/UsedCapacity_b663a689-6db8-467d-8b5d-8cd34afe4b0e.json
index e8af7a0f5..c40f5f800 100644
--- a/services/Storage/storageAccounts/templates/arm/UsedCapacity_b663a689-6db8-467d-8b5d-8cd34afe4b0e.json
+++ b/services/Storage/storageAccounts/templates/arm/UsedCapacity_b663a689-6db8-467d-8b5d-8cd34afe4b0e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/blobServices-BlobCapacity_8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.json b/services/Storage/storageAccounts/templates/arm/blobServices-BlobCapacity_8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.json
index fb80807e4..586ef88f6 100644
--- a/services/Storage/storageAccounts/templates/arm/blobServices-BlobCapacity_8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.json
+++ b/services/Storage/storageAccounts/templates/arm/blobServices-BlobCapacity_8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/blobServices-BlobCount_c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.json b/services/Storage/storageAccounts/templates/arm/blobServices-BlobCount_c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.json
index cafe2da76..fd0823fa2 100644
--- a/services/Storage/storageAccounts/templates/arm/blobServices-BlobCount_c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.json
+++ b/services/Storage/storageAccounts/templates/arm/blobServices-BlobCount_c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/blobServices-SuccessE2ELatency_0acc30dc-881d-46c9-b634-8cba507a263f.json b/services/Storage/storageAccounts/templates/arm/blobServices-SuccessE2ELatency_0acc30dc-881d-46c9-b634-8cba507a263f.json
index 1154f3abc..174366e40 100644
--- a/services/Storage/storageAccounts/templates/arm/blobServices-SuccessE2ELatency_0acc30dc-881d-46c9-b634-8cba507a263f.json
+++ b/services/Storage/storageAccounts/templates/arm/blobServices-SuccessE2ELatency_0acc30dc-881d-46c9-b634-8cba507a263f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/blobServices-SuccessServerLatency_0a3689c7-b610-4c52-ae84-ab0640f3d6e4.json b/services/Storage/storageAccounts/templates/arm/blobServices-SuccessServerLatency_0a3689c7-b610-4c52-ae84-ab0640f3d6e4.json
index 3b5ba6906..90c6cde9b 100644
--- a/services/Storage/storageAccounts/templates/arm/blobServices-SuccessServerLatency_0a3689c7-b610-4c52-ae84-ab0640f3d6e4.json
+++ b/services/Storage/storageAccounts/templates/arm/blobServices-SuccessServerLatency_0a3689c7-b610-4c52-ae84-ab0640f3d6e4.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/fileServices-Availability_45fef979-c27e-425a-a6c3-e5bd28b1eb86.json b/services/Storage/storageAccounts/templates/arm/fileServices-Availability_45fef979-c27e-425a-a6c3-e5bd28b1eb86.json
index 9691a2ebc..71d445352 100644
--- a/services/Storage/storageAccounts/templates/arm/fileServices-Availability_45fef979-c27e-425a-a6c3-e5bd28b1eb86.json
+++ b/services/Storage/storageAccounts/templates/arm/fileServices-Availability_45fef979-c27e-425a-a6c3-e5bd28b1eb86.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/fileServices-FileCapacity_26e09eae-c784-4e8f-a225-d3f13efff76f.json b/services/Storage/storageAccounts/templates/arm/fileServices-FileCapacity_26e09eae-c784-4e8f-a225-d3f13efff76f.json
index deaebaabc..d2f8db1bd 100644
--- a/services/Storage/storageAccounts/templates/arm/fileServices-FileCapacity_26e09eae-c784-4e8f-a225-d3f13efff76f.json
+++ b/services/Storage/storageAccounts/templates/arm/fileServices-FileCapacity_26e09eae-c784-4e8f-a225-d3f13efff76f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/fileServices-FileShareCapacityQuota_8660f357-83f9-4719-bdf3-bae57af2d967.json b/services/Storage/storageAccounts/templates/arm/fileServices-FileShareCapacityQuota_8660f357-83f9-4719-bdf3-bae57af2d967.json
index b77a40bb0..412d6f128 100644
--- a/services/Storage/storageAccounts/templates/arm/fileServices-FileShareCapacityQuota_8660f357-83f9-4719-bdf3-bae57af2d967.json
+++ b/services/Storage/storageAccounts/templates/arm/fileServices-FileShareCapacityQuota_8660f357-83f9-4719-bdf3-bae57af2d967.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/fileServices-FileShareSnapshotCount_8cbe449d-9264-4ae1-8221-5d97989005a8.json b/services/Storage/storageAccounts/templates/arm/fileServices-FileShareSnapshotCount_8cbe449d-9264-4ae1-8221-5d97989005a8.json
index fbcb7aea0..da8a654ba 100644
--- a/services/Storage/storageAccounts/templates/arm/fileServices-FileShareSnapshotCount_8cbe449d-9264-4ae1-8221-5d97989005a8.json
+++ b/services/Storage/storageAccounts/templates/arm/fileServices-FileShareSnapshotCount_8cbe449d-9264-4ae1-8221-5d97989005a8.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/fileServices-Transactions_c81d3e6c-5539-42ad-a95f-9bba504d91f0.json b/services/Storage/storageAccounts/templates/arm/fileServices-Transactions_c81d3e6c-5539-42ad-a95f-9bba504d91f0.json
index 50a716129..d2dc90d33 100644
--- a/services/Storage/storageAccounts/templates/arm/fileServices-Transactions_c81d3e6c-5539-42ad-a95f-9bba504d91f0.json
+++ b/services/Storage/storageAccounts/templates/arm/fileServices-Transactions_c81d3e6c-5539-42ad-a95f-9bba504d91f0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/queueServices-QueueCapacity_7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.json b/services/Storage/storageAccounts/templates/arm/queueServices-QueueCapacity_7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.json
index c7e8acce7..19769bb90 100644
--- a/services/Storage/storageAccounts/templates/arm/queueServices-QueueCapacity_7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.json
+++ b/services/Storage/storageAccounts/templates/arm/queueServices-QueueCapacity_7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/arm/queueServices-QueueMessageCount_34769aaa-5014-4ced-bb08-9fabfba3d959.json b/services/Storage/storageAccounts/templates/arm/queueServices-QueueMessageCount_34769aaa-5014-4ced-bb08-9fabfba3d959.json
index e93032ae6..50437a4dc 100644
--- a/services/Storage/storageAccounts/templates/arm/queueServices-QueueMessageCount_34769aaa-5014-4ced-bb08-9fabfba3d959.json
+++ b/services/Storage/storageAccounts/templates/arm/queueServices-QueueMessageCount_34769aaa-5014-4ced-bb08-9fabfba3d959.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Storage/storageAccounts/templates/bicep/Availability_b1a4849b-78a8-437f-8113-7c6f2dc34927.bicep b/services/Storage/storageAccounts/templates/bicep/Availability_b1a4849b-78a8-437f-8113-7c6f2dc34927.bicep
index efb5b159b..c7f85c112 100644
--- a/services/Storage/storageAccounts/templates/bicep/Availability_b1a4849b-78a8-437f-8113-7c6f2dc34927.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/Availability_b1a4849b-78a8-437f-8113-7c6f2dc34927.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/Egress_eb186756-b63b-408a-bbaf-ac94c1010287.bicep b/services/Storage/storageAccounts/templates/bicep/Egress_eb186756-b63b-408a-bbaf-ac94c1010287.bicep
index bcf88ac45..b4ae84974 100644
--- a/services/Storage/storageAccounts/templates/bicep/Egress_eb186756-b63b-408a-bbaf-ac94c1010287.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/Egress_eb186756-b63b-408a-bbaf-ac94c1010287.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/FileShareCount_a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.bicep b/services/Storage/storageAccounts/templates/bicep/FileShareCount_a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.bicep
index 39c7fb785..24cfd38b5 100644
--- a/services/Storage/storageAccounts/templates/bicep/FileShareCount_a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/FileShareCount_a4adc774-7ca4-4a4b-b2fa-514b9fcbbc80.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/Ingress_5d872cb4-7f71-4275-81eb-98c968c0cadd.bicep b/services/Storage/storageAccounts/templates/bicep/Ingress_5d872cb4-7f71-4275-81eb-98c968c0cadd.bicep
index 76ec261ce..cbafd5960 100644
--- a/services/Storage/storageAccounts/templates/bicep/Ingress_5d872cb4-7f71-4275-81eb-98c968c0cadd.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/Ingress_5d872cb4-7f71-4275-81eb-98c968c0cadd.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/QueueCount_f75dec98-78a3-4e42-954d-375fe3352857.bicep b/services/Storage/storageAccounts/templates/bicep/QueueCount_f75dec98-78a3-4e42-954d-375fe3352857.bicep
index 1fffabbe1..b0a700582 100644
--- a/services/Storage/storageAccounts/templates/bicep/QueueCount_f75dec98-78a3-4e42-954d-375fe3352857.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/QueueCount_f75dec98-78a3-4e42-954d-375fe3352857.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/Throttling_5e544473-d84f-427d-869d-9d982619e4cb.bicep b/services/Storage/storageAccounts/templates/bicep/Throttling_5e544473-d84f-427d-869d-9d982619e4cb.bicep
index 1a79793b3..b1ea27551 100644
--- a/services/Storage/storageAccounts/templates/bicep/Throttling_5e544473-d84f-427d-869d-9d982619e4cb.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/Throttling_5e544473-d84f-427d-869d-9d982619e4cb.bicep
@@ -129,7 +129,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/UsedCapacity_b663a689-6db8-467d-8b5d-8cd34afe4b0e.bicep b/services/Storage/storageAccounts/templates/bicep/UsedCapacity_b663a689-6db8-467d-8b5d-8cd34afe4b0e.bicep
index f22297c45..5e63af2fa 100644
--- a/services/Storage/storageAccounts/templates/bicep/UsedCapacity_b663a689-6db8-467d-8b5d-8cd34afe4b0e.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/UsedCapacity_b663a689-6db8-467d-8b5d-8cd34afe4b0e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/blobServices-BlobCapacity_8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.bicep b/services/Storage/storageAccounts/templates/bicep/blobServices-BlobCapacity_8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.bicep
index 66739ac1c..7d73f785e 100644
--- a/services/Storage/storageAccounts/templates/bicep/blobServices-BlobCapacity_8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/blobServices-BlobCapacity_8c0aaea9-bcce-4c27-a090-ffe54b7e1d1c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/blobServices-BlobCount_c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.bicep b/services/Storage/storageAccounts/templates/bicep/blobServices-BlobCount_c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.bicep
index e76433399..698da279b 100644
--- a/services/Storage/storageAccounts/templates/bicep/blobServices-BlobCount_c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/blobServices-BlobCount_c4d93fac-a6b6-4731-a92a-c499b6fb2bcb.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/blobServices-SuccessE2ELatency_0acc30dc-881d-46c9-b634-8cba507a263f.bicep b/services/Storage/storageAccounts/templates/bicep/blobServices-SuccessE2ELatency_0acc30dc-881d-46c9-b634-8cba507a263f.bicep
index 6fec2259c..5cccd1344 100644
--- a/services/Storage/storageAccounts/templates/bicep/blobServices-SuccessE2ELatency_0acc30dc-881d-46c9-b634-8cba507a263f.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/blobServices-SuccessE2ELatency_0acc30dc-881d-46c9-b634-8cba507a263f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/blobServices-SuccessServerLatency_0a3689c7-b610-4c52-ae84-ab0640f3d6e4.bicep b/services/Storage/storageAccounts/templates/bicep/blobServices-SuccessServerLatency_0a3689c7-b610-4c52-ae84-ab0640f3d6e4.bicep
index b186e0938..3762b3a56 100644
--- a/services/Storage/storageAccounts/templates/bicep/blobServices-SuccessServerLatency_0a3689c7-b610-4c52-ae84-ab0640f3d6e4.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/blobServices-SuccessServerLatency_0a3689c7-b610-4c52-ae84-ab0640f3d6e4.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/fileServices-Availability_45fef979-c27e-425a-a6c3-e5bd28b1eb86.bicep b/services/Storage/storageAccounts/templates/bicep/fileServices-Availability_45fef979-c27e-425a-a6c3-e5bd28b1eb86.bicep
index fc9f56d44..325dffd7c 100644
--- a/services/Storage/storageAccounts/templates/bicep/fileServices-Availability_45fef979-c27e-425a-a6c3-e5bd28b1eb86.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/fileServices-Availability_45fef979-c27e-425a-a6c3-e5bd28b1eb86.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/fileServices-FileCapacity_26e09eae-c784-4e8f-a225-d3f13efff76f.bicep b/services/Storage/storageAccounts/templates/bicep/fileServices-FileCapacity_26e09eae-c784-4e8f-a225-d3f13efff76f.bicep
index d64d7174c..6742996d7 100644
--- a/services/Storage/storageAccounts/templates/bicep/fileServices-FileCapacity_26e09eae-c784-4e8f-a225-d3f13efff76f.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/fileServices-FileCapacity_26e09eae-c784-4e8f-a225-d3f13efff76f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/fileServices-FileShareCapacityQuota_8660f357-83f9-4719-bdf3-bae57af2d967.bicep b/services/Storage/storageAccounts/templates/bicep/fileServices-FileShareCapacityQuota_8660f357-83f9-4719-bdf3-bae57af2d967.bicep
index b1155469f..a0f7e85cd 100644
--- a/services/Storage/storageAccounts/templates/bicep/fileServices-FileShareCapacityQuota_8660f357-83f9-4719-bdf3-bae57af2d967.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/fileServices-FileShareCapacityQuota_8660f357-83f9-4719-bdf3-bae57af2d967.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/fileServices-FileShareSnapshotCount_8cbe449d-9264-4ae1-8221-5d97989005a8.bicep b/services/Storage/storageAccounts/templates/bicep/fileServices-FileShareSnapshotCount_8cbe449d-9264-4ae1-8221-5d97989005a8.bicep
index cb8d4ff19..9382e5a49 100644
--- a/services/Storage/storageAccounts/templates/bicep/fileServices-FileShareSnapshotCount_8cbe449d-9264-4ae1-8221-5d97989005a8.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/fileServices-FileShareSnapshotCount_8cbe449d-9264-4ae1-8221-5d97989005a8.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/fileServices-Transactions_c81d3e6c-5539-42ad-a95f-9bba504d91f0.bicep b/services/Storage/storageAccounts/templates/bicep/fileServices-Transactions_c81d3e6c-5539-42ad-a95f-9bba504d91f0.bicep
index af6dd4665..c144b9909 100644
--- a/services/Storage/storageAccounts/templates/bicep/fileServices-Transactions_c81d3e6c-5539-42ad-a95f-9bba504d91f0.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/fileServices-Transactions_c81d3e6c-5539-42ad-a95f-9bba504d91f0.bicep
@@ -129,7 +129,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/queueServices-QueueCapacity_7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.bicep b/services/Storage/storageAccounts/templates/bicep/queueServices-QueueCapacity_7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.bicep
index 5fa5a77f4..74581046f 100644
--- a/services/Storage/storageAccounts/templates/bicep/queueServices-QueueCapacity_7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/queueServices-QueueCapacity_7815fc6f-bfb1-4474-9ea6-05e1449a2ed5.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Storage/storageAccounts/templates/bicep/queueServices-QueueMessageCount_34769aaa-5014-4ced-bb08-9fabfba3d959.bicep b/services/Storage/storageAccounts/templates/bicep/queueServices-QueueMessageCount_34769aaa-5014-4ced-bb08-9fabfba3d959.bicep
index 9590bd130..14028b502 100644
--- a/services/Storage/storageAccounts/templates/bicep/queueServices-QueueMessageCount_34769aaa-5014-4ced-bb08-9fabfba3d959.bicep
+++ b/services/Storage/storageAccounts/templates/bicep/queueServices-QueueMessageCount_34769aaa-5014-4ced-bb08-9fabfba3d959.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageCache/AmlFilesystems/templates/arm/MDTBytesUsed_ebd68fdd-9672-43e8-b7d5-6e479210535d.json b/services/StorageCache/AmlFilesystems/templates/arm/MDTBytesUsed_ebd68fdd-9672-43e8-b7d5-6e479210535d.json
index 37f0174e6..033488b75 100644
--- a/services/StorageCache/AmlFilesystems/templates/arm/MDTBytesUsed_ebd68fdd-9672-43e8-b7d5-6e479210535d.json
+++ b/services/StorageCache/AmlFilesystems/templates/arm/MDTBytesUsed_ebd68fdd-9672-43e8-b7d5-6e479210535d.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesAvailable_ecec6f93-af7e-4071-b35d-cd70b3f16581.json b/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesAvailable_ecec6f93-af7e-4071-b35d-cd70b3f16581.json
index d59cb95d5..e198806cc 100644
--- a/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesAvailable_ecec6f93-af7e-4071-b35d-cd70b3f16581.json
+++ b/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesAvailable_ecec6f93-af7e-4071-b35d-cd70b3f16581.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesFree_2feba8fd-ff1e-4f48-bc01-6e2996edafa6.json b/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesFree_2feba8fd-ff1e-4f48-bc01-6e2996edafa6.json
index c36818c6a..462ee242c 100644
--- a/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesFree_2feba8fd-ff1e-4f48-bc01-6e2996edafa6.json
+++ b/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesFree_2feba8fd-ff1e-4f48-bc01-6e2996edafa6.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesUsed_48fc094d-8a00-4d3c-86d3-3230c7e5881a.json b/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesUsed_48fc094d-8a00-4d3c-86d3-3230c7e5881a.json
index 83bbe912d..7f42d71a5 100644
--- a/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesUsed_48fc094d-8a00-4d3c-86d3-3230c7e5881a.json
+++ b/services/StorageCache/AmlFilesystems/templates/arm/MDTFilesUsed_48fc094d-8a00-4d3c-86d3-3230c7e5881a.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageCache/AmlFilesystems/templates/arm/OSTBytesAvailable_4eeca790-a804-4453-b339-73ea425610bc.json b/services/StorageCache/AmlFilesystems/templates/arm/OSTBytesAvailable_4eeca790-a804-4453-b339-73ea425610bc.json
index 3e3a9d50f..833580b24 100644
--- a/services/StorageCache/AmlFilesystems/templates/arm/OSTBytesAvailable_4eeca790-a804-4453-b339-73ea425610bc.json
+++ b/services/StorageCache/AmlFilesystems/templates/arm/OSTBytesAvailable_4eeca790-a804-4453-b339-73ea425610bc.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageCache/AmlFilesystems/templates/arm/OSTBytesUsed_59298086-ec77-4f47-b2ef-b853b79e31cb.json b/services/StorageCache/AmlFilesystems/templates/arm/OSTBytesUsed_59298086-ec77-4f47-b2ef-b853b79e31cb.json
index 42cff46fb..8f8369d0a 100644
--- a/services/StorageCache/AmlFilesystems/templates/arm/OSTBytesUsed_59298086-ec77-4f47-b2ef-b853b79e31cb.json
+++ b/services/StorageCache/AmlFilesystems/templates/arm/OSTBytesUsed_59298086-ec77-4f47-b2ef-b853b79e31cb.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageCache/AmlFilesystems/templates/arm/OSTFilesFree_8f231351-c123-4e4c-8631-9978e641a3ca.json b/services/StorageCache/AmlFilesystems/templates/arm/OSTFilesFree_8f231351-c123-4e4c-8631-9978e641a3ca.json
index b5e4bca1a..8d131027a 100644
--- a/services/StorageCache/AmlFilesystems/templates/arm/OSTFilesFree_8f231351-c123-4e4c-8631-9978e641a3ca.json
+++ b/services/StorageCache/AmlFilesystems/templates/arm/OSTFilesFree_8f231351-c123-4e4c-8631-9978e641a3ca.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageCache/AmlFilesystems/templates/arm/OSTFilesUsed_9d086772-1887-4893-8b9f-7e5169398bae.json b/services/StorageCache/AmlFilesystems/templates/arm/OSTFilesUsed_9d086772-1887-4893-8b9f-7e5169398bae.json
index 3c699685d..1a92f40f6 100644
--- a/services/StorageCache/AmlFilesystems/templates/arm/OSTFilesUsed_9d086772-1887-4893-8b9f-7e5169398bae.json
+++ b/services/StorageCache/AmlFilesystems/templates/arm/OSTFilesUsed_9d086772-1887-4893-8b9f-7e5169398bae.json
@@ -240,7 +240,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageCache/AmlFilesystems/templates/arm/Uptime_7f951991-c6ce-4c72-9f55-7eade2c4f57c.json b/services/StorageCache/AmlFilesystems/templates/arm/Uptime_7f951991-c6ce-4c72-9f55-7eade2c4f57c.json
index c174a96c2..52a9f5de3 100644
--- a/services/StorageCache/AmlFilesystems/templates/arm/Uptime_7f951991-c6ce-4c72-9f55-7eade2c4f57c.json
+++ b/services/StorageCache/AmlFilesystems/templates/arm/Uptime_7f951991-c6ce-4c72-9f55-7eade2c4f57c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageCache/AmlFilesystems/templates/bicep/MDTBytesUsed_ebd68fdd-9672-43e8-b7d5-6e479210535d.bicep b/services/StorageCache/AmlFilesystems/templates/bicep/MDTBytesUsed_ebd68fdd-9672-43e8-b7d5-6e479210535d.bicep
index 3dde5a525..ba9b34c8b 100644
--- a/services/StorageCache/AmlFilesystems/templates/bicep/MDTBytesUsed_ebd68fdd-9672-43e8-b7d5-6e479210535d.bicep
+++ b/services/StorageCache/AmlFilesystems/templates/bicep/MDTBytesUsed_ebd68fdd-9672-43e8-b7d5-6e479210535d.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesAvailable_ecec6f93-af7e-4071-b35d-cd70b3f16581.bicep b/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesAvailable_ecec6f93-af7e-4071-b35d-cd70b3f16581.bicep
index 41bb9b4f1..6dfc1fa3b 100644
--- a/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesAvailable_ecec6f93-af7e-4071-b35d-cd70b3f16581.bicep
+++ b/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesAvailable_ecec6f93-af7e-4071-b35d-cd70b3f16581.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesFree_2feba8fd-ff1e-4f48-bc01-6e2996edafa6.bicep b/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesFree_2feba8fd-ff1e-4f48-bc01-6e2996edafa6.bicep
index 4822dbdb6..4e1ac1ba5 100644
--- a/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesFree_2feba8fd-ff1e-4f48-bc01-6e2996edafa6.bicep
+++ b/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesFree_2feba8fd-ff1e-4f48-bc01-6e2996edafa6.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesUsed_48fc094d-8a00-4d3c-86d3-3230c7e5881a.bicep b/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesUsed_48fc094d-8a00-4d3c-86d3-3230c7e5881a.bicep
index e42f3ac6c..09770f39d 100644
--- a/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesUsed_48fc094d-8a00-4d3c-86d3-3230c7e5881a.bicep
+++ b/services/StorageCache/AmlFilesystems/templates/bicep/MDTFilesUsed_48fc094d-8a00-4d3c-86d3-3230c7e5881a.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageCache/AmlFilesystems/templates/bicep/OSTBytesAvailable_4eeca790-a804-4453-b339-73ea425610bc.bicep b/services/StorageCache/AmlFilesystems/templates/bicep/OSTBytesAvailable_4eeca790-a804-4453-b339-73ea425610bc.bicep
index f54da1a33..1841f61c8 100644
--- a/services/StorageCache/AmlFilesystems/templates/bicep/OSTBytesAvailable_4eeca790-a804-4453-b339-73ea425610bc.bicep
+++ b/services/StorageCache/AmlFilesystems/templates/bicep/OSTBytesAvailable_4eeca790-a804-4453-b339-73ea425610bc.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageCache/AmlFilesystems/templates/bicep/OSTBytesUsed_59298086-ec77-4f47-b2ef-b853b79e31cb.bicep b/services/StorageCache/AmlFilesystems/templates/bicep/OSTBytesUsed_59298086-ec77-4f47-b2ef-b853b79e31cb.bicep
index 405f71dd9..84d721ce8 100644
--- a/services/StorageCache/AmlFilesystems/templates/bicep/OSTBytesUsed_59298086-ec77-4f47-b2ef-b853b79e31cb.bicep
+++ b/services/StorageCache/AmlFilesystems/templates/bicep/OSTBytesUsed_59298086-ec77-4f47-b2ef-b853b79e31cb.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageCache/AmlFilesystems/templates/bicep/OSTFilesFree_8f231351-c123-4e4c-8631-9978e641a3ca.bicep b/services/StorageCache/AmlFilesystems/templates/bicep/OSTFilesFree_8f231351-c123-4e4c-8631-9978e641a3ca.bicep
index 0bdac3e4a..ba864b1e7 100644
--- a/services/StorageCache/AmlFilesystems/templates/bicep/OSTFilesFree_8f231351-c123-4e4c-8631-9978e641a3ca.bicep
+++ b/services/StorageCache/AmlFilesystems/templates/bicep/OSTFilesFree_8f231351-c123-4e4c-8631-9978e641a3ca.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageCache/AmlFilesystems/templates/bicep/OSTFilesUsed_9d086772-1887-4893-8b9f-7e5169398bae.bicep b/services/StorageCache/AmlFilesystems/templates/bicep/OSTFilesUsed_9d086772-1887-4893-8b9f-7e5169398bae.bicep
index b9dc8e593..ef4f04735 100644
--- a/services/StorageCache/AmlFilesystems/templates/bicep/OSTFilesUsed_9d086772-1887-4893-8b9f-7e5169398bae.bicep
+++ b/services/StorageCache/AmlFilesystems/templates/bicep/OSTFilesUsed_9d086772-1887-4893-8b9f-7e5169398bae.bicep
@@ -167,7 +167,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageCache/AmlFilesystems/templates/bicep/Uptime_7f951991-c6ce-4c72-9f55-7eade2c4f57c.bicep b/services/StorageCache/AmlFilesystems/templates/bicep/Uptime_7f951991-c6ce-4c72-9f55-7eade2c4f57c.bicep
index fd041082f..307f6a4aa 100644
--- a/services/StorageCache/AmlFilesystems/templates/bicep/Uptime_7f951991-c6ce-4c72-9f55-7eade2c4f57c.bicep
+++ b/services/StorageCache/AmlFilesystems/templates/bicep/Uptime_7f951991-c6ce-4c72-9f55-7eade2c4f57c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageSync/storageSyncServices/templates/arm/ServerSyncSessionResult_ea68cbf2-b8a6-4f47-afda-94cab9ce4622.json b/services/StorageSync/storageSyncServices/templates/arm/ServerSyncSessionResult_ea68cbf2-b8a6-4f47-afda-94cab9ce4622.json
index 1a53152ff..3584fda7e 100644
--- a/services/StorageSync/storageSyncServices/templates/arm/ServerSyncSessionResult_ea68cbf2-b8a6-4f47-afda-94cab9ce4622.json
+++ b/services/StorageSync/storageSyncServices/templates/arm/ServerSyncSessionResult_ea68cbf2-b8a6-4f47-afda-94cab9ce4622.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageSync/storageSyncServices/templates/arm/StorageSyncServerHeartbeat_eb627157-b9c8-4e8f-a00e-f9eb7df45c78.json b/services/StorageSync/storageSyncServices/templates/arm/StorageSyncServerHeartbeat_eb627157-b9c8-4e8f-a00e-f9eb7df45c78.json
index 659d551fe..b809a5b2c 100644
--- a/services/StorageSync/storageSyncServices/templates/arm/StorageSyncServerHeartbeat_eb627157-b9c8-4e8f-a00e-f9eb7df45c78.json
+++ b/services/StorageSync/storageSyncServices/templates/arm/StorageSyncServerHeartbeat_eb627157-b9c8-4e8f-a00e-f9eb7df45c78.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageSync/storageSyncServices/templates/arm/StorageSyncSyncSessionPerItemErrorsCount_0020bd6d-cd35-491e-9c71-f66bd64ed9a9.json b/services/StorageSync/storageSyncServices/templates/arm/StorageSyncSyncSessionPerItemErrorsCount_0020bd6d-cd35-491e-9c71-f66bd64ed9a9.json
index a9e620684..aa42f5011 100644
--- a/services/StorageSync/storageSyncServices/templates/arm/StorageSyncSyncSessionPerItemErrorsCount_0020bd6d-cd35-491e-9c71-f66bd64ed9a9.json
+++ b/services/StorageSync/storageSyncServices/templates/arm/StorageSyncSyncSessionPerItemErrorsCount_0020bd6d-cd35-491e-9c71-f66bd64ed9a9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StorageSync/storageSyncServices/templates/bicep/ServerSyncSessionResult_ea68cbf2-b8a6-4f47-afda-94cab9ce4622.bicep b/services/StorageSync/storageSyncServices/templates/bicep/ServerSyncSessionResult_ea68cbf2-b8a6-4f47-afda-94cab9ce4622.bicep
index 12c0b141c..ed739987a 100644
--- a/services/StorageSync/storageSyncServices/templates/bicep/ServerSyncSessionResult_ea68cbf2-b8a6-4f47-afda-94cab9ce4622.bicep
+++ b/services/StorageSync/storageSyncServices/templates/bicep/ServerSyncSessionResult_ea68cbf2-b8a6-4f47-afda-94cab9ce4622.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageSync/storageSyncServices/templates/bicep/StorageSyncServerHeartbeat_eb627157-b9c8-4e8f-a00e-f9eb7df45c78.bicep b/services/StorageSync/storageSyncServices/templates/bicep/StorageSyncServerHeartbeat_eb627157-b9c8-4e8f-a00e-f9eb7df45c78.bicep
index bc0d6b5e6..eb3bf2e69 100644
--- a/services/StorageSync/storageSyncServices/templates/bicep/StorageSyncServerHeartbeat_eb627157-b9c8-4e8f-a00e-f9eb7df45c78.bicep
+++ b/services/StorageSync/storageSyncServices/templates/bicep/StorageSyncServerHeartbeat_eb627157-b9c8-4e8f-a00e-f9eb7df45c78.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StorageSync/storageSyncServices/templates/bicep/StorageSyncSyncSessionPerItemErrorsCount_0020bd6d-cd35-491e-9c71-f66bd64ed9a9.bicep b/services/StorageSync/storageSyncServices/templates/bicep/StorageSyncSyncSessionPerItemErrorsCount_0020bd6d-cd35-491e-9c71-f66bd64ed9a9.bicep
index 48fc402c5..47959cdb8 100644
--- a/services/StorageSync/storageSyncServices/templates/bicep/StorageSyncSyncSessionPerItemErrorsCount_0020bd6d-cd35-491e-9c71-f66bd64ed9a9.bicep
+++ b/services/StorageSync/storageSyncServices/templates/bicep/StorageSyncSyncSessionPerItemErrorsCount_0020bd6d-cd35-491e-9c71-f66bd64ed9a9.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/AMLCalloutFailedRequests_f0fa5804-9d5f-4e23-91c0-996c561585ef.json b/services/StreamAnalytics/streamingjobs/templates/arm/AMLCalloutFailedRequests_f0fa5804-9d5f-4e23-91c0-996c561585ef.json
index f604d592c..a2c56f221 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/AMLCalloutFailedRequests_f0fa5804-9d5f-4e23-91c0-996c561585ef.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/AMLCalloutFailedRequests_f0fa5804-9d5f-4e23-91c0-996c561585ef.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/ConversionErrors_7d30aeb3-31e5-4742-aa7e-825c2a6af42a.json b/services/StreamAnalytics/streamingjobs/templates/arm/ConversionErrors_7d30aeb3-31e5-4742-aa7e-825c2a6af42a.json
index 966f1755c..cd28dc7fd 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/ConversionErrors_7d30aeb3-31e5-4742-aa7e-825c2a6af42a.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/ConversionErrors_7d30aeb3-31e5-4742-aa7e-825c2a6af42a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/DeserializationError_381221db-fd9a-4d65-a16f-63e7492b0a49.json b/services/StreamAnalytics/streamingjobs/templates/arm/DeserializationError_381221db-fd9a-4d65-a16f-63e7492b0a49.json
index b77b7fd13..f4fcaad8a 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/DeserializationError_381221db-fd9a-4d65-a16f-63e7492b0a49.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/DeserializationError_381221db-fd9a-4d65-a16f-63e7492b0a49.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/Errors_ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.json b/services/StreamAnalytics/streamingjobs/templates/arm/Errors_ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.json
index c0dc6bc12..d01de8da0 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/Errors_ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/Errors_ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/InputEventsSourcesBacklogged_b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.json b/services/StreamAnalytics/streamingjobs/templates/arm/InputEventsSourcesBacklogged_b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.json
index 4f3e603df..da8bce574 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/InputEventsSourcesBacklogged_b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/InputEventsSourcesBacklogged_b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/InputEvents_1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.json b/services/StreamAnalytics/streamingjobs/templates/arm/InputEvents_1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.json
index e7972c02f..d8b254bf1 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/InputEvents_1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/InputEvents_1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/OutputEvents_c0dbcbee-eefd-4ee4-bd25-48d42444c882.json b/services/StreamAnalytics/streamingjobs/templates/arm/OutputEvents_c0dbcbee-eefd-4ee4-bd25-48d42444c882.json
index d8a4dfaf0..f46d774fb 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/OutputEvents_c0dbcbee-eefd-4ee4-bd25-48d42444c882.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/OutputEvents_c0dbcbee-eefd-4ee4-bd25-48d42444c882.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/OutputWatermarkDelaySeconds_289283c0-87ae-475f-b756-306783c7ec4d.json b/services/StreamAnalytics/streamingjobs/templates/arm/OutputWatermarkDelaySeconds_289283c0-87ae-475f-b756-306783c7ec4d.json
index f34e51214..26aa187c1 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/OutputWatermarkDelaySeconds_289283c0-87ae-475f-b756-306783c7ec4d.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/OutputWatermarkDelaySeconds_289283c0-87ae-475f-b756-306783c7ec4d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/ProcessCPUUsagePercentage_ea14eb56-238e-42b2-95ae-4d624d720d10.json b/services/StreamAnalytics/streamingjobs/templates/arm/ProcessCPUUsagePercentage_ea14eb56-238e-42b2-95ae-4d624d720d10.json
index b26e39b80..e9df4dd9f 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/ProcessCPUUsagePercentage_ea14eb56-238e-42b2-95ae-4d624d720d10.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/ProcessCPUUsagePercentage_ea14eb56-238e-42b2-95ae-4d624d720d10.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/arm/ResourceUtilization_4f2ead64-7412-4695-9855-47f36ade6f7e.json b/services/StreamAnalytics/streamingjobs/templates/arm/ResourceUtilization_4f2ead64-7412-4695-9855-47f36ade6f7e.json
index 7b4d0b8f7..b36861fa6 100644
--- a/services/StreamAnalytics/streamingjobs/templates/arm/ResourceUtilization_4f2ead64-7412-4695-9855-47f36ade6f7e.json
+++ b/services/StreamAnalytics/streamingjobs/templates/arm/ResourceUtilization_4f2ead64-7412-4695-9855-47f36ade6f7e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/AMLCalloutFailedRequests_f0fa5804-9d5f-4e23-91c0-996c561585ef.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/AMLCalloutFailedRequests_f0fa5804-9d5f-4e23-91c0-996c561585ef.bicep
index f759b7b15..ed0aa5698 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/AMLCalloutFailedRequests_f0fa5804-9d5f-4e23-91c0-996c561585ef.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/AMLCalloutFailedRequests_f0fa5804-9d5f-4e23-91c0-996c561585ef.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/ConversionErrors_7d30aeb3-31e5-4742-aa7e-825c2a6af42a.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/ConversionErrors_7d30aeb3-31e5-4742-aa7e-825c2a6af42a.bicep
index d5f7e0d63..ea4556642 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/ConversionErrors_7d30aeb3-31e5-4742-aa7e-825c2a6af42a.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/ConversionErrors_7d30aeb3-31e5-4742-aa7e-825c2a6af42a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/DeserializationError_381221db-fd9a-4d65-a16f-63e7492b0a49.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/DeserializationError_381221db-fd9a-4d65-a16f-63e7492b0a49.bicep
index 167a6a59a..15cddf2eb 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/DeserializationError_381221db-fd9a-4d65-a16f-63e7492b0a49.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/DeserializationError_381221db-fd9a-4d65-a16f-63e7492b0a49.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/Errors_ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/Errors_ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.bicep
index 97323e2cf..d6d448ea1 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/Errors_ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/Errors_ebd9a9cf-7aa1-4c75-8b76-33f94e4bb8ef.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/InputEventsSourcesBacklogged_b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/InputEventsSourcesBacklogged_b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.bicep
index 2363dd25b..5532c425a 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/InputEventsSourcesBacklogged_b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/InputEventsSourcesBacklogged_b46ef7a9-6597-4c4f-a5ca-9ca653e1b716.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/InputEvents_1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/InputEvents_1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.bicep
index ad09c0d4b..ca2bf146e 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/InputEvents_1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/InputEvents_1dc8c746-4caf-4355-9d82-bdeaa1cf95bf.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/OutputEvents_c0dbcbee-eefd-4ee4-bd25-48d42444c882.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/OutputEvents_c0dbcbee-eefd-4ee4-bd25-48d42444c882.bicep
index 7ea5a78d9..3d05a990d 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/OutputEvents_c0dbcbee-eefd-4ee4-bd25-48d42444c882.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/OutputEvents_c0dbcbee-eefd-4ee4-bd25-48d42444c882.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/OutputWatermarkDelaySeconds_289283c0-87ae-475f-b756-306783c7ec4d.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/OutputWatermarkDelaySeconds_289283c0-87ae-475f-b756-306783c7ec4d.bicep
index 83e8d56c3..0507c999b 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/OutputWatermarkDelaySeconds_289283c0-87ae-475f-b756-306783c7ec4d.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/OutputWatermarkDelaySeconds_289283c0-87ae-475f-b756-306783c7ec4d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/ProcessCPUUsagePercentage_ea14eb56-238e-42b2-95ae-4d624d720d10.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/ProcessCPUUsagePercentage_ea14eb56-238e-42b2-95ae-4d624d720d10.bicep
index 1f5a4a74f..ae56c288b 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/ProcessCPUUsagePercentage_ea14eb56-238e-42b2-95ae-4d624d720d10.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/ProcessCPUUsagePercentage_ea14eb56-238e-42b2-95ae-4d624d720d10.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/StreamAnalytics/streamingjobs/templates/bicep/ResourceUtilization_4f2ead64-7412-4695-9855-47f36ade6f7e.bicep b/services/StreamAnalytics/streamingjobs/templates/bicep/ResourceUtilization_4f2ead64-7412-4695-9855-47f36ade6f7e.bicep
index ba91d4fdb..22b355f1e 100644
--- a/services/StreamAnalytics/streamingjobs/templates/bicep/ResourceUtilization_4f2ead64-7412-4695-9855-47f36ade6f7e.bicep
+++ b/services/StreamAnalytics/streamingjobs/templates/bicep/ResourceUtilization_4f2ead64-7412-4695-9855-47f36ade6f7e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Synapse/workspaces/templates/arm/BuiltinSqlPoolDataProcessedBytes_8e2a7c77-890c-49d5-aadd-052764135995.json b/services/Synapse/workspaces/templates/arm/BuiltinSqlPoolDataProcessedBytes_8e2a7c77-890c-49d5-aadd-052764135995.json
index 9bac0d491..0167eacc6 100644
--- a/services/Synapse/workspaces/templates/arm/BuiltinSqlPoolDataProcessedBytes_8e2a7c77-890c-49d5-aadd-052764135995.json
+++ b/services/Synapse/workspaces/templates/arm/BuiltinSqlPoolDataProcessedBytes_8e2a7c77-890c-49d5-aadd-052764135995.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Synapse/workspaces/templates/arm/BuiltinSqlPoolLoginAttempts_6cf01e09-24d5-4097-bac1-1d39b0f577c8.json b/services/Synapse/workspaces/templates/arm/BuiltinSqlPoolLoginAttempts_6cf01e09-24d5-4097-bac1-1d39b0f577c8.json
index d9a6c1c4d..f2c21d597 100644
--- a/services/Synapse/workspaces/templates/arm/BuiltinSqlPoolLoginAttempts_6cf01e09-24d5-4097-bac1-1d39b0f577c8.json
+++ b/services/Synapse/workspaces/templates/arm/BuiltinSqlPoolLoginAttempts_6cf01e09-24d5-4097-bac1-1d39b0f577c8.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Synapse/workspaces/templates/arm/IntegrationActivityRunsEnded_21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.json b/services/Synapse/workspaces/templates/arm/IntegrationActivityRunsEnded_21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.json
index c1e076950..693409898 100644
--- a/services/Synapse/workspaces/templates/arm/IntegrationActivityRunsEnded_21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.json
+++ b/services/Synapse/workspaces/templates/arm/IntegrationActivityRunsEnded_21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Synapse/workspaces/templates/arm/IntegrationPipelineRunsEnded_16072e08-8ffb-48c9-afa9-fe2192b4513b.json b/services/Synapse/workspaces/templates/arm/IntegrationPipelineRunsEnded_16072e08-8ffb-48c9-afa9-fe2192b4513b.json
index b4c8f2480..0eea931bb 100644
--- a/services/Synapse/workspaces/templates/arm/IntegrationPipelineRunsEnded_16072e08-8ffb-48c9-afa9-fe2192b4513b.json
+++ b/services/Synapse/workspaces/templates/arm/IntegrationPipelineRunsEnded_16072e08-8ffb-48c9-afa9-fe2192b4513b.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Synapse/workspaces/templates/arm/IntegrationTriggerRunsEnded_583c6484-b7a3-4908-b4d4-9a8b08d1edf9.json b/services/Synapse/workspaces/templates/arm/IntegrationTriggerRunsEnded_583c6484-b7a3-4908-b4d4-9a8b08d1edf9.json
index 5da5d2a8b..459fbe925 100644
--- a/services/Synapse/workspaces/templates/arm/IntegrationTriggerRunsEnded_583c6484-b7a3-4908-b4d4-9a8b08d1edf9.json
+++ b/services/Synapse/workspaces/templates/arm/IntegrationTriggerRunsEnded_583c6484-b7a3-4908-b4d4-9a8b08d1edf9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Synapse/workspaces/templates/arm/sqlPools-CPUPercent_d8d1bc29-bfdb-48a5-89bd-7e34522d8085.json b/services/Synapse/workspaces/templates/arm/sqlPools-CPUPercent_d8d1bc29-bfdb-48a5-89bd-7e34522d8085.json
index b148f7104..8e72765c9 100644
--- a/services/Synapse/workspaces/templates/arm/sqlPools-CPUPercent_d8d1bc29-bfdb-48a5-89bd-7e34522d8085.json
+++ b/services/Synapse/workspaces/templates/arm/sqlPools-CPUPercent_d8d1bc29-bfdb-48a5-89bd-7e34522d8085.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Synapse/workspaces/templates/arm/sqlPools-DWUUsedPercent_64f41eaa-048f-4892-b80f-593e74ef4f84.json b/services/Synapse/workspaces/templates/arm/sqlPools-DWUUsedPercent_64f41eaa-048f-4892-b80f-593e74ef4f84.json
index 443fc72fc..9664d31aa 100644
--- a/services/Synapse/workspaces/templates/arm/sqlPools-DWUUsedPercent_64f41eaa-048f-4892-b80f-593e74ef4f84.json
+++ b/services/Synapse/workspaces/templates/arm/sqlPools-DWUUsedPercent_64f41eaa-048f-4892-b80f-593e74ef4f84.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Synapse/workspaces/templates/arm/sqlPools-MemoryUsedPercent_4c4d35e8-fdd7-4951-8a71-7b9add69d337.json b/services/Synapse/workspaces/templates/arm/sqlPools-MemoryUsedPercent_4c4d35e8-fdd7-4951-8a71-7b9add69d337.json
index 25147d0cc..6250f1a29 100644
--- a/services/Synapse/workspaces/templates/arm/sqlPools-MemoryUsedPercent_4c4d35e8-fdd7-4951-8a71-7b9add69d337.json
+++ b/services/Synapse/workspaces/templates/arm/sqlPools-MemoryUsedPercent_4c4d35e8-fdd7-4951-8a71-7b9add69d337.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Synapse/workspaces/templates/bicep/BuiltinSqlPoolDataProcessedBytes_8e2a7c77-890c-49d5-aadd-052764135995.bicep b/services/Synapse/workspaces/templates/bicep/BuiltinSqlPoolDataProcessedBytes_8e2a7c77-890c-49d5-aadd-052764135995.bicep
index 7cbaa0deb..e40421b0d 100644
--- a/services/Synapse/workspaces/templates/bicep/BuiltinSqlPoolDataProcessedBytes_8e2a7c77-890c-49d5-aadd-052764135995.bicep
+++ b/services/Synapse/workspaces/templates/bicep/BuiltinSqlPoolDataProcessedBytes_8e2a7c77-890c-49d5-aadd-052764135995.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Synapse/workspaces/templates/bicep/BuiltinSqlPoolLoginAttempts_6cf01e09-24d5-4097-bac1-1d39b0f577c8.bicep b/services/Synapse/workspaces/templates/bicep/BuiltinSqlPoolLoginAttempts_6cf01e09-24d5-4097-bac1-1d39b0f577c8.bicep
index 8f0a27c7b..ae001c7cb 100644
--- a/services/Synapse/workspaces/templates/bicep/BuiltinSqlPoolLoginAttempts_6cf01e09-24d5-4097-bac1-1d39b0f577c8.bicep
+++ b/services/Synapse/workspaces/templates/bicep/BuiltinSqlPoolLoginAttempts_6cf01e09-24d5-4097-bac1-1d39b0f577c8.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Synapse/workspaces/templates/bicep/IntegrationActivityRunsEnded_21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.bicep b/services/Synapse/workspaces/templates/bicep/IntegrationActivityRunsEnded_21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.bicep
index fe9950a3f..c28bb64c9 100644
--- a/services/Synapse/workspaces/templates/bicep/IntegrationActivityRunsEnded_21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.bicep
+++ b/services/Synapse/workspaces/templates/bicep/IntegrationActivityRunsEnded_21280a1a-d4e5-4ec3-83f5-f8d22ae0340a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Synapse/workspaces/templates/bicep/IntegrationPipelineRunsEnded_16072e08-8ffb-48c9-afa9-fe2192b4513b.bicep b/services/Synapse/workspaces/templates/bicep/IntegrationPipelineRunsEnded_16072e08-8ffb-48c9-afa9-fe2192b4513b.bicep
index a7658eb49..8ebc20df5 100644
--- a/services/Synapse/workspaces/templates/bicep/IntegrationPipelineRunsEnded_16072e08-8ffb-48c9-afa9-fe2192b4513b.bicep
+++ b/services/Synapse/workspaces/templates/bicep/IntegrationPipelineRunsEnded_16072e08-8ffb-48c9-afa9-fe2192b4513b.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Synapse/workspaces/templates/bicep/IntegrationTriggerRunsEnded_583c6484-b7a3-4908-b4d4-9a8b08d1edf9.bicep b/services/Synapse/workspaces/templates/bicep/IntegrationTriggerRunsEnded_583c6484-b7a3-4908-b4d4-9a8b08d1edf9.bicep
index afba5cf4f..d0c5278e6 100644
--- a/services/Synapse/workspaces/templates/bicep/IntegrationTriggerRunsEnded_583c6484-b7a3-4908-b4d4-9a8b08d1edf9.bicep
+++ b/services/Synapse/workspaces/templates/bicep/IntegrationTriggerRunsEnded_583c6484-b7a3-4908-b4d4-9a8b08d1edf9.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Synapse/workspaces/templates/bicep/sqlPools-CPUPercent_d8d1bc29-bfdb-48a5-89bd-7e34522d8085.bicep b/services/Synapse/workspaces/templates/bicep/sqlPools-CPUPercent_d8d1bc29-bfdb-48a5-89bd-7e34522d8085.bicep
index 4747aa9e0..bad45fefc 100644
--- a/services/Synapse/workspaces/templates/bicep/sqlPools-CPUPercent_d8d1bc29-bfdb-48a5-89bd-7e34522d8085.bicep
+++ b/services/Synapse/workspaces/templates/bicep/sqlPools-CPUPercent_d8d1bc29-bfdb-48a5-89bd-7e34522d8085.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Synapse/workspaces/templates/bicep/sqlPools-DWUUsedPercent_64f41eaa-048f-4892-b80f-593e74ef4f84.bicep b/services/Synapse/workspaces/templates/bicep/sqlPools-DWUUsedPercent_64f41eaa-048f-4892-b80f-593e74ef4f84.bicep
index 4e71fe543..391da3407 100644
--- a/services/Synapse/workspaces/templates/bicep/sqlPools-DWUUsedPercent_64f41eaa-048f-4892-b80f-593e74ef4f84.bicep
+++ b/services/Synapse/workspaces/templates/bicep/sqlPools-DWUUsedPercent_64f41eaa-048f-4892-b80f-593e74ef4f84.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Synapse/workspaces/templates/bicep/sqlPools-MemoryUsedPercent_4c4d35e8-fdd7-4951-8a71-7b9add69d337.bicep b/services/Synapse/workspaces/templates/bicep/sqlPools-MemoryUsedPercent_4c4d35e8-fdd7-4951-8a71-7b9add69d337.bicep
index 9a3932974..6976ae020 100644
--- a/services/Synapse/workspaces/templates/bicep/sqlPools-MemoryUsedPercent_4c4d35e8-fdd7-4951-8a71-7b9add69d337.bicep
+++ b/services/Synapse/workspaces/templates/bicep/sqlPools-MemoryUsedPercent_4c4d35e8-fdd7-4951-8a71-7b9add69d337.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/serverFarms/templates/arm/BytesReceived_7bdc68c3-7679-482d-82e4-92a8229db9d7.json b/services/Web/serverFarms/templates/arm/BytesReceived_7bdc68c3-7679-482d-82e4-92a8229db9d7.json
index 1d62e89d7..c9efe145b 100644
--- a/services/Web/serverFarms/templates/arm/BytesReceived_7bdc68c3-7679-482d-82e4-92a8229db9d7.json
+++ b/services/Web/serverFarms/templates/arm/BytesReceived_7bdc68c3-7679-482d-82e4-92a8229db9d7.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/serverFarms/templates/arm/BytesSent_520cc4d4-2caa-42df-b8b7-86dbc4786ce6.json b/services/Web/serverFarms/templates/arm/BytesSent_520cc4d4-2caa-42df-b8b7-86dbc4786ce6.json
index b252d3adb..bdbb9ba18 100644
--- a/services/Web/serverFarms/templates/arm/BytesSent_520cc4d4-2caa-42df-b8b7-86dbc4786ce6.json
+++ b/services/Web/serverFarms/templates/arm/BytesSent_520cc4d4-2caa-42df-b8b7-86dbc4786ce6.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/serverFarms/templates/arm/CpuPercentage_8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.json b/services/Web/serverFarms/templates/arm/CpuPercentage_8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.json
index cb536bc2e..03ab70b99 100644
--- a/services/Web/serverFarms/templates/arm/CpuPercentage_8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.json
+++ b/services/Web/serverFarms/templates/arm/CpuPercentage_8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/serverFarms/templates/arm/DiskQueueLength_14dbacac-2559-4537-9be9-7d08bdd0888d.json b/services/Web/serverFarms/templates/arm/DiskQueueLength_14dbacac-2559-4537-9be9-7d08bdd0888d.json
index e5ccf04fa..76b93856c 100644
--- a/services/Web/serverFarms/templates/arm/DiskQueueLength_14dbacac-2559-4537-9be9-7d08bdd0888d.json
+++ b/services/Web/serverFarms/templates/arm/DiskQueueLength_14dbacac-2559-4537-9be9-7d08bdd0888d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/serverFarms/templates/arm/HttpQueueLength_e85efb6a-239a-41e0-8cdd-b1792c41ec41.json b/services/Web/serverFarms/templates/arm/HttpQueueLength_e85efb6a-239a-41e0-8cdd-b1792c41ec41.json
index d2e6a654b..8a283d715 100644
--- a/services/Web/serverFarms/templates/arm/HttpQueueLength_e85efb6a-239a-41e0-8cdd-b1792c41ec41.json
+++ b/services/Web/serverFarms/templates/arm/HttpQueueLength_e85efb6a-239a-41e0-8cdd-b1792c41ec41.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/serverFarms/templates/arm/MemoryPercentage_b87ecc60-7558-4cb4-8ef9-3185c4c19579.json b/services/Web/serverFarms/templates/arm/MemoryPercentage_b87ecc60-7558-4cb4-8ef9-3185c4c19579.json
index 9fc853a87..a9d4d2394 100644
--- a/services/Web/serverFarms/templates/arm/MemoryPercentage_b87ecc60-7558-4cb4-8ef9-3185c4c19579.json
+++ b/services/Web/serverFarms/templates/arm/MemoryPercentage_b87ecc60-7558-4cb4-8ef9-3185c4c19579.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/serverFarms/templates/arm/SocketOutboundAll_96257455-b2cf-4f35-9c64-00eea637471a.json b/services/Web/serverFarms/templates/arm/SocketOutboundAll_96257455-b2cf-4f35-9c64-00eea637471a.json
index 27fec72c1..528dc5efc 100644
--- a/services/Web/serverFarms/templates/arm/SocketOutboundAll_96257455-b2cf-4f35-9c64-00eea637471a.json
+++ b/services/Web/serverFarms/templates/arm/SocketOutboundAll_96257455-b2cf-4f35-9c64-00eea637471a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/serverFarms/templates/arm/TcpEstablished_f03350e9-f936-4ac0-a64f-2d2df1fc9f75.json b/services/Web/serverFarms/templates/arm/TcpEstablished_f03350e9-f936-4ac0-a64f-2d2df1fc9f75.json
index b666c5f41..fcc10f121 100644
--- a/services/Web/serverFarms/templates/arm/TcpEstablished_f03350e9-f936-4ac0-a64f-2d2df1fc9f75.json
+++ b/services/Web/serverFarms/templates/arm/TcpEstablished_f03350e9-f936-4ac0-a64f-2d2df1fc9f75.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/serverFarms/templates/arm/TcpTimeWait_2a129b1b-36a7-4048-9403-004dc5e6b0b2.json b/services/Web/serverFarms/templates/arm/TcpTimeWait_2a129b1b-36a7-4048-9403-004dc5e6b0b2.json
index 573da1ace..c075f9102 100644
--- a/services/Web/serverFarms/templates/arm/TcpTimeWait_2a129b1b-36a7-4048-9403-004dc5e6b0b2.json
+++ b/services/Web/serverFarms/templates/arm/TcpTimeWait_2a129b1b-36a7-4048-9403-004dc5e6b0b2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/serverFarms/templates/bicep/BytesReceived_7bdc68c3-7679-482d-82e4-92a8229db9d7.bicep b/services/Web/serverFarms/templates/bicep/BytesReceived_7bdc68c3-7679-482d-82e4-92a8229db9d7.bicep
index b626b07b6..33d96a42a 100644
--- a/services/Web/serverFarms/templates/bicep/BytesReceived_7bdc68c3-7679-482d-82e4-92a8229db9d7.bicep
+++ b/services/Web/serverFarms/templates/bicep/BytesReceived_7bdc68c3-7679-482d-82e4-92a8229db9d7.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/serverFarms/templates/bicep/BytesSent_520cc4d4-2caa-42df-b8b7-86dbc4786ce6.bicep b/services/Web/serverFarms/templates/bicep/BytesSent_520cc4d4-2caa-42df-b8b7-86dbc4786ce6.bicep
index bb3305b42..dd4ca80c5 100644
--- a/services/Web/serverFarms/templates/bicep/BytesSent_520cc4d4-2caa-42df-b8b7-86dbc4786ce6.bicep
+++ b/services/Web/serverFarms/templates/bicep/BytesSent_520cc4d4-2caa-42df-b8b7-86dbc4786ce6.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/serverFarms/templates/bicep/CpuPercentage_8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.bicep b/services/Web/serverFarms/templates/bicep/CpuPercentage_8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.bicep
index 204beab97..e5510ad33 100644
--- a/services/Web/serverFarms/templates/bicep/CpuPercentage_8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.bicep
+++ b/services/Web/serverFarms/templates/bicep/CpuPercentage_8748b7d6-ef2a-4548-bf8e-dc6eecd2a651.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/serverFarms/templates/bicep/DiskQueueLength_14dbacac-2559-4537-9be9-7d08bdd0888d.bicep b/services/Web/serverFarms/templates/bicep/DiskQueueLength_14dbacac-2559-4537-9be9-7d08bdd0888d.bicep
index d3dfebba3..7f42b665f 100644
--- a/services/Web/serverFarms/templates/bicep/DiskQueueLength_14dbacac-2559-4537-9be9-7d08bdd0888d.bicep
+++ b/services/Web/serverFarms/templates/bicep/DiskQueueLength_14dbacac-2559-4537-9be9-7d08bdd0888d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/serverFarms/templates/bicep/HttpQueueLength_e85efb6a-239a-41e0-8cdd-b1792c41ec41.bicep b/services/Web/serverFarms/templates/bicep/HttpQueueLength_e85efb6a-239a-41e0-8cdd-b1792c41ec41.bicep
index eb515ce37..2a73346d3 100644
--- a/services/Web/serverFarms/templates/bicep/HttpQueueLength_e85efb6a-239a-41e0-8cdd-b1792c41ec41.bicep
+++ b/services/Web/serverFarms/templates/bicep/HttpQueueLength_e85efb6a-239a-41e0-8cdd-b1792c41ec41.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/serverFarms/templates/bicep/MemoryPercentage_b87ecc60-7558-4cb4-8ef9-3185c4c19579.bicep b/services/Web/serverFarms/templates/bicep/MemoryPercentage_b87ecc60-7558-4cb4-8ef9-3185c4c19579.bicep
index 32a47fea4..a9ac4a6d2 100644
--- a/services/Web/serverFarms/templates/bicep/MemoryPercentage_b87ecc60-7558-4cb4-8ef9-3185c4c19579.bicep
+++ b/services/Web/serverFarms/templates/bicep/MemoryPercentage_b87ecc60-7558-4cb4-8ef9-3185c4c19579.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/serverFarms/templates/bicep/SocketOutboundAll_96257455-b2cf-4f35-9c64-00eea637471a.bicep b/services/Web/serverFarms/templates/bicep/SocketOutboundAll_96257455-b2cf-4f35-9c64-00eea637471a.bicep
index 76cb65043..084616a10 100644
--- a/services/Web/serverFarms/templates/bicep/SocketOutboundAll_96257455-b2cf-4f35-9c64-00eea637471a.bicep
+++ b/services/Web/serverFarms/templates/bicep/SocketOutboundAll_96257455-b2cf-4f35-9c64-00eea637471a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/serverFarms/templates/bicep/TcpEstablished_f03350e9-f936-4ac0-a64f-2d2df1fc9f75.bicep b/services/Web/serverFarms/templates/bicep/TcpEstablished_f03350e9-f936-4ac0-a64f-2d2df1fc9f75.bicep
index 783958540..e67c1521a 100644
--- a/services/Web/serverFarms/templates/bicep/TcpEstablished_f03350e9-f936-4ac0-a64f-2d2df1fc9f75.bicep
+++ b/services/Web/serverFarms/templates/bicep/TcpEstablished_f03350e9-f936-4ac0-a64f-2d2df1fc9f75.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/serverFarms/templates/bicep/TcpTimeWait_2a129b1b-36a7-4048-9403-004dc5e6b0b2.bicep b/services/Web/serverFarms/templates/bicep/TcpTimeWait_2a129b1b-36a7-4048-9403-004dc5e6b0b2.bicep
index 858fe61a7..6edf18e40 100644
--- a/services/Web/serverFarms/templates/bicep/TcpTimeWait_2a129b1b-36a7-4048-9403-004dc5e6b0b2.bicep
+++ b/services/Web/serverFarms/templates/bicep/TcpTimeWait_2a129b1b-36a7-4048-9403-004dc5e6b0b2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/arm/AppConnections_a74bd8f3-cab7-46e6-ac1e-7527d2385bee.json b/services/Web/sites/templates/arm/AppConnections_a74bd8f3-cab7-46e6-ac1e-7527d2385bee.json
index ff29e0637..c47b19bbc 100644
--- a/services/Web/sites/templates/arm/AppConnections_a74bd8f3-cab7-46e6-ac1e-7527d2385bee.json
+++ b/services/Web/sites/templates/arm/AppConnections_a74bd8f3-cab7-46e6-ac1e-7527d2385bee.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/AverageResponseTime_b16f8234-e6c6-4723-933e-e5f8c179f23d.json b/services/Web/sites/templates/arm/AverageResponseTime_b16f8234-e6c6-4723-933e-e5f8c179f23d.json
index ecc7d47ca..064a16d9d 100644
--- a/services/Web/sites/templates/arm/AverageResponseTime_b16f8234-e6c6-4723-933e-e5f8c179f23d.json
+++ b/services/Web/sites/templates/arm/AverageResponseTime_b16f8234-e6c6-4723-933e-e5f8c179f23d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/BytesReceived_a9177e32-e3fa-425a-a02e-727ff3515ae0.json b/services/Web/sites/templates/arm/BytesReceived_a9177e32-e3fa-425a-a02e-727ff3515ae0.json
index 1eaa02ec2..c708feced 100644
--- a/services/Web/sites/templates/arm/BytesReceived_a9177e32-e3fa-425a-a02e-727ff3515ae0.json
+++ b/services/Web/sites/templates/arm/BytesReceived_a9177e32-e3fa-425a-a02e-727ff3515ae0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/BytesSent_49f62a85-7edf-4afc-9201-7a8939d6a42a.json b/services/Web/sites/templates/arm/BytesSent_49f62a85-7edf-4afc-9201-7a8939d6a42a.json
index 43c3c342e..3202620c9 100644
--- a/services/Web/sites/templates/arm/BytesSent_49f62a85-7edf-4afc-9201-7a8939d6a42a.json
+++ b/services/Web/sites/templates/arm/BytesSent_49f62a85-7edf-4afc-9201-7a8939d6a42a.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/CpuTime_48fcc15e-f043-4bb5-a628-6aefc60432c1.json b/services/Web/sites/templates/arm/CpuTime_48fcc15e-f043-4bb5-a628-6aefc60432c1.json
index 99e8993e7..9c1f48f03 100644
--- a/services/Web/sites/templates/arm/CpuTime_48fcc15e-f043-4bb5-a628-6aefc60432c1.json
+++ b/services/Web/sites/templates/arm/CpuTime_48fcc15e-f043-4bb5-a628-6aefc60432c1.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/CurrentAssemblies_b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.json b/services/Web/sites/templates/arm/CurrentAssemblies_b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.json
index 68e1653c3..f7d12d2f4 100644
--- a/services/Web/sites/templates/arm/CurrentAssemblies_b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.json
+++ b/services/Web/sites/templates/arm/CurrentAssemblies_b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/FileSystemUsage_b0c0fca3-1832-4a18-8832-5eebd2c1370a.json b/services/Web/sites/templates/arm/FileSystemUsage_b0c0fca3-1832-4a18-8832-5eebd2c1370a.json
index 22c8cec3f..7527f219b 100644
--- a/services/Web/sites/templates/arm/FileSystemUsage_b0c0fca3-1832-4a18-8832-5eebd2c1370a.json
+++ b/services/Web/sites/templates/arm/FileSystemUsage_b0c0fca3-1832-4a18-8832-5eebd2c1370a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/FunctionExecutionCount_1e71d59c-b29f-4b43-9f49-7aa0da50c88c.json b/services/Web/sites/templates/arm/FunctionExecutionCount_1e71d59c-b29f-4b43-9f49-7aa0da50c88c.json
index 228e050aa..13f232b50 100644
--- a/services/Web/sites/templates/arm/FunctionExecutionCount_1e71d59c-b29f-4b43-9f49-7aa0da50c88c.json
+++ b/services/Web/sites/templates/arm/FunctionExecutionCount_1e71d59c-b29f-4b43-9f49-7aa0da50c88c.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/FunctionExecutionUnits_12241b03-3f62-4100-9cf3-7798a7796600.json b/services/Web/sites/templates/arm/FunctionExecutionUnits_12241b03-3f62-4100-9cf3-7798a7796600.json
index 2fb94c395..859afd4a4 100644
--- a/services/Web/sites/templates/arm/FunctionExecutionUnits_12241b03-3f62-4100-9cf3-7798a7796600.json
+++ b/services/Web/sites/templates/arm/FunctionExecutionUnits_12241b03-3f62-4100-9cf3-7798a7796600.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/Handles_dc560ab2-18ad-49ae-9937-9b9a770faaab.json b/services/Web/sites/templates/arm/Handles_dc560ab2-18ad-49ae-9937-9b9a770faaab.json
index 7a67f4d2e..fcc213805 100644
--- a/services/Web/sites/templates/arm/Handles_dc560ab2-18ad-49ae-9937-9b9a770faaab.json
+++ b/services/Web/sites/templates/arm/Handles_dc560ab2-18ad-49ae-9937-9b9a770faaab.json
@@ -203,7 +203,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/Http2xx_e4fa68d2-55cd-4371-9574-95ae5c34d4ae.json b/services/Web/sites/templates/arm/Http2xx_e4fa68d2-55cd-4371-9574-95ae5c34d4ae.json
index 2dda4a477..f9182ad9b 100644
--- a/services/Web/sites/templates/arm/Http2xx_e4fa68d2-55cd-4371-9574-95ae5c34d4ae.json
+++ b/services/Web/sites/templates/arm/Http2xx_e4fa68d2-55cd-4371-9574-95ae5c34d4ae.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/Http3xx_0853a13e-b316-4ea0-98a2-9d722a508d1e.json b/services/Web/sites/templates/arm/Http3xx_0853a13e-b316-4ea0-98a2-9d722a508d1e.json
index fbfddc013..0040342e5 100644
--- a/services/Web/sites/templates/arm/Http3xx_0853a13e-b316-4ea0-98a2-9d722a508d1e.json
+++ b/services/Web/sites/templates/arm/Http3xx_0853a13e-b316-4ea0-98a2-9d722a508d1e.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/Http401_a8024ffc-b3b7-48eb-8f24-ae7da834cde2.json b/services/Web/sites/templates/arm/Http401_a8024ffc-b3b7-48eb-8f24-ae7da834cde2.json
index 66e9dda39..ed6cb3dee 100644
--- a/services/Web/sites/templates/arm/Http401_a8024ffc-b3b7-48eb-8f24-ae7da834cde2.json
+++ b/services/Web/sites/templates/arm/Http401_a8024ffc-b3b7-48eb-8f24-ae7da834cde2.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/Http406_02ef5600-fed6-474a-8fbb-5ed088b04d0d.json b/services/Web/sites/templates/arm/Http406_02ef5600-fed6-474a-8fbb-5ed088b04d0d.json
index 5050c15f2..54ba7cf12 100644
--- a/services/Web/sites/templates/arm/Http406_02ef5600-fed6-474a-8fbb-5ed088b04d0d.json
+++ b/services/Web/sites/templates/arm/Http406_02ef5600-fed6-474a-8fbb-5ed088b04d0d.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/MemoryWorkingSet_93768520-ab75-4e4e-b39b-a210a32379c0.json b/services/Web/sites/templates/arm/MemoryWorkingSet_93768520-ab75-4e4e-b39b-a210a32379c0.json
index e25a9c6cf..2fd477348 100644
--- a/services/Web/sites/templates/arm/MemoryWorkingSet_93768520-ab75-4e4e-b39b-a210a32379c0.json
+++ b/services/Web/sites/templates/arm/MemoryWorkingSet_93768520-ab75-4e4e-b39b-a210a32379c0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/PrivateBytes_3acdc4ab-514c-42c3-82e1-cb41fa338c2f.json b/services/Web/sites/templates/arm/PrivateBytes_3acdc4ab-514c-42c3-82e1-cb41fa338c2f.json
index 843c3be31..261f4e776 100644
--- a/services/Web/sites/templates/arm/PrivateBytes_3acdc4ab-514c-42c3-82e1-cb41fa338c2f.json
+++ b/services/Web/sites/templates/arm/PrivateBytes_3acdc4ab-514c-42c3-82e1-cb41fa338c2f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/RequestsInApplicationQueue_2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.json b/services/Web/sites/templates/arm/RequestsInApplicationQueue_2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.json
index 2b8fa47c0..b63b78ccc 100644
--- a/services/Web/sites/templates/arm/RequestsInApplicationQueue_2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.json
+++ b/services/Web/sites/templates/arm/RequestsInApplicationQueue_2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/Requests_fa87c863-2d21-4b9d-897f-452fd35b06c3.json b/services/Web/sites/templates/arm/Requests_fa87c863-2d21-4b9d-897f-452fd35b06c3.json
index e4cece540..f136f204e 100644
--- a/services/Web/sites/templates/arm/Requests_fa87c863-2d21-4b9d-897f-452fd35b06c3.json
+++ b/services/Web/sites/templates/arm/Requests_fa87c863-2d21-4b9d-897f-452fd35b06c3.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/Threads_9e412261-433b-45fd-8944-2f891bf14a56.json b/services/Web/sites/templates/arm/Threads_9e412261-433b-45fd-8944-2f891bf14a56.json
index 3c0b5a107..84894c6be 100644
--- a/services/Web/sites/templates/arm/Threads_9e412261-433b-45fd-8944-2f891bf14a56.json
+++ b/services/Web/sites/templates/arm/Threads_9e412261-433b-45fd-8944-2f891bf14a56.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/WorkflowRunsFailureRate_89ec4b6f-d1b2-4402-8a1d-48440624fc31.json b/services/Web/sites/templates/arm/WorkflowRunsFailureRate_89ec4b6f-d1b2-4402-8a1d-48440624fc31.json
index 9dff3d3ba..0cbb02e5e 100644
--- a/services/Web/sites/templates/arm/WorkflowRunsFailureRate_89ec4b6f-d1b2-4402-8a1d-48440624fc31.json
+++ b/services/Web/sites/templates/arm/WorkflowRunsFailureRate_89ec4b6f-d1b2-4402-8a1d-48440624fc31.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/WorkflowTriggersFailureRate_8a492278-c49f-4e4c-8fd5-a1680590864a.json b/services/Web/sites/templates/arm/WorkflowTriggersFailureRate_8a492278-c49f-4e4c-8fd5-a1680590864a.json
index 42f97a779..fa48a9454 100644
--- a/services/Web/sites/templates/arm/WorkflowTriggersFailureRate_8a492278-c49f-4e4c-8fd5-a1680590864a.json
+++ b/services/Web/sites/templates/arm/WorkflowTriggersFailureRate_8a492278-c49f-4e4c-8fd5-a1680590864a.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/slots-AverageMemoryWorkingSet_e6f23a76-11f3-471e-b7d7-ebc787487069.json b/services/Web/sites/templates/arm/slots-AverageMemoryWorkingSet_e6f23a76-11f3-471e-b7d7-ebc787487069.json
index 58bc8d52d..ed4be57c5 100644
--- a/services/Web/sites/templates/arm/slots-AverageMemoryWorkingSet_e6f23a76-11f3-471e-b7d7-ebc787487069.json
+++ b/services/Web/sites/templates/arm/slots-AverageMemoryWorkingSet_e6f23a76-11f3-471e-b7d7-ebc787487069.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/slots-HealthCheckStatus_ff5238a3-e40f-47c7-a142-f7a19b7764f9.json b/services/Web/sites/templates/arm/slots-HealthCheckStatus_ff5238a3-e40f-47c7-a142-f7a19b7764f9.json
index a79d16099..41996b71a 100644
--- a/services/Web/sites/templates/arm/slots-HealthCheckStatus_ff5238a3-e40f-47c7-a142-f7a19b7764f9.json
+++ b/services/Web/sites/templates/arm/slots-HealthCheckStatus_ff5238a3-e40f-47c7-a142-f7a19b7764f9.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/slots-Http403_67ca6d43-ab88-4fb8-9c18-2862765681e6.json b/services/Web/sites/templates/arm/slots-Http403_67ca6d43-ab88-4fb8-9c18-2862765681e6.json
index 5e5559284..4caac8ad7 100644
--- a/services/Web/sites/templates/arm/slots-Http403_67ca6d43-ab88-4fb8-9c18-2862765681e6.json
+++ b/services/Web/sites/templates/arm/slots-Http403_67ca6d43-ab88-4fb8-9c18-2862765681e6.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/slots-Http404_265b54e0-33a0-44b3-9f7b-ce53328439e3.json b/services/Web/sites/templates/arm/slots-Http404_265b54e0-33a0-44b3-9f7b-ce53328439e3.json
index da4e6dd85..73e7abf66 100644
--- a/services/Web/sites/templates/arm/slots-Http404_265b54e0-33a0-44b3-9f7b-ce53328439e3.json
+++ b/services/Web/sites/templates/arm/slots-Http404_265b54e0-33a0-44b3-9f7b-ce53328439e3.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/slots-Http4xx_0bdd95e0-1d48-40e5-85c7-cd8008b966b0.json b/services/Web/sites/templates/arm/slots-Http4xx_0bdd95e0-1d48-40e5-85c7-cd8008b966b0.json
index ca471efe2..c48425e43 100644
--- a/services/Web/sites/templates/arm/slots-Http4xx_0bdd95e0-1d48-40e5-85c7-cd8008b966b0.json
+++ b/services/Web/sites/templates/arm/slots-Http4xx_0bdd95e0-1d48-40e5-85c7-cd8008b966b0.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/slots-Http5xx_fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.json b/services/Web/sites/templates/arm/slots-Http5xx_fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.json
index 1a79e392f..cefa44e72 100644
--- a/services/Web/sites/templates/arm/slots-Http5xx_fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.json
+++ b/services/Web/sites/templates/arm/slots-Http5xx_fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/arm/slots-HttpResponseTime_b4e2bc80-9307-44d8-89f1-04c7133f37fc.json b/services/Web/sites/templates/arm/slots-HttpResponseTime_b4e2bc80-9307-44d8-89f1-04c7133f37fc.json
index e992e2e48..933c2721b 100644
--- a/services/Web/sites/templates/arm/slots-HttpResponseTime_b4e2bc80-9307-44d8-89f1-04c7133f37fc.json
+++ b/services/Web/sites/templates/arm/slots-HttpResponseTime_b4e2bc80-9307-44d8-89f1-04c7133f37fc.json
@@ -183,7 +183,7 @@
     },
     {
       "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-      "apiVersion": "2020-06-01",
+      "apiVersion": "2023-07-01",
       "name": "[variables('pidDeploymentName')]",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/services/Web/sites/templates/bicep/AppConnections_a74bd8f3-cab7-46e6-ac1e-7527d2385bee.bicep b/services/Web/sites/templates/bicep/AppConnections_a74bd8f3-cab7-46e6-ac1e-7527d2385bee.bicep
index 47e64b291..84146159d 100644
--- a/services/Web/sites/templates/bicep/AppConnections_a74bd8f3-cab7-46e6-ac1e-7527d2385bee.bicep
+++ b/services/Web/sites/templates/bicep/AppConnections_a74bd8f3-cab7-46e6-ac1e-7527d2385bee.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/AverageResponseTime_b16f8234-e6c6-4723-933e-e5f8c179f23d.bicep b/services/Web/sites/templates/bicep/AverageResponseTime_b16f8234-e6c6-4723-933e-e5f8c179f23d.bicep
index e1d3d85f8..1a88c31b7 100644
--- a/services/Web/sites/templates/bicep/AverageResponseTime_b16f8234-e6c6-4723-933e-e5f8c179f23d.bicep
+++ b/services/Web/sites/templates/bicep/AverageResponseTime_b16f8234-e6c6-4723-933e-e5f8c179f23d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/BytesReceived_a9177e32-e3fa-425a-a02e-727ff3515ae0.bicep b/services/Web/sites/templates/bicep/BytesReceived_a9177e32-e3fa-425a-a02e-727ff3515ae0.bicep
index 7e73b47f8..c2f84bfb8 100644
--- a/services/Web/sites/templates/bicep/BytesReceived_a9177e32-e3fa-425a-a02e-727ff3515ae0.bicep
+++ b/services/Web/sites/templates/bicep/BytesReceived_a9177e32-e3fa-425a-a02e-727ff3515ae0.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/BytesSent_49f62a85-7edf-4afc-9201-7a8939d6a42a.bicep b/services/Web/sites/templates/bicep/BytesSent_49f62a85-7edf-4afc-9201-7a8939d6a42a.bicep
index 6ed409b1c..4f149ba8b 100644
--- a/services/Web/sites/templates/bicep/BytesSent_49f62a85-7edf-4afc-9201-7a8939d6a42a.bicep
+++ b/services/Web/sites/templates/bicep/BytesSent_49f62a85-7edf-4afc-9201-7a8939d6a42a.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/CpuTime_48fcc15e-f043-4bb5-a628-6aefc60432c1.bicep b/services/Web/sites/templates/bicep/CpuTime_48fcc15e-f043-4bb5-a628-6aefc60432c1.bicep
index a5e362b97..d0d6d087e 100644
--- a/services/Web/sites/templates/bicep/CpuTime_48fcc15e-f043-4bb5-a628-6aefc60432c1.bicep
+++ b/services/Web/sites/templates/bicep/CpuTime_48fcc15e-f043-4bb5-a628-6aefc60432c1.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/CurrentAssemblies_b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.bicep b/services/Web/sites/templates/bicep/CurrentAssemblies_b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.bicep
index 669559c31..c99bf0a3a 100644
--- a/services/Web/sites/templates/bicep/CurrentAssemblies_b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.bicep
+++ b/services/Web/sites/templates/bicep/CurrentAssemblies_b63593ad-6c47-49e3-9b4a-e8b19f0cc7db.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/FileSystemUsage_b0c0fca3-1832-4a18-8832-5eebd2c1370a.bicep b/services/Web/sites/templates/bicep/FileSystemUsage_b0c0fca3-1832-4a18-8832-5eebd2c1370a.bicep
index a6d8d60fb..3ed434c58 100644
--- a/services/Web/sites/templates/bicep/FileSystemUsage_b0c0fca3-1832-4a18-8832-5eebd2c1370a.bicep
+++ b/services/Web/sites/templates/bicep/FileSystemUsage_b0c0fca3-1832-4a18-8832-5eebd2c1370a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/FunctionExecutionCount_1e71d59c-b29f-4b43-9f49-7aa0da50c88c.bicep b/services/Web/sites/templates/bicep/FunctionExecutionCount_1e71d59c-b29f-4b43-9f49-7aa0da50c88c.bicep
index 75651a9ca..a78f1825a 100644
--- a/services/Web/sites/templates/bicep/FunctionExecutionCount_1e71d59c-b29f-4b43-9f49-7aa0da50c88c.bicep
+++ b/services/Web/sites/templates/bicep/FunctionExecutionCount_1e71d59c-b29f-4b43-9f49-7aa0da50c88c.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/FunctionExecutionUnits_12241b03-3f62-4100-9cf3-7798a7796600.bicep b/services/Web/sites/templates/bicep/FunctionExecutionUnits_12241b03-3f62-4100-9cf3-7798a7796600.bicep
index 094cc7a2d..813a6146f 100644
--- a/services/Web/sites/templates/bicep/FunctionExecutionUnits_12241b03-3f62-4100-9cf3-7798a7796600.bicep
+++ b/services/Web/sites/templates/bicep/FunctionExecutionUnits_12241b03-3f62-4100-9cf3-7798a7796600.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/Handles_dc560ab2-18ad-49ae-9937-9b9a770faaab.bicep b/services/Web/sites/templates/bicep/Handles_dc560ab2-18ad-49ae-9937-9b9a770faaab.bicep
index c7ff99437..d6a4c5c53 100644
--- a/services/Web/sites/templates/bicep/Handles_dc560ab2-18ad-49ae-9937-9b9a770faaab.bicep
+++ b/services/Web/sites/templates/bicep/Handles_dc560ab2-18ad-49ae-9937-9b9a770faaab.bicep
@@ -131,7 +131,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/Http2xx_e4fa68d2-55cd-4371-9574-95ae5c34d4ae.bicep b/services/Web/sites/templates/bicep/Http2xx_e4fa68d2-55cd-4371-9574-95ae5c34d4ae.bicep
index 700f5394d..a12c16729 100644
--- a/services/Web/sites/templates/bicep/Http2xx_e4fa68d2-55cd-4371-9574-95ae5c34d4ae.bicep
+++ b/services/Web/sites/templates/bicep/Http2xx_e4fa68d2-55cd-4371-9574-95ae5c34d4ae.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/Http3xx_0853a13e-b316-4ea0-98a2-9d722a508d1e.bicep b/services/Web/sites/templates/bicep/Http3xx_0853a13e-b316-4ea0-98a2-9d722a508d1e.bicep
index da7cf98b0..2e5d47a72 100644
--- a/services/Web/sites/templates/bicep/Http3xx_0853a13e-b316-4ea0-98a2-9d722a508d1e.bicep
+++ b/services/Web/sites/templates/bicep/Http3xx_0853a13e-b316-4ea0-98a2-9d722a508d1e.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/Http401_a8024ffc-b3b7-48eb-8f24-ae7da834cde2.bicep b/services/Web/sites/templates/bicep/Http401_a8024ffc-b3b7-48eb-8f24-ae7da834cde2.bicep
index f7383ffe6..4b14e15bf 100644
--- a/services/Web/sites/templates/bicep/Http401_a8024ffc-b3b7-48eb-8f24-ae7da834cde2.bicep
+++ b/services/Web/sites/templates/bicep/Http401_a8024ffc-b3b7-48eb-8f24-ae7da834cde2.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/Http406_02ef5600-fed6-474a-8fbb-5ed088b04d0d.bicep b/services/Web/sites/templates/bicep/Http406_02ef5600-fed6-474a-8fbb-5ed088b04d0d.bicep
index b38be07f8..04b90898e 100644
--- a/services/Web/sites/templates/bicep/Http406_02ef5600-fed6-474a-8fbb-5ed088b04d0d.bicep
+++ b/services/Web/sites/templates/bicep/Http406_02ef5600-fed6-474a-8fbb-5ed088b04d0d.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/MemoryWorkingSet_93768520-ab75-4e4e-b39b-a210a32379c0.bicep b/services/Web/sites/templates/bicep/MemoryWorkingSet_93768520-ab75-4e4e-b39b-a210a32379c0.bicep
index f5c601b36..8f6f16a1a 100644
--- a/services/Web/sites/templates/bicep/MemoryWorkingSet_93768520-ab75-4e4e-b39b-a210a32379c0.bicep
+++ b/services/Web/sites/templates/bicep/MemoryWorkingSet_93768520-ab75-4e4e-b39b-a210a32379c0.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/PrivateBytes_3acdc4ab-514c-42c3-82e1-cb41fa338c2f.bicep b/services/Web/sites/templates/bicep/PrivateBytes_3acdc4ab-514c-42c3-82e1-cb41fa338c2f.bicep
index 83922109b..b67b2ff15 100644
--- a/services/Web/sites/templates/bicep/PrivateBytes_3acdc4ab-514c-42c3-82e1-cb41fa338c2f.bicep
+++ b/services/Web/sites/templates/bicep/PrivateBytes_3acdc4ab-514c-42c3-82e1-cb41fa338c2f.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/RequestsInApplicationQueue_2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.bicep b/services/Web/sites/templates/bicep/RequestsInApplicationQueue_2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.bicep
index b06bf176e..2ec59ccc5 100644
--- a/services/Web/sites/templates/bicep/RequestsInApplicationQueue_2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.bicep
+++ b/services/Web/sites/templates/bicep/RequestsInApplicationQueue_2e62242b-6d20-44b5-86f9-f9a0de8ffe3f.bicep
@@ -124,7 +124,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/Requests_fa87c863-2d21-4b9d-897f-452fd35b06c3.bicep b/services/Web/sites/templates/bicep/Requests_fa87c863-2d21-4b9d-897f-452fd35b06c3.bicep
index 7c304969a..761a81402 100644
--- a/services/Web/sites/templates/bicep/Requests_fa87c863-2d21-4b9d-897f-452fd35b06c3.bicep
+++ b/services/Web/sites/templates/bicep/Requests_fa87c863-2d21-4b9d-897f-452fd35b06c3.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/Threads_9e412261-433b-45fd-8944-2f891bf14a56.bicep b/services/Web/sites/templates/bicep/Threads_9e412261-433b-45fd-8944-2f891bf14a56.bicep
index 73bad6943..08d8b1b8e 100644
--- a/services/Web/sites/templates/bicep/Threads_9e412261-433b-45fd-8944-2f891bf14a56.bicep
+++ b/services/Web/sites/templates/bicep/Threads_9e412261-433b-45fd-8944-2f891bf14a56.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/WorkflowRunsFailureRate_89ec4b6f-d1b2-4402-8a1d-48440624fc31.bicep b/services/Web/sites/templates/bicep/WorkflowRunsFailureRate_89ec4b6f-d1b2-4402-8a1d-48440624fc31.bicep
index 11adeb1b2..ee221a09d 100644
--- a/services/Web/sites/templates/bicep/WorkflowRunsFailureRate_89ec4b6f-d1b2-4402-8a1d-48440624fc31.bicep
+++ b/services/Web/sites/templates/bicep/WorkflowRunsFailureRate_89ec4b6f-d1b2-4402-8a1d-48440624fc31.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/WorkflowTriggersFailureRate_8a492278-c49f-4e4c-8fd5-a1680590864a.bicep b/services/Web/sites/templates/bicep/WorkflowTriggersFailureRate_8a492278-c49f-4e4c-8fd5-a1680590864a.bicep
index d45433d47..69a21fac0 100644
--- a/services/Web/sites/templates/bicep/WorkflowTriggersFailureRate_8a492278-c49f-4e4c-8fd5-a1680590864a.bicep
+++ b/services/Web/sites/templates/bicep/WorkflowTriggersFailureRate_8a492278-c49f-4e4c-8fd5-a1680590864a.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/slots-AverageMemoryWorkingSet_e6f23a76-11f3-471e-b7d7-ebc787487069.bicep b/services/Web/sites/templates/bicep/slots-AverageMemoryWorkingSet_e6f23a76-11f3-471e-b7d7-ebc787487069.bicep
index 6f22ac78a..d83c4d4a1 100644
--- a/services/Web/sites/templates/bicep/slots-AverageMemoryWorkingSet_e6f23a76-11f3-471e-b7d7-ebc787487069.bicep
+++ b/services/Web/sites/templates/bicep/slots-AverageMemoryWorkingSet_e6f23a76-11f3-471e-b7d7-ebc787487069.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/slots-HealthCheckStatus_ff5238a3-e40f-47c7-a142-f7a19b7764f9.bicep b/services/Web/sites/templates/bicep/slots-HealthCheckStatus_ff5238a3-e40f-47c7-a142-f7a19b7764f9.bicep
index c1d58d85a..cd8da718d 100644
--- a/services/Web/sites/templates/bicep/slots-HealthCheckStatus_ff5238a3-e40f-47c7-a142-f7a19b7764f9.bicep
+++ b/services/Web/sites/templates/bicep/slots-HealthCheckStatus_ff5238a3-e40f-47c7-a142-f7a19b7764f9.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/slots-Http403_67ca6d43-ab88-4fb8-9c18-2862765681e6.bicep b/services/Web/sites/templates/bicep/slots-Http403_67ca6d43-ab88-4fb8-9c18-2862765681e6.bicep
index 1e98c734f..680b0d640 100644
--- a/services/Web/sites/templates/bicep/slots-Http403_67ca6d43-ab88-4fb8-9c18-2862765681e6.bicep
+++ b/services/Web/sites/templates/bicep/slots-Http403_67ca6d43-ab88-4fb8-9c18-2862765681e6.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/slots-Http404_265b54e0-33a0-44b3-9f7b-ce53328439e3.bicep b/services/Web/sites/templates/bicep/slots-Http404_265b54e0-33a0-44b3-9f7b-ce53328439e3.bicep
index 4cf4a43ef..fbaf1aee6 100644
--- a/services/Web/sites/templates/bicep/slots-Http404_265b54e0-33a0-44b3-9f7b-ce53328439e3.bicep
+++ b/services/Web/sites/templates/bicep/slots-Http404_265b54e0-33a0-44b3-9f7b-ce53328439e3.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/slots-Http4xx_0bdd95e0-1d48-40e5-85c7-cd8008b966b0.bicep b/services/Web/sites/templates/bicep/slots-Http4xx_0bdd95e0-1d48-40e5-85c7-cd8008b966b0.bicep
index 8c45d03de..37d9b9b6f 100644
--- a/services/Web/sites/templates/bicep/slots-Http4xx_0bdd95e0-1d48-40e5-85c7-cd8008b966b0.bicep
+++ b/services/Web/sites/templates/bicep/slots-Http4xx_0bdd95e0-1d48-40e5-85c7-cd8008b966b0.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/slots-Http5xx_fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.bicep b/services/Web/sites/templates/bicep/slots-Http5xx_fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.bicep
index debc7cd0f..4719d1e80 100644
--- a/services/Web/sites/templates/bicep/slots-Http5xx_fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.bicep
+++ b/services/Web/sites/templates/bicep/slots-Http5xx_fe7cfeb1-c18f-4822-8e6c-fb73dcd175a8.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'
diff --git a/services/Web/sites/templates/bicep/slots-HttpResponseTime_b4e2bc80-9307-44d8-89f1-04c7133f37fc.bicep b/services/Web/sites/templates/bicep/slots-HttpResponseTime_b4e2bc80-9307-44d8-89f1-04c7133f37fc.bicep
index d0bf37b30..6bf904175 100644
--- a/services/Web/sites/templates/bicep/slots-HttpResponseTime_b4e2bc80-9307-44d8-89f1-04c7133f37fc.bicep
+++ b/services/Web/sites/templates/bicep/slots-HttpResponseTime_b4e2bc80-9307-44d8-89f1-04c7133f37fc.bicep
@@ -119,7 +119,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
 }
 
 var ambaTelemetryPidName = 'pid-8bb7cf8a-bcf7-4264-abcb-703ace2fc84d-${uniqueString(resourceGroup().id, alertName, currentDateTimeUtcNow)}'
-resource ambaTelemetryPid 'Microsoft.Resources/deployments@2020-06-01' =  if (telemetryOptOut == 'No') {
+resource ambaTelemetryPid 'Microsoft.Resources/deployments@2023-07-01' =  if (telemetryOptOut == 'No') {
   name: ambaTelemetryPidName
   tags: {
     _deployed_by_amba: 'true'