diff --git a/eng/scripts/Initialize-VcpkgRelease.ps1 b/eng/scripts/Initialize-VcpkgRelease.ps1
index b05db7223..fb995591d 100644
--- a/eng/scripts/Initialize-VcpkgRelease.ps1
+++ b/eng/scripts/Initialize-VcpkgRelease.ps1
@@ -69,7 +69,7 @@ $newContent = $portFileContent -replace '(SHA512\s+)0', "`${1}$sha512"
 
 if ($DailyReleaseRef) {
     Write-Verbose "Overriding REF with test release ref: $DailyReleaseRef"
-    $newContent = $newContent -replace '(?m)^(\s+)REF azure.*$', "`${1}REF $DailyReleaseRef"
+    $newContent = $newContent -replace '(?m)^(\s+)REF \"azure.*\"$', "`${1}REF $DailyReleaseRef"
 }
 
 $newContent | Set-Content $portfileLocation -NoNewLine
diff --git a/sdk/attestation/azure-security-attestation/vcpkg/portfile.cmake b/sdk/attestation/azure-security-attestation/vcpkg/portfile.cmake
index fcb7d3a5b..3fb562431 100644
--- a/sdk/attestation/azure-security-attestation/vcpkg/portfile.cmake
+++ b/sdk/attestation/azure-security-attestation/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-security-attestation_@AZ_LIBRARY_VERSION@
+    REF "azure-security-attestation_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/attestation/azure-security-attestation")
diff --git a/sdk/core/azure-core-amqp/vcpkg/portfile.cmake b/sdk/core/azure-core-amqp/vcpkg/portfile.cmake
index c2f73a1bd..7944c4c22 100644
--- a/sdk/core/azure-core-amqp/vcpkg/portfile.cmake
+++ b/sdk/core/azure-core-amqp/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-core-amqp_@AZ_LIBRARY_VERSION@
+    REF "azure-core-amqp_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp")
diff --git a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/portfile.cmake b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/portfile.cmake
index 783a6d4fd..2c21cf7a3 100644
--- a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/portfile.cmake
+++ b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-core-tracing-opentelemetry_@AZ_LIBRARY_VERSION@
+    REF "azure-core-tracing-opentelemetry_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry")
diff --git a/sdk/core/azure-core/vcpkg/portfile.cmake b/sdk/core/azure-core/vcpkg/portfile.cmake
index b5396585b..b6d771446 100644
--- a/sdk/core/azure-core/vcpkg/portfile.cmake
+++ b/sdk/core/azure-core/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-core_@AZ_LIBRARY_VERSION@
+    REF "azure-core_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 vcpkg_check_features(
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake
index 513b2d2cd..bbc44d398 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-messaging-eventhubs-checkpointstore-blob_@AZ_LIBRARY_VERSION@
+    REF "azure-messaging-eventhubs-checkpointstore-blob_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob")
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake b/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake
index 9ff3f8ec5..d7d20e2f5 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake
+++ b/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-messaging-eventhubs_@AZ_LIBRARY_VERSION@
+    REF "azure-messaging-eventhubs_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs")
diff --git a/sdk/identity/azure-identity/vcpkg/portfile.cmake b/sdk/identity/azure-identity/vcpkg/portfile.cmake
index 38435f463..76684dd10 100644
--- a/sdk/identity/azure-identity/vcpkg/portfile.cmake
+++ b/sdk/identity/azure-identity/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-identity_@AZ_LIBRARY_VERSION@
+    REF "azure-identity_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/identity/azure-identity")
diff --git a/sdk/keyvault/azure-security-keyvault-administration/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-administration/vcpkg/portfile.cmake
index e4f8b1367..6251c5669 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/vcpkg/portfile.cmake
+++ b/sdk/keyvault/azure-security-keyvault-administration/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-security-keyvault-administration_@AZ_LIBRARY_VERSION@
+    REF "azure-security-keyvault-administration_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration")
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/portfile.cmake
index 8ec8fa788..275e37330 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/portfile.cmake
+++ b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-security-keyvault-certificates_@AZ_LIBRARY_VERSION@
+    REF "azure-security-keyvault-certificates_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates")
diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake
index db32d1e7c..f7174a739 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake
+++ b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-security-keyvault-keys_@AZ_LIBRARY_VERSION@
+    REF "azure-security-keyvault-keys_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys")
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/portfile.cmake
index 1ca2ddca5..7865e048a 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/portfile.cmake
+++ b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-security-keyvault-secrets_@AZ_LIBRARY_VERSION@
+    REF "azure-security-keyvault-secrets_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets")
diff --git a/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake b/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake
index 34bcc90d9..fd07e6f4b 100644
--- a/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake
+++ b/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-blobs_@AZ_LIBRARY_VERSION@
+    REF "azure-storage-blobs_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-blobs")
diff --git a/sdk/storage/azure-storage-common/vcpkg/portfile.cmake b/sdk/storage/azure-storage-common/vcpkg/portfile.cmake
index 19ff90593..31728a4cf 100644
--- a/sdk/storage/azure-storage-common/vcpkg/portfile.cmake
+++ b/sdk/storage/azure-storage-common/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-common_@AZ_LIBRARY_VERSION@
+    REF "azure-storage-common_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common")
diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake b/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake
index 99344115f..ed4fba3cb 100644
--- a/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake
+++ b/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-files-datalake_@AZ_LIBRARY_VERSION@
+    REF "azure-storage-files-datalake_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake")
diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake b/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake
index 6bbf5658d..1cbc7f9e3 100644
--- a/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake
+++ b/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-files-shares_@AZ_LIBRARY_VERSION@
+    REF "azure-storage-files-shares_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares")
diff --git a/sdk/storage/azure-storage-queues/vcpkg/portfile.cmake b/sdk/storage/azure-storage-queues/vcpkg/portfile.cmake
index 17f36ec70..a18b8b322 100644
--- a/sdk/storage/azure-storage-queues/vcpkg/portfile.cmake
+++ b/sdk/storage/azure-storage-queues/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-queues_@AZ_LIBRARY_VERSION@
+    REF "azure-storage-queues_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-queues")
diff --git a/sdk/tables/azure-data-tables/vcpkg/portfile.cmake b/sdk/tables/azure-data-tables/vcpkg/portfile.cmake
index 7f81eab9e..8282dfd71 100644
--- a/sdk/tables/azure-data-tables/vcpkg/portfile.cmake
+++ b/sdk/tables/azure-data-tables/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-data-tables_@AZ_LIBRARY_VERSION@
+    REF "azure-data-tables_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/tables/azure-data-tables")
diff --git a/sdk/template/azure-template/vcpkg/portfile.cmake b/sdk/template/azure-template/vcpkg/portfile.cmake
index e4ecd7878..4e9fe73ef 100644
--- a/sdk/template/azure-template/vcpkg/portfile.cmake
+++ b/sdk/template/azure-template/vcpkg/portfile.cmake
@@ -7,8 +7,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-template_@AZ_LIBRARY_VERSION@
+    REF "azure-template_${VERSION}"
     SHA512 0
+    HEAD_REF main
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/template/azure-template")