diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake
index bb875855ae..b3e7273b58 100644
--- a/cmake-modules/AzureVcpkg.cmake
+++ b/cmake-modules/AzureVcpkg.cmake
@@ -16,7 +16,7 @@ macro(az_vcpkg_integrate)
       message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
       # GET VCPKG FROM SOURCE
       #  User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
-      set(VCPKG_COMMIT_STRING 8150939b69720adc475461978e07c2d2bf5fb76e) # default SDK tested commit
+      set(VCPKG_COMMIT_STRING 5312e9f976e89b256954f571433e34f783dd2d12) # default SDK tested commit
       if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
         message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.")
         set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit
diff --git a/eng/vcpkg-commit.txt b/eng/vcpkg-commit.txt
index e4a0d16274..63c570e03a 100644
--- a/eng/vcpkg-commit.txt
+++ b/eng/vcpkg-commit.txt
@@ -1 +1 @@
-8150939b69720adc475461978e07c2d2bf5fb76e
+5312e9f976e89b256954f571433e34f783dd2d12
diff --git a/sdk/samples/iot/iot_sample_common.c b/sdk/samples/iot/iot_sample_common.c
index d1dcd8c83a..3aedb5bde6 100644
--- a/sdk/samples/iot/iot_sample_common.c
+++ b/sdk/samples/iot/iot_sample_common.c
@@ -334,7 +334,7 @@ void iot_sample_create_mqtt_endpoint(
   {
     int32_t const required_size = az_span_size(mqtt_url_prefix)
         + az_span_size(env_vars->hub_hostname) + az_span_size(mqtt_url_suffix)
-        + (int32_t)sizeof('\0');
+        + (int32_t)sizeof((uint8_t)'\0');
 
     if ((size_t)required_size > endpoint_size)
     {
@@ -351,7 +351,7 @@ void iot_sample_create_mqtt_endpoint(
   else if (type == PAHO_IOT_PROVISIONING)
   {
     int32_t const required_size
-        = az_span_size(provisioning_global_endpoint) + (int32_t)sizeof('\0');
+        = az_span_size(provisioning_global_endpoint) + (int32_t)sizeof((uint8_t)'\0');
 
     if ((size_t)required_size > endpoint_size)
     {
diff --git a/sdk/src/azure/core/az_http_policy.c b/sdk/src/azure/core/az_http_policy.c
index e91193a5d9..0386efe87d 100644
--- a/sdk/src/azure/core/az_http_policy.c
+++ b/sdk/src/azure/core/az_http_policy.c
@@ -48,8 +48,8 @@ AZ_NODISCARD az_result az_http_pipeline_policy_apiversion(
 #define _az_TELEMETRY_ID_PREFIX_LENGTH (sizeof(_az_TELEMETRY_ID_PREFIX) - 1)
 #define _az_TELEMETRY_COMPONENT_NAME_MAX_LENGTH 40
 #define _az_TELEMETRY_VERSION_MAX_LENGTH (sizeof("12.345.6789-preview.123") - 1)
-#define _az_TELEMETRY_ID_MAX_LENGTH                                                       \
-  (_az_TELEMETRY_ID_PREFIX_LENGTH + _az_TELEMETRY_COMPONENT_NAME_MAX_LENGTH + sizeof('/') \
+#define _az_TELEMETRY_ID_MAX_LENGTH                                                                \
+  (_az_TELEMETRY_ID_PREFIX_LENGTH + _az_TELEMETRY_COMPONENT_NAME_MAX_LENGTH + sizeof((uint8_t)'/') \
    + _az_TELEMETRY_VERSION_MAX_LENGTH)
 
 AZ_NODISCARD az_result az_http_pipeline_policy_telemetry(
diff --git a/vcpkg.json b/vcpkg.json
index 4a4288be1c..75826979ac 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-sdk-for-c",
   "version": "1.0.0",
-  "builtin-baseline": "8150939b69720adc475461978e07c2d2bf5fb76e",
+  "builtin-baseline": "5312e9f976e89b256954f571433e34f783dd2d12",
   "dependencies": [
     {
       "name": "curl"