diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake
index 8e1dbfb178df74..fbb2cb76b6bccf 100644
--- a/ports/azure-core-amqp-cpp/portfile.cmake
+++ b/ports/azure-core-amqp-cpp/portfile.cmake
@@ -11,6 +11,9 @@ vcpkg_from_github(
       set_version.patch
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json
index a8357c35faebb4..43f6632880425c 100644
--- a/ports/azure-core-amqp-cpp/vcpkg.json
+++ b/ports/azure-core-amqp-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-core-amqp-cpp",
   "version-semver": "1.0.0-beta.11",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "Microsoft Azure AMQP SDK for C++",
     "This library provides AMQP functionality to Azure SDK services."
diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake
index 8fe30e11fe4c84..c64b0ebfe2b00c 100644
--- a/ports/azure-core-cpp/portfile.cmake
+++ b/ports/azure-core-cpp/portfile.cmake
@@ -18,6 +18,9 @@ vcpkg_check_features(
         winhttp BUILD_TRANSPORT_WINHTTP
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json
index a4b2596e899a13..9c8e0c169d6b4c 100644
--- a/ports/azure-core-cpp/vcpkg.json
+++ b/ports/azure-core-cpp/vcpkg.json
@@ -5,6 +5,7 @@
   ],
   "name": "azure-core-cpp",
   "version-semver": "1.16.1",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Core SDK for C++",
     "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."
diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
index 9cb2fff0c06557..87322817d552ff 100644
--- a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
+++ b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
@@ -12,6 +12,9 @@ vcpkg_from_github(
       set_version.patch
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
index 6d119f5bd676ea..f4b6fdb1e17e05 100644
--- a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
+++ b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-core-tracing-opentelemetry-cpp",
   "version-semver": "1.0.0-beta.4",
-  "port-version": 5,
+  "port-version": 6,
   "description": [
     "Microsoft Azure Core Tracing OpenTelemetry SDK for C++",
     "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs."
diff --git a/ports/azure-data-tables-cpp/portfile.cmake b/ports/azure-data-tables-cpp/portfile.cmake
index 8abcc34dec019d..85b9867d123238 100644
--- a/ports/azure-data-tables-cpp/portfile.cmake
+++ b/ports/azure-data-tables-cpp/portfile.cmake
@@ -9,6 +9,9 @@ vcpkg_from_github(
     HEAD_REF main
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/tables/azure-data-tables")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/tables/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-data-tables-cpp/vcpkg.json b/ports/azure-data-tables-cpp/vcpkg.json
index bdb426c58c4a88..beb0dd0ea96542 100644
--- a/ports/azure-data-tables-cpp/vcpkg.json
+++ b/ports/azure-data-tables-cpp/vcpkg.json
@@ -5,6 +5,7 @@
   ],
   "name": "azure-data-tables-cpp",
   "version-semver": "1.0.0-beta.6",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Data Tables SDK for C++",
     "This library provides Azure Data Tables SDK."
diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake
index 416c96f11ae1f1..861889c83904d7 100644
--- a/ports/azure-identity-cpp/portfile.cmake
+++ b/ports/azure-identity-cpp/portfile.cmake
@@ -9,6 +9,9 @@ vcpkg_from_github(
     HEAD_REF main
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/identity/azure-identity")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/identity/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json
index ca1982c28dfe26..cbb481d773a766 100644
--- a/ports/azure-identity-cpp/vcpkg.json
+++ b/ports/azure-identity-cpp/vcpkg.json
@@ -5,6 +5,7 @@
   ],
   "name": "azure-identity-cpp",
   "version-semver": "1.13.2",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Identity SDK for C++",
     "This library provides common authentication-related abstractions for Azure SDK."
diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake
index 248ec2fbdceff8..0aef5fc5ec6ba0 100644
--- a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake
+++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake
@@ -12,6 +12,9 @@ vcpkg_from_github(
       set_version.patch
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json
index 96636239929c17..2cec121b2c8a04 100644
--- a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json
+++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-messaging-eventhubs-checkpointstore-blob-cpp",
   "version-semver": "1.0.0-beta.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": [
     "Microsoft Azure Messaging Event Hubs Blob Checkpoint Store SDK for C++",
     "This library provides an Azure-Storage-Blobs based implementation of an Azure Messaging Event Hubs SDK Checkpoint Store."
diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake
index ea0bf92a4fb2b3..b31ced6e936202 100644
--- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake
+++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake
@@ -9,6 +9,9 @@ vcpkg_from_github(
     HEAD_REF main
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json
index 0bf6ceacecd23c..d345bda7505fe0 100644
--- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json
+++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json
@@ -5,6 +5,7 @@
   ],
   "name": "azure-messaging-eventhubs-cpp",
   "version-semver": "1.0.0-beta.10",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Messaging Event Hubs SDK for C++",
     "This library provides Azure Messaging Event Hubs SDK."
diff --git a/ports/azure-security-attestation-cpp/portfile.cmake b/ports/azure-security-attestation-cpp/portfile.cmake
index cc04c8f3300b2e..1671cb7846efb0 100644
--- a/ports/azure-security-attestation-cpp/portfile.cmake
+++ b/ports/azure-security-attestation-cpp/portfile.cmake
@@ -13,6 +13,9 @@ vcpkg_from_github(
         set_version.patch
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/attestation/azure-security-attestation")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/attestation/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-security-attestation-cpp/vcpkg.json b/ports/azure-security-attestation-cpp/vcpkg.json
index 0fc6fd35ad6335..05ae25d51435bf 100644
--- a/ports/azure-security-attestation-cpp/vcpkg.json
+++ b/ports/azure-security-attestation-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-security-attestation-cpp",
   "version-semver": "1.1.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": [
     "Microsoft Azure Attestation Service SDK for C++",
     "This library provides API access to the Microsoft Azure Attestation service."
diff --git a/ports/azure-security-keyvault-administration-cpp/portfile.cmake b/ports/azure-security-keyvault-administration-cpp/portfile.cmake
index 0a992359288d86..8e9efbb0f34377 100644
--- a/ports/azure-security-keyvault-administration-cpp/portfile.cmake
+++ b/ports/azure-security-keyvault-administration-cpp/portfile.cmake
@@ -11,6 +11,9 @@ vcpkg_from_github(
       set_version.patch
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-security-keyvault-administration-cpp/vcpkg.json b/ports/azure-security-keyvault-administration-cpp/vcpkg.json
index 1207ed01c40625..9f1f876865ff16 100644
--- a/ports/azure-security-keyvault-administration-cpp/vcpkg.json
+++ b/ports/azure-security-keyvault-administration-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-security-keyvault-administration-cpp",
   "version-semver": "4.0.0-beta.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "Microsoft Azure Key Vault Administration SDK for C++",
     "This library provides Azure Key Vault Administration SDK."
diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake
index 1960aae4e67315..cc8f8e60dcd03f 100644
--- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake
+++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake
@@ -12,6 +12,9 @@ vcpkg_from_github(
       set_version.patch
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json
index fa45bcd04f2090..3b0a4898d118c9 100644
--- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json
+++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-security-keyvault-certificates-cpp",
   "version-semver": "4.2.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": [
     "Microsoft Azure Key Vault Certificates SDK for C++",
     "This library provides Azure Key Vault Certificates SDK."
diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake
index ff865983bcd37f..9baa9459754af3 100644
--- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake
+++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake
@@ -12,6 +12,9 @@ vcpkg_from_github(
       set_version.patch
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json
index badfdb225590fb..76d949805491dc 100644
--- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json
+++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-security-keyvault-keys-cpp",
   "version-semver": "4.4.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": [
     "Microsoft Azure Key Vault Keys SDK for C++",
     "This library provides Azure Key Vault Keys SDK."
diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake
index 5f17c65e035164..4b87673ae7ccdf 100644
--- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake
+++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake
@@ -12,6 +12,9 @@ vcpkg_from_github(
       set_version.patch
 )
 
+file(GLOB_RECURSE unused "${SOURCE_PATH}/cgmanifest.json")
+file(REMOVE_RECURSE ${unused})
+
 if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
   file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json
index 1bc75c16d822b7..b3c00b84a94837 100644
--- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json
+++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-security-keyvault-secrets-cpp",
   "version-semver": "4.2.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": [
     "Microsoft Azure Key Vault Secrets SDK for C++",
     "This library provides Azure Key Vault Secrets SDK."
diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json
index f29fed1b0e3c26..41bbe385728c55 100644
--- a/versions/a-/azure-core-amqp-cpp.json
+++ b/versions/a-/azure-core-amqp-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8784cf060aabe228c11c6b86734b42322b2def93",
+      "version-semver": "1.0.0-beta.11",
+      "port-version": 2
+    },
     {
       "git-tree": "bbf82106a42fe16154f3bcb57d4f49d560f91ccd",
       "version-semver": "1.0.0-beta.11",
diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json
index 546a0be7ec78ea..55773b7d5b4e81 100644
--- a/versions/a-/azure-core-cpp.json
+++ b/versions/a-/azure-core-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "95146de814385c1d8c5b61987915ee94ad53f51b",
+      "version-semver": "1.16.1",
+      "port-version": 1
+    },
     {
       "git-tree": "052e45a725e8f9ad5cb1b2afe4964b6699451daf",
       "version-semver": "1.16.1",
diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json
index 10b1209bdebc2c..29f017c12942e0 100644
--- a/versions/a-/azure-core-tracing-opentelemetry-cpp.json
+++ b/versions/a-/azure-core-tracing-opentelemetry-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ede2451347b069aee8361c7f828022a2a66571f1",
+      "version-semver": "1.0.0-beta.4",
+      "port-version": 6
+    },
     {
       "git-tree": "787e5bf9dd2696add1ff8d3bea711b9611c15c43",
       "version-semver": "1.0.0-beta.4",
diff --git a/versions/a-/azure-data-tables-cpp.json b/versions/a-/azure-data-tables-cpp.json
index ee1c00504eeacb..ece72df69d0429 100644
--- a/versions/a-/azure-data-tables-cpp.json
+++ b/versions/a-/azure-data-tables-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4e816f4ffece11c36fde3d0474699df8143d93b0",
+      "version-semver": "1.0.0-beta.6",
+      "port-version": 1
+    },
     {
       "git-tree": "6b1c91c8c8fa88e99e366f7af96a5d8410c55fe4",
       "version-semver": "1.0.0-beta.6",
diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json
index a9dc52e977fa67..1193783adc13e9 100644
--- a/versions/a-/azure-identity-cpp.json
+++ b/versions/a-/azure-identity-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f38aea95854843dc590ad620f31610d4d258d7b5",
+      "version-semver": "1.13.2",
+      "port-version": 1
+    },
     {
       "git-tree": "f8d41b92363e5cc96ef228b224f844716af0765b",
       "version-semver": "1.13.2",
diff --git a/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json
index 137923c2c8b355..b994c08f7297d0 100644
--- a/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json
+++ b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d7f985fec59c28892a33b4d84ca74ee50732ce53",
+      "version-semver": "1.0.0-beta.1",
+      "port-version": 5
+    },
     {
       "git-tree": "56d7d109e00a8bb0d208eb212840290cdadd4cc6",
       "version-semver": "1.0.0-beta.1",
diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json
index 6a55cac3693558..2d623f2eaa46aa 100644
--- a/versions/a-/azure-messaging-eventhubs-cpp.json
+++ b/versions/a-/azure-messaging-eventhubs-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4c6ca01888f18e483475041d70d067aa6e82cd39",
+      "version-semver": "1.0.0-beta.10",
+      "port-version": 1
+    },
     {
       "git-tree": "0f4c7ad624ca6bba7d771e9c90ea24ae8f71dff8",
       "version-semver": "1.0.0-beta.10",
diff --git a/versions/a-/azure-security-attestation-cpp.json b/versions/a-/azure-security-attestation-cpp.json
index 8b8055710dc73d..79618d2efae8c1 100644
--- a/versions/a-/azure-security-attestation-cpp.json
+++ b/versions/a-/azure-security-attestation-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e7e77ecada6df45dc792ff0cc3886ea8599a8400",
+      "version-semver": "1.1.0",
+      "port-version": 7
+    },
     {
       "git-tree": "aa1f9163cca2993354c108a3f9b3dfcf561635f0",
       "version-semver": "1.1.0",
diff --git a/versions/a-/azure-security-keyvault-administration-cpp.json b/versions/a-/azure-security-keyvault-administration-cpp.json
index 24d934348dfdf2..3142b6f51ab137 100644
--- a/versions/a-/azure-security-keyvault-administration-cpp.json
+++ b/versions/a-/azure-security-keyvault-administration-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "78e178b9237395ecd9972f1837413ee8a7ab2609",
+      "version-semver": "4.0.0-beta.5",
+      "port-version": 2
+    },
     {
       "git-tree": "a6ee89f64c55c1202b7d71fd7551916ea5e62d93",
       "version-semver": "4.0.0-beta.5",
diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json
index 47dc4d2499f554..8d64ce7714afbd 100644
--- a/versions/a-/azure-security-keyvault-certificates-cpp.json
+++ b/versions/a-/azure-security-keyvault-certificates-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e368552772af26a0ff36343dac31ae6bf091465a",
+      "version-semver": "4.2.1",
+      "port-version": 4
+    },
     {
       "git-tree": "04bc0d3763fbdd8773ae5ef3f00107f3a2bb3c70",
       "version-semver": "4.2.1",
diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json
index 99fd3e5b1a61ac..3217a3ef0309a0 100644
--- a/versions/a-/azure-security-keyvault-keys-cpp.json
+++ b/versions/a-/azure-security-keyvault-keys-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec8f38a5b4c22a93e568eaf331f160903a6aa36d",
+      "version-semver": "4.4.1",
+      "port-version": 4
+    },
     {
       "git-tree": "4afe6efdcdc0e5df2c45c177a8ad5f4815fb98b2",
       "version-semver": "4.4.1",
diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json
index b1d600e844e460..8d5a71e0992044 100644
--- a/versions/a-/azure-security-keyvault-secrets-cpp.json
+++ b/versions/a-/azure-security-keyvault-secrets-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b8ca778246b9180d61f4ce847361f298adcea7c7",
+      "version-semver": "4.2.1",
+      "port-version": 4
+    },
     {
       "git-tree": "59fc00624617f87b2f6cc2001dc559d87b78c604",
       "version-semver": "4.2.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4198358605daaa..410e7b89abe64e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -498,23 +498,23 @@
     },
     "azure-core-amqp-cpp": {
       "baseline": "1.0.0-beta.11",
-      "port-version": 1
+      "port-version": 2
     },
     "azure-core-cpp": {
       "baseline": "1.16.1",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-core-tracing-opentelemetry-cpp": {
       "baseline": "1.0.0-beta.4",
-      "port-version": 5
+      "port-version": 6
     },
     "azure-data-tables-cpp": {
       "baseline": "1.0.0-beta.6",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-identity-cpp": {
       "baseline": "1.13.2",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-iot-sdk-c": {
       "baseline": "2025-03-31",
@@ -534,31 +534,31 @@
     },
     "azure-messaging-eventhubs-checkpointstore-blob-cpp": {
       "baseline": "1.0.0-beta.1",
-      "port-version": 4
+      "port-version": 5
     },
     "azure-messaging-eventhubs-cpp": {
       "baseline": "1.0.0-beta.10",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-security-attestation-cpp": {
       "baseline": "1.1.0",
-      "port-version": 6
+      "port-version": 7
     },
     "azure-security-keyvault-administration-cpp": {
       "baseline": "4.0.0-beta.5",
-      "port-version": 1
+      "port-version": 2
     },
     "azure-security-keyvault-certificates-cpp": {
       "baseline": "4.2.1",
-      "port-version": 3
+      "port-version": 4
     },
     "azure-security-keyvault-keys-cpp": {
       "baseline": "4.4.1",
-      "port-version": 3
+      "port-version": 4
     },
     "azure-security-keyvault-secrets-cpp": {
       "baseline": "4.2.1",
-      "port-version": 3
+      "port-version": 4
     },
     "azure-storage-blobs-cpp": {
       "baseline": "12.14.0",