diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake
index 94f05dec1430c5..43338b3c8f251c 100644
--- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake
+++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake
@@ -5,8 +5,10 @@ vcpkg_from_github(
     SHA512 3677edf50218c39e378a968661c0ec0600b8760d3af33f204f3267e104449c0aef42b9520cb63b5e5810b89bf91f06979d009ffdd6d6d04d2c14e1a21f0e111f
 )
 
+file(RENAME ${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs/ ${SOURCE_PATH}/sdk/eventhubs/eventhubs/)
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs/"
+    SOURCE_PATH "${SOURCE_PATH}/sdk/eventhubs/eventhubs/"
     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 af878a993af25f..4270cac3735138 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-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake
index 5d7f8e1c7c3d36..001e173b184226 100644
--- a/ports/azure-storage-blobs-cpp/portfile.cmake
+++ b/ports/azure-storage-blobs-cpp/portfile.cmake
@@ -5,8 +5,10 @@ vcpkg_from_github(
     SHA512 10126fa8f34357d941cc7ac031c7811cdbf5fe998d2b6741e9e97325c67df5ed9c490ec42034d9b1ba56716e7de3b7283eb9059554d32b2f4d907e839b64b59f
 )
 
+file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-blobs/ ${SOURCE_PATH}/sdk/storage/blobs/)
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-blobs/"
+    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/blobs/"
     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 42aa4e2c829a1e..178263c79d9286 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 e1abaa343e6089..14c71fb3632783 100644
--- a/ports/azure-storage-common-cpp/portfile.cmake
+++ b/ports/azure-storage-common-cpp/portfile.cmake
@@ -5,8 +5,10 @@ vcpkg_from_github(
     SHA512 999bbd93b645849720d2fd4401b8f9e9f12ce31ea1362786cd1aa0392efd0a05de717d87b2db43a190c2a40f42477daddebcc00812efc4de3ccc08e7563001dd
 )
 
+file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-common/ ${SOURCE_PATH}/sdk/storage/common/)
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-common/"
+    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/common/"
     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 9dc02788bd0193..3040c4efb2a1bf 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 336c85c88ef8f4..7e5fe730f17825 100644
--- a/ports/azure-storage-files-datalake-cpp/portfile.cmake
+++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake
@@ -5,8 +5,10 @@ vcpkg_from_github(
     SHA512 4539b8ba806abdf71cdf82e2bdcffe1adae1d19e6ea62f72cea6ac7e0beef32895d13cff53df4afe06b53ed5740c19bba858c09f75b74cd446d5c125e36ca2b3
 )
 
+file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/ ${SOURCE_PATH}/sdk/storage/files-datalake/)
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/"
+    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/files-datalake/"
     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 aa21451a22685a..d9e2670e66d621 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 4ee777c41cf264..4c36e8ff01b784 100644
--- a/ports/azure-storage-files-shares-cpp/portfile.cmake
+++ b/ports/azure-storage-files-shares-cpp/portfile.cmake
@@ -5,8 +5,10 @@ vcpkg_from_github(
     SHA512 2482a7c437bd36e63efc8c77d917a09d73bde2bc12d49afd1e24cf0977656e991c59c15d34b52c1bd19c6988fe7c40c95b5edea8740977ffc676f3dd6758dc5e
 )
 
+file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/ ${SOURCE_PATH}/sdk/storage/files-shares/)
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/"
+    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/files-shares/"
     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 b8729155f8aa6a..dca31f29e90dc5 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 6642f2f2575fca..f69d3fa8f91d69 100644
--- a/ports/azure-storage-queues-cpp/portfile.cmake
+++ b/ports/azure-storage-queues-cpp/portfile.cmake
@@ -5,8 +5,10 @@ vcpkg_from_github(
     SHA512 98f1b44f408418e43aedf57392c79a625348bbbe516a84d1682486d77655851546e191ea409397cc5c0d822d77bfe9ee2628e9a581334abe86d478418ac0ba9d
 )
 
+file(RENAME ${SOURCE_PATH}/sdk/storage/azure-storage-queues/ ${SOURCE_PATH}/sdk/storage/queues/)
+
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-queues/"
+    SOURCE_PATH "${SOURCE_PATH}/sdk/storage/queues/"
     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 2680bb631d83a9..003196aa8b9977 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-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json
index a4cf2dcd13c5ff..024cfe675bdd12 100644
--- a/versions/a-/azure-messaging-eventhubs-cpp.json
+++ b/versions/a-/azure-messaging-eventhubs-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b1715fef4799906d6fde88fa59d4033c875be7b6",
+      "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-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json
index 819a6116f1accb..f604e00e7e1170 100644
--- a/versions/a-/azure-storage-blobs-cpp.json
+++ b/versions/a-/azure-storage-blobs-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fdb23253d087d42e823bcdeb4cf30315bfd2b738",
+      "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 897b6d897d40df..370e52f0a89130 100644
--- a/versions/a-/azure-storage-common-cpp.json
+++ b/versions/a-/azure-storage-common-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "836c01e2a89e5e454222f43d2231add4269b238c",
+      "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 40c001be187256..7ce59ae0aea27c 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": "4a8bbf51949c994e5f7679d1895ef0e88a2155fe",
+      "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 fe9af5f9005dea..43133cee97d46d 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": "bea08d88a4cfbd285811868764d3957a29a36350",
+      "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 f0454a1c53cba3..a08d91334e4d78 100644
--- a/versions/a-/azure-storage-queues-cpp.json
+++ b/versions/a-/azure-storage-queues-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "96a1d1bf5643358e1701eae820f9caaebfd2bb66",
+      "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 b5137609ced686..e59647d7cf3a2b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -438,7 +438,7 @@
     },
     "azure-messaging-eventhubs-cpp": {
       "baseline": "1.0.0-beta.2",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-security-attestation-cpp": {
       "baseline": "1.1.0",
@@ -462,11 +462,11 @@
     },
     "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",