diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json
index 90bb18eb9c28ea..a5563598d4fc81 100644
--- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json
+++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json
@@ -1,18 +1,17 @@
 {
   "name": "azure-security-keyvault-keys-cpp",
   "version-semver": "4.0.0-beta.4",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Key Vault Keys SDK for C++",
     "This library provides Azure Key Vault Keys SDK."
   ],
   "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-keys",
   "license": "MIT",
-  "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
   "dependencies": [
     {
       "name": "azure-core-cpp",
-      "default-features": false,
-      "version>=": "1.1.0"
+      "default-features": false
     },
     {
       "name": "vcpkg-cmake",
diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json
index 62eb9e91e53b27..d58789ac2df927 100644
--- a/ports/azure-storage-blobs-cpp/vcpkg.json
+++ b/ports/azure-storage-blobs-cpp/vcpkg.json
@@ -1,18 +1,17 @@
 {
   "name": "azure-storage-blobs-cpp",
   "version-semver": "12.0.1",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Storage Blobs SDK for C++",
     "This library provides Azure Storage Blobs SDK."
   ],
   "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-blobs",
   "license": "MIT",
-  "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
   "dependencies": [
     {
       "name": "azure-storage-common-cpp",
-      "default-features": false,
-      "version>=": "12.0.0"
+      "default-features": false
     },
     {
       "name": "vcpkg-cmake",
diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json
index fa955270ce04fe..3e6864f77d35a2 100644
--- a/ports/azure-storage-common-cpp/vcpkg.json
+++ b/ports/azure-storage-common-cpp/vcpkg.json
@@ -1,18 +1,17 @@
 {
   "name": "azure-storage-common-cpp",
   "version-semver": "12.0.1",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Common Storage SDK for C++",
     "This library provides common Azure Storage-related abstractions for Azure SDK."
   ],
   "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common",
   "license": "MIT",
-  "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
   "dependencies": [
     {
       "name": "azure-core-cpp",
-      "default-features": false,
-      "version>=": "1.0.0"
+      "default-features": false
     },
     "libxml2",
     {
diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json
index 79a8a8b80301ef..63dde71174212a 100644
--- a/ports/azure-storage-files-datalake-cpp/vcpkg.json
+++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json
@@ -1,18 +1,17 @@
 {
   "name": "azure-storage-files-datalake-cpp",
   "version-semver": "12.0.1",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Storage Files Data Lake SDK for C++",
     "This library provides Azure Storage Files Data Lake SDK."
   ],
   "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-datalake",
   "license": "MIT",
-  "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
   "dependencies": [
     {
       "name": "azure-storage-blobs-cpp",
-      "default-features": false,
-      "version>=": "12.0.0"
+      "default-features": false
     },
     {
       "name": "vcpkg-cmake",
diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json
index 73a2d9c82817b8..400ca6901f6e1c 100644
--- a/ports/azure-storage-files-shares-cpp/vcpkg.json
+++ b/ports/azure-storage-files-shares-cpp/vcpkg.json
@@ -1,18 +1,17 @@
 {
   "name": "azure-storage-files-shares-cpp",
   "version-semver": "12.0.1",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Storage Files Shares SDK for C++",
     "This library provides Azure Storage Files Shares SDK."
   ],
   "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-shares",
   "license": "MIT",
-  "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
   "dependencies": [
     {
       "name": "azure-storage-common-cpp",
-      "default-features": false,
-      "version>=": "12.0.0"
+      "default-features": false
     },
     {
       "name": "vcpkg-cmake",
diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json
index b87aed9c0a5b3c..68ac66819d9751 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": "6a62e90cc13ab362ba09462fa444512aee671482",
+      "version-semver": "4.0.0-beta.4",
+      "port-version": 1
+    },
     {
       "git-tree": "beff44522cd72f08bddabfc35a520533b97d1819",
       "version-semver": "4.0.0-beta.4",
diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json
index 9360d7da82ac53..bc5ac374fc1a62 100644
--- a/versions/a-/azure-storage-blobs-cpp.json
+++ b/versions/a-/azure-storage-blobs-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4927a9eacb27a8088d82005fbae2851755d09ce1",
+      "version-semver": "12.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "07131431279c91d81edd9ec56005ee8628c3efdb",
       "version-semver": "12.0.1",
diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json
index fba5190b1da0b0..858d26eb42a136 100644
--- a/versions/a-/azure-storage-common-cpp.json
+++ b/versions/a-/azure-storage-common-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f18fbd3b20bfc22766b8767ab8b668be4ea18f58",
+      "version-semver": "12.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "d4ce9c53796add134d3ce8f29a9be4e33eba6c2a",
       "version-semver": "12.0.1",
diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json
index d677d463b89563..6ded729267312b 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": "649b055538511bad19442d11dd356688cac46370",
+      "version-semver": "12.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "305658dfe1b6b28abc8be014794e6b21e8ba5722",
       "version-semver": "12.0.1",
diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json
index e574f13dd00e6c..adbde50819116c 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": "eccf58c6719e0f859f90420dffb5deb2cccac731",
+      "version-semver": "12.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "70c68c7920b221b2b571ba85d48ba215c0e9cb58",
       "version-semver": "12.0.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7e64191461249c..e4bdde578bd2d3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -298,15 +298,15 @@
     },
     "azure-security-keyvault-keys-cpp": {
       "baseline": "4.0.0-beta.4",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-blobs-cpp": {
       "baseline": "12.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-common-cpp": {
       "baseline": "12.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-cpp": {
       "baseline": "7.5.0",
@@ -314,11 +314,11 @@
     },
     "azure-storage-files-datalake-cpp": {
       "baseline": "12.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-files-shares-cpp": {
       "baseline": "12.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-uamqp-c": {
       "baseline": "2020-12-09",