diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake
index c694613c46..76e2e05910 100644
--- a/ports/azure-core-amqp-cpp/portfile.cmake
+++ b/ports/azure-core-amqp-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 93af776c164942584025fdca8493a9ac6145bba5afc061d2d9a8976c887e818baef3b8797b56fc5278c5e01875dc8813b94f3919d581a5b8e660f6ca27ecd702
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/core/azure-core-amqp" "${SOURCE_PATH}/sdk/core/_")
+  file(RENAME "${SOURCE_PATH}/sdk/core" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/core/azure-core-amqp/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
         -DBUILD_TESTING=OFF
diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json
index ad2617618d..03df1ddc8b 100644
--- a/ports/azure-core-amqp-cpp/vcpkg.json
+++ b/ports/azure-core-amqp-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-core-amqp-cpp",
   "version-semver": "1.0.0-beta.3",
+  "port-version": 1,
   "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 e5f3fde4b4..9478984a15 100644
--- a/ports/azure-core-cpp/portfile.cmake
+++ b/ports/azure-core-cpp/portfile.cmake
@@ -12,8 +12,18 @@ vcpkg_check_features(
         winhttp BUILD_TRANSPORT_WINHTTP
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/core/azure-core" "${SOURCE_PATH}/sdk/core/_")
+  file(RENAME "${SOURCE_PATH}/sdk/core" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/core/azure-core/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DWARNINGS_AS_ERRORS=OFF
diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json
index 61569e9146..fe7e538531 100644
--- a/ports/azure-core-cpp/vcpkg.json
+++ b/ports/azure-core-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-core-cpp",
   "version-semver": "1.10.2",
-  "port-version": 4,
+  "port-version": 5,
   "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 de527c389e..88a9bf0485 100644
--- a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
+++ b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 645c616fe54024f30a6e4b9c2626bfeaf906086be7bbeccc4a1155178670fb70d9818938db2f9fa8e3b9593ca45e0b10042dcd67fde04d2542f6f72a74884697
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry" "${SOURCE_PATH}/sdk/core/_")
+  file(RENAME "${SOURCE_PATH}/sdk/core" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
index 43f19f7662..c678ba9de6 100644
--- a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
+++ b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-core-tracing-opentelemetry-cpp",
   "version-semver": "1.0.0-beta.4",
+  "port-version": 1,
   "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-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake
index a71124e383..06cc7bbce1 100644
--- a/ports/azure-identity-cpp/portfile.cmake
+++ b/ports/azure-identity-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 f3e12c0685ec7a1cde724feafbc84a8aa66688ed7b54bb9c4787d516aee3142310863013a5d49869e1a1e64af8f5ce908640fee64190bc9c2f9715e3afa833bc
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/identity/azure-identity")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/identity/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/identity/azure-identity" "${SOURCE_PATH}/sdk/identity/_")
+  file(RENAME "${SOURCE_PATH}/sdk/identity" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/identity/azure-identity/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
         -DBUILD_TESTING=OFF
diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json
index 998a923f5a..2cccb7b873 100644
--- a/ports/azure-identity-cpp/vcpkg.json
+++ b/ports/azure-identity-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-identity-cpp",
   "version-semver": "1.5.1",
+  "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-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake
index 94f05dec14..2eac053723 100644
--- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake
+++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 3677edf50218c39e378a968661c0ec0600b8760d3af33f204f3267e104449c0aef42b9520cb63b5e5810b89bf91f06979d009ffdd6d6d04d2c14e1a21f0e111f
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs" "${SOURCE_PATH}/sdk/eventhubs/_")
+  file(RENAME "${SOURCE_PATH}/sdk/eventhubs" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
         -DBUILD_TESTING=OFF
diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json
index af878a993a..4270cac373 100644
--- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json
+++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-messaging-eventhubs-cpp",
   "version-semver": "1.0.0-beta.2",
+  "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 ddc575363e..f1fc4d6680 100644
--- a/ports/azure-security-attestation-cpp/portfile.cmake
+++ b/ports/azure-security-attestation-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 bf5c0ab830122838045e3e5ff03aae38f81082b50b9b0c61fa21a8c101a2fd98ad98b136d49702665d720f59baa6a89c8af3f161a44c09d24ad747fb1828cbca
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/attestation/azure-security-attestation")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/attestation/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/attestation/azure-security-attestation" "${SOURCE_PATH}/sdk/attestation/_")
+  file(RENAME "${SOURCE_PATH}/sdk/attestation" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/attestation/azure-security-attestation/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
diff --git a/ports/azure-security-attestation-cpp/vcpkg.json b/ports/azure-security-attestation-cpp/vcpkg.json
index ccc84788bc..4ec72e8e77 100644
--- a/ports/azure-security-attestation-cpp/vcpkg.json
+++ b/ports/azure-security-attestation-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-security-attestation-cpp",
   "version-semver": "1.1.0",
+  "port-version": 1,
   "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 c232d70966..d1f7ae8370 100644
--- a/ports/azure-security-keyvault-administration-cpp/portfile.cmake
+++ b/ports/azure-security-keyvault-administration-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 1209811b470821f929ffd5d09df58ff19b19f13a657acf304fefd457ee533acb3e91774ca6d72d0106e42d601d0bd4d23fbd563f62a4c9a62d686afe61cb4e6c
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration" "${SOURCE_PATH}/sdk/keyvault/_")
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
diff --git a/ports/azure-security-keyvault-administration-cpp/vcpkg.json b/ports/azure-security-keyvault-administration-cpp/vcpkg.json
index ea4daed6b5..5f04262e57 100644
--- a/ports/azure-security-keyvault-administration-cpp/vcpkg.json
+++ b/ports/azure-security-keyvault-administration-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-security-keyvault-administration-cpp",
   "version-semver": "4.0.0-beta.3",
+  "port-version": 1,
   "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 2c8d0408e3..b0cba5d37a 100644
--- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake
+++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 bcfbeb47bbf0871113be3a7704b519af2b3209304be8f9c29874325e8efd3e4e440706aae1f86139076097b31e3777b85e3c9b01861bc5ace9113645d8a97260
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates" "${SOURCE_PATH}/sdk/keyvault/_")
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json
index 0b69efb1ca..841abd2114 100644
--- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json
+++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-security-keyvault-certificates-cpp",
   "version-semver": "4.2.0",
+  "port-version": 1,
   "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 b33975db40..08d8764a64 100644
--- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake
+++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 00fc21a1ecf4b40543a1a381777970739579f3384392cdb9a2eb44563d05a5ac648f797cb5198df27f74cd4b45d341b06e45f552ed2a878f2cfd50f3461ad4fd
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys" "${SOURCE_PATH}/sdk/keyvault/_")
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json
index c754a70e6b..76b30472e0 100644
--- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json
+++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-security-keyvault-keys-cpp",
   "version-semver": "4.4.0",
+  "port-version": 1,
   "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 5f5b3bf01d..4709ea977c 100644
--- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake
+++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 1f464e60f9cb234bb28c3daa5abb0a27fdb9c75327f7eb84b3d5215524457aae9b6c64617a35175341afcaf0da39373190c867fb1d5a1780b9395062a7420aaa
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets" "${SOURCE_PATH}/sdk/keyvault/_")
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json
index 943a299cfe..f912e27808 100644
--- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json
+++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-security-keyvault-secrets-cpp",
   "version-semver": "4.2.0",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Key Vault Secrets SDK for C++",
     "This library provides Azure Key Vault Secrets SDK."
diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake
index 5d7f8e1c7c..8b00f84e70 100644
--- a/ports/azure-storage-blobs-cpp/portfile.cmake
+++ b/ports/azure-storage-blobs-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 10126fa8f34357d941cc7ac031c7811cdbf5fe998d2b6741e9e97325c67df5ed9c490ec42034d9b1ba56716e7de3b7283eb9059554d32b2f4d907e839b64b59f
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-blobs")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-blobs" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-blobs/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
         -DBUILD_TESTING=OFF
diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json
index 42aa4e2c82..178263c79d 100644
--- a/ports/azure-storage-blobs-cpp/vcpkg.json
+++ b/ports/azure-storage-blobs-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-storage-blobs-cpp",
   "version-semver": "12.9.0",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Storage Blobs SDK for C++",
     "This library provides Azure Storage Blobs SDK."
diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake
index e1abaa343e..bc1ef69185 100644
--- a/ports/azure-storage-common-cpp/portfile.cmake
+++ b/ports/azure-storage-common-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 999bbd93b645849720d2fd4401b8f9e9f12ce31ea1362786cd1aa0392efd0a05de717d87b2db43a190c2a40f42477daddebcc00812efc4de3ccc08e7563001dd
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-common" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-common/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
         -DBUILD_TESTING=OFF
diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json
index 9dc02788bd..3040c4efb2 100644
--- a/ports/azure-storage-common-cpp/vcpkg.json
+++ b/ports/azure-storage-common-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-storage-common-cpp",
   "version-semver": "12.4.0",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Common Storage SDK for C++",
     "This library provides common Azure Storage-related abstractions for Azure SDK."
diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake
index 336c85c88e..adaf077d73 100644
--- a/ports/azure-storage-files-datalake-cpp/portfile.cmake
+++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 4539b8ba806abdf71cdf82e2bdcffe1adae1d19e6ea62f72cea6ac7e0beef32895d13cff53df4afe06b53ed5740c19bba858c09f75b74cd446d5c125e36ca2b3
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
         -DBUILD_TESTING=OFF
diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json
index aa21451a22..d9e2670e66 100644
--- a/ports/azure-storage-files-datalake-cpp/vcpkg.json
+++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-storage-files-datalake-cpp",
   "version-semver": "12.8.0",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Storage Files Data Lake SDK for C++",
     "This library provides Azure Storage Files Data Lake SDK."
diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake
index 4ee777c41c..77265ee56f 100644
--- a/ports/azure-storage-files-shares-cpp/portfile.cmake
+++ b/ports/azure-storage-files-shares-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 2482a7c437bd36e63efc8c77d917a09d73bde2bc12d49afd1e24cf0977656e991c59c15d34b52c1bd19c6988fe7c40c95b5edea8740977ffc676f3dd6758dc5e
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json
index b8729155f8..dca31f29e9 100644
--- a/ports/azure-storage-files-shares-cpp/vcpkg.json
+++ b/ports/azure-storage-files-shares-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-storage-files-shares-cpp",
   "version-semver": "12.7.0",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Storage Files Shares SDK for C++",
     "This library provides Azure Storage Files Shares SDK."
diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake
index 6642f2f257..f52d77dca6 100644
--- a/ports/azure-storage-queues-cpp/portfile.cmake
+++ b/ports/azure-storage-queues-cpp/portfile.cmake
@@ -5,8 +5,18 @@ vcpkg_from_github(
     SHA512 98f1b44f408418e43aedf57392c79a625348bbbe516a84d1682486d77655851546e191ea409397cc5c0d822d77bfe9ee2628e9a581334abe86d478418ac0ba9d
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-queues")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-queues" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-queues/"
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
         -DBUILD_TESTING=OFF
diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json
index 2680bb631d..003196aa8b 100644
--- a/ports/azure-storage-queues-cpp/vcpkg.json
+++ b/ports/azure-storage-queues-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-storage-queues-cpp",
   "version-semver": "12.1.0",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Storage Queues SDK for C++",
     "This library provides Azure Storage Queues SDK."
diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json
index 04e1e1ec13..7d8610a784 100644
--- a/versions/a-/azure-core-amqp-cpp.json
+++ b/versions/a-/azure-core-amqp-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f2454e03858a910421f6fd248968fd1cb7999ba7",
+      "version-semver": "1.0.0-beta.3",
+      "port-version": 1
+    },
     {
       "git-tree": "cdd44f43f4a8020582266cf5ac32d701281d2e88",
       "version-semver": "1.0.0-beta.3",
diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json
index 6527eb4372..a55a42a6f8 100644
--- a/versions/a-/azure-core-cpp.json
+++ b/versions/a-/azure-core-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5f406f6bf6084c74a6a234f35bc6e232fae15cae",
+      "version-semver": "1.10.2",
+      "port-version": 5
+    },
     {
       "git-tree": "dc5ce5e0d496bbae8d2cd2f8908f7a01b5cfbc48",
       "version-semver": "1.10.2",
diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json
index 9c465dd273..40978a2765 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": "001d1fc3f1ecbaa77894355634624bc5a7c7d7f2",
+      "version-semver": "1.0.0-beta.4",
+      "port-version": 1
+    },
     {
       "git-tree": "a17fe14abb083b59b9ef5d25157a6cd85acb3ee9",
       "version-semver": "1.0.0-beta.4",
diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json
index 07a947a7da..ba3078ee05 100644
--- a/versions/a-/azure-identity-cpp.json
+++ b/versions/a-/azure-identity-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5fd04f09c1fc0efef3008e8407828b368d75ee5d",
+      "version-semver": "1.5.1",
+      "port-version": 1
+    },
     {
       "git-tree": "2855fbb155aacc587ca1e2d518ab2e8369e6d8c0",
       "version-semver": "1.5.1",
diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json
index a4cf2dcd13..dd1e776927 100644
--- a/versions/a-/azure-messaging-eventhubs-cpp.json
+++ b/versions/a-/azure-messaging-eventhubs-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2e4e38f8b37bd9c3c6af8bd95887d9108ba1ca67",
+      "version-semver": "1.0.0-beta.2",
+      "port-version": 1
+    },
     {
       "git-tree": "983c9c2a6615afc22cd76bdbbef3f403a608bbbf",
       "version-semver": "1.0.0-beta.2",
diff --git a/versions/a-/azure-security-attestation-cpp.json b/versions/a-/azure-security-attestation-cpp.json
index 9b29c2e0aa..7ac326180f 100644
--- a/versions/a-/azure-security-attestation-cpp.json
+++ b/versions/a-/azure-security-attestation-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "812294d664f9765544343cfc8b5265edfb88d061",
+      "version-semver": "1.1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "11cd3682ae481f52a58478f4379bc21e627ed5f8",
       "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 2a41b8402a..c10aff06de 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": "478811ebfa9d552d2b1fcf03e1721cc9175b17bf",
+      "version-semver": "4.0.0-beta.3",
+      "port-version": 1
+    },
     {
       "git-tree": "6c7bbcafaacfef51314e05b648c3634a3d324916",
       "version-semver": "4.0.0-beta.3",
diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json
index d5da42e8d6..df7c006d2a 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": "b0dd2ae87c69a4637e82ea188db1ee1e2624ac2c",
+      "version-semver": "4.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "6f480f2686c90dc9985e9c827ecc2f3c086985f0",
       "version-semver": "4.2.0",
diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json
index 0e151e3988..947631e9c7 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": "7e455823cb2d81cf79f550f26d1fa3b9cff61e86",
+      "version-semver": "4.4.0",
+      "port-version": 1
+    },
     {
       "git-tree": "404efdca4682f39039fe7e76541db56b6cab3e3e",
       "version-semver": "4.4.0",
diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json
index c15689d0f3..f35b728831 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": "5c41c5b32fe02aeb4ab47a5ddaa19df33fac9ee7",
+      "version-semver": "4.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "a795e3eddbe6ced53ba732f9793679e78d79d359",
       "version-semver": "4.2.0",
diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json
index 819a6116f1..d2b76b365f 100644
--- a/versions/a-/azure-storage-blobs-cpp.json
+++ b/versions/a-/azure-storage-blobs-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "83ac6004707e784a7a57a72574548579a9ab79d0",
+      "version-semver": "12.9.0",
+      "port-version": 1
+    },
     {
       "git-tree": "b0699f9368ea7fbc2c6528711c29eb896c76d0a6",
       "version-semver": "12.9.0",
diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json
index 897b6d897d..ad6670f7c6 100644
--- a/versions/a-/azure-storage-common-cpp.json
+++ b/versions/a-/azure-storage-common-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "973a9aaaa49d33f6afdac2337795bd2ee26bbf7e",
+      "version-semver": "12.4.0",
+      "port-version": 1
+    },
     {
       "git-tree": "041e401b3394eefc002af8a93bccbb7edc0732b5",
       "version-semver": "12.4.0",
diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json
index 40c001be18..7c828495cb 100644
--- a/versions/a-/azure-storage-files-datalake-cpp.json
+++ b/versions/a-/azure-storage-files-datalake-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "980d78708b5b02d395f9bd7342c18dc35e48dcbd",
+      "version-semver": "12.8.0",
+      "port-version": 1
+    },
     {
       "git-tree": "0f289490671675363d6e2e07eb6277c569602878",
       "version-semver": "12.8.0",
diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json
index fe9af5f900..d691282b57 100644
--- a/versions/a-/azure-storage-files-shares-cpp.json
+++ b/versions/a-/azure-storage-files-shares-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7aad330cd95f2b69127ca9950d1c4295f5be937e",
+      "version-semver": "12.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "d1c2beb619e08e7c675312136c0cc427e3ee59e5",
       "version-semver": "12.7.0",
diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json
index f0454a1c53..f5c3a66bf0 100644
--- a/versions/a-/azure-storage-queues-cpp.json
+++ b/versions/a-/azure-storage-queues-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "116fd90e1af9c32dabd414ac99ef121d6bacf0bf",
+      "version-semver": "12.1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "31256aaa2dbb1508ea777fc03cbec8ddbfd9ca18",
       "version-semver": "12.1.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index c3f80b512d..75ea7b478e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -410,19 +410,19 @@
     },
     "azure-core-amqp-cpp": {
       "baseline": "1.0.0-beta.3",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-core-cpp": {
       "baseline": "1.10.2",
-      "port-version": 4
+      "port-version": 5
     },
     "azure-core-tracing-opentelemetry-cpp": {
       "baseline": "1.0.0-beta.4",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-identity-cpp": {
       "baseline": "1.5.1",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-iot-sdk-c": {
       "baseline": "2023-08-07",
@@ -438,35 +438,35 @@
     },
     "azure-messaging-eventhubs-cpp": {
       "baseline": "1.0.0-beta.2",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-security-attestation-cpp": {
       "baseline": "1.1.0",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-security-keyvault-administration-cpp": {
       "baseline": "4.0.0-beta.3",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-security-keyvault-certificates-cpp": {
       "baseline": "4.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-security-keyvault-keys-cpp": {
       "baseline": "4.4.0",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-security-keyvault-secrets-cpp": {
       "baseline": "4.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-blobs-cpp": {
       "baseline": "12.9.0",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-common-cpp": {
       "baseline": "12.4.0",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-cpp": {
       "baseline": "7.5.0",
@@ -474,15 +474,15 @@
     },
     "azure-storage-files-datalake-cpp": {
       "baseline": "12.8.0",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-files-shares-cpp": {
       "baseline": "12.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-queues-cpp": {
       "baseline": "12.1.0",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-uamqp-c": {
       "baseline": "2023-08-07",