diff --git a/ports/azure-c-shared-utility/fix-install-location-preview.patch b/ports/azure-c-shared-utility/fix-install-location-preview.patch
new file mode 100644
index 0000000000..41162fd2ee
--- /dev/null
+++ b/ports/azure-c-shared-utility/fix-install-location-preview.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 25bbf383..31ca2da2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -678,7 +678,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+     set(CMAKE_INSTALL_LIBDIR "lib")
+ endif()
+
+-set(package_location "cmake")
++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+
+ if(${build_as_dynamic})
+     set(targets aziotsharedutil aziotsharedutil_dll)
diff --git a/ports/azure-c-shared-utility/improve-dependencies-preview.patch b/ports/azure-c-shared-utility/improve-dependencies-preview.patch
new file mode 100644
index 0000000000..42fe1e6583
--- /dev/null
+++ b/ports/azure-c-shared-utility/improve-dependencies-preview.patch
@@ -0,0 +1,68 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46334c1..aaeea20 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,7 +115,6 @@ if(${use_openssl})
+     if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR})
+         find_package(OpenSSL REQUIRED)
+     endif()
+-    include_directories(${OPENSSL_INCLUDE_DIR})
+ endif()
+ 
+ if(${use_applessl})
+@@ -521,8 +520,7 @@ if(${use_http})
+             set(CURL_FIND_REQUIRED 1)
+             find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES)
+ 
+-            include_directories(${CURL_INCLUDE_DIRS})
+-            set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES})
++            set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl)
+         endif(NOT use_builtin_httpapi)
+     endif()
+ endif(${use_http})
+@@ -561,7 +559,7 @@ if(${use_bearssl})
+ endif()
+ 
+ if(${use_openssl})
+-    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES})
++    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL)
+     if (WIN32)
+         set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32)
+     endif()
+@@ -703,7 +701,7 @@ write_basic_package_version_file(
+ 
+ configure_file("configs/${PROJECT_NAME}Config.cmake"
+     "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
+-    COPYONLY
++    @ONLY
+ )
+ 
+ install(EXPORT aziotsharedutilTargets
+@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets
+ 
+ install(
+ FILES
+-    "configs/${PROJECT_NAME}Config.cmake"
++    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
+     "configs/${PROJECT_NAME}Functions.cmake"
+     "configs/azure_iot_build_rules.cmake"
+     "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
+diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake
+index 52f2c7e1..11e9332b 100644
+--- a/configs/azure_c_shared_utilityConfig.cmake
++++ b/configs/azure_c_shared_utilityConfig.cmake
+@@ -1,6 +1,14 @@
+ #Copyright (c) Microsoft. All rights reserved.
+ #Licensed under the MIT license. See LICENSE file in the project root for full license information.
+ 
++include(CMakeFindDependencyMacro)
++if("@use_openssl@")
++    find_dependency(OpenSSL)
++endif()
++if(UNIX AND NOT "@use_builtin_httpapi@")
++    find_dependency(CURL)
++endif()
++
+ include("${CMAKE_CURRENT_LIST_DIR}/azure_c_shared_utilityTargets.cmake")
+ 
+ get_target_property(AZURE_C_SHARED_UTILITY_INCLUDES aziotsharedutil INTERFACE_INCLUDE_DIRECTORIES)
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index d5a924212a..674f6156fa 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -8,10 +8,10 @@ if("public-preview" IN_LIST FEATURES)
         SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
         HEAD_REF master
         PATCHES
-            fix-install-location.patch
+            fix-install-location-preview.patch
             fix-utilityFunctions-conditions-preview.patch
             disable-error.patch
-            improve-dependencies.patch
+            improve-dependencies-preview.patch
     )
 else()
     vcpkg_from_github(
@@ -35,6 +35,8 @@ vcpkg_cmake_configure(
         -Duse_installed_dependencies=ON
         -Duse_default_uuid=ON
         -Dbuild_as_dynamic=OFF
+    MAYBE_UNUSED_VARIABLES
+        build_as_dynamic
 )
 
 vcpkg_cmake_install()
diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json
index 57317f32de..547d08ee97 100644
--- a/ports/azure-c-shared-utility/vcpkg.json
+++ b/ports/azure-c-shared-utility/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "azure-c-shared-utility",
   "version-date": "2022-01-21",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Azure C SDKs common code",
   "homepage": "https://github.com/Azure/azure-c-shared-utility",
+  "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
     "azure-macro-utils-c",
diff --git a/ports/azure-iot-sdk-c/improve-external-deps-preview.patch b/ports/azure-iot-sdk-c/improve-external-deps-preview.patch
new file mode 100644
index 0000000000..8526cd6eb4
--- /dev/null
+++ b/ports/azure-iot-sdk-c/improve-external-deps-preview.patch
@@ -0,0 +1,112 @@
+diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake
+index b9c62e8..edf5847 100644
+--- a/configs/azure_iot_sdksConfig.cmake
++++ b/configs/azure_iot_sdksConfig.cmake
+@@ -1,5 +1,11 @@
+ #Copyright (c) Microsoft. All rights reserved.
+ #Licensed under the MIT license. See LICENSE file in the project root for full license information.
++include(CMakeFindDependencyMacro)
++find_dependency(unofficial-parson)
++find_dependency(uamqp)
++find_dependency(uhttp)
++find_dependency(umqtt)
++find_dependency(azure_c_shared_utility)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake")
+ 
+diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
+index 33b5b8709..45ef7b87a 100644
+--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
++++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
+@@ -31,12 +31,10 @@ set(${theseTestsName}_c_files
+ 
+ set(${theseTestsName}_c_files
+     ../../../certs/certs.c
+-    ../../../deps/parson/parson.c
+ )
+ 
+ set(${theseTestsName}_h_files
+     ../../../certs/certs.h
+-    ../../../deps/parson/parson.h
+     ../common_dt_e2e/iothubclient_common_dt_e2e.h
+ )
+ 
+diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
+index d05d654..5872c8d 100644
+--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
++++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
+@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files
+ 
+ set(${theseTestsName}_c_files
+     ../../../certs/certs.c
+-    ../../../deps/parson/parson.c
+ )
+ 
+ set(${theseTestsName}_h_files
+     ../../../certs/certs.h
+-    ../../../deps/parson/parson.h
+     ../common_dt_e2e/iothubclient_common_dt_e2e.h
+ )
+ 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ba2f8e016..19885c8b8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -179,17 +179,6 @@ endif()
+ # Use solution folders.
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ 
+-# build the parson library for json parsing
+-add_library(parson
+-    ./deps/parson/parson.c
+-    ./deps/parson/parson.h
+-)
+-if (MSVC)
+-    set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
+-endif()
+-set(parson_h_install_files ./deps/parson/parson.h)
+-set(parson_install_libs parson)
+-
+ if (IN_OPENWRT)
+     ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
+     INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
+@@ -407,7 +396,7 @@ endif()
+ 
+ if (${use_installed_dependencies})
+     # Install azure_iot_sdks
+-    set(package_location "cmake")
++    set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+ 
+     include(CMakePackageConfigHelpers)
+ 
+@@ -422,14 +411,10 @@ if (${use_installed_dependencies})
+         COPYONLY
+     )
+ 
+-    install(FILES ${parson_h_install_files}
+-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot
+-    )
+-    install(TARGETS ${parson_install_libs} EXPORT azure_iot_sdksTargets
+-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot
+-    )
++    find_package(unofficial-parson REQUIRED CONFIG)
++    if(NOT TARGET parson)
++        add_library(parson ALIAS unofficial::parson::parson)
++    endif()
+ 
+     install(EXPORT azure_iot_sdksTargets
+         FILE
+@@ -446,11 +431,5 @@ if (${use_installed_dependencies})
+         DESTINATION
+             ${package_location}
+     )
+-else()
+-    install(FILES ${parson_h_install_files}
+-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot)
+-    install(TARGETS ${parson_install_libs}
+-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
diff --git a/ports/azure-iot-sdk-c/improve-external-deps.patch b/ports/azure-iot-sdk-c/improve-external-deps.patch
index c66b53a0b7..8f61680781 100644
--- a/ports/azure-iot-sdk-c/improve-external-deps.patch
+++ b/ports/azure-iot-sdk-c/improve-external-deps.patch
@@ -34,7 +34,7 @@ diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/i
 index d05d654..5872c8d 100644
 --- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
 +++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
-@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files
+@@ -22,12 +22,10 @@ set(${theseTestsName}_nuget_c_files
  
  set(${theseTestsName}_c_files
      ../../../certs/certs.c
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 785e6efcaf..8edad36885 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -8,10 +8,7 @@ if("public-preview" IN_LIST FEATURES)
         SHA512 6798b17d6768b3ccbd0eb66719b50f364cd951736eb71110e2dc9deca054a1566ff88b9e8c5e9b52536e4308cad6cd3cbebff3282c123083e3afaee5535e724b
         HEAD_REF public-preview
         PATCHES
-            fix-install-location.patch
-            improve-external-deps.patch
-            remove-werror.patch
-            fix-iothubclient-includes.patch
+            improve-external-deps-preview.patch
     )
 else()
     vcpkg_from_github(
@@ -23,7 +20,6 @@ else()
         PATCHES
             fix-install-location.patch
             improve-external-deps.patch
-            remove-werror.patch
             fix-iothubclient-includes.patch
     )
 endif()
@@ -46,6 +42,9 @@ vcpkg_cmake_configure(
         -Dbuild_as_dynamic=OFF
         -Duse_edge_modules=ON
         -Dwarnings_as_errors=OFF
+    MAYBE_UNUSED_VARIABLES
+        build_as_dynamic
+        warnings_as_errors
 )
 
 vcpkg_cmake_install()
diff --git a/ports/azure-iot-sdk-c/remove-werror.patch b/ports/azure-iot-sdk-c/remove-werror.patch
deleted file mode 100644
index 5b5333118f..0000000000
--- a/ports/azure-iot-sdk-c/remove-werror.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b72bd41ed..e916728a8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,11 +123,8 @@ if (${warnings_as_errors})
-         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232")
-         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232")
-         # Make warning as error
--        add_definitions(/WX)
-     else()
-         # Make warning as error
--        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-     endif()
- endif()
- 
diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json
index ea11a6aece..eb8d7405f9 100644
--- a/ports/azure-iot-sdk-c/vcpkg.json
+++ b/ports/azure-iot-sdk-c/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "azure-iot-sdk-c",
   "version-date": "2022-01-21",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
   "homepage": "https://github.com/Azure/azure-iot-sdk-c",
+  "license": "MIT",
   "dependencies": [
     "azure-c-shared-utility",
     "azure-macro-utils-c",
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index cb8c613a10..8e296ff0ac 100644
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@@ -27,6 +27,8 @@ vcpkg_configure_cmake(
         -Dskip_samples=ON
         -Duse_installed_dependencies=ON
         -Dbuild_as_dynamic=OFF
+    MAYBE_UNUSED_VARIABLES
+        build_as_dynamic
 )
 
 vcpkg_install_cmake()
diff --git a/ports/azure-uamqp-c/vcpkg.json b/ports/azure-uamqp-c/vcpkg.json
index f0559c21be..40c1177fd8 100644
--- a/ports/azure-uamqp-c/vcpkg.json
+++ b/ports/azure-uamqp-c/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "azure-uamqp-c",
   "version-date": "2022-01-21",
+  "port-version": 1,
   "description": "AMQP library for C",
   "homepage": "https://github.com/Azure/azure-uamqp-c",
+  "license": "MIT",
   "dependencies": [
     "azure-c-shared-utility",
     "azure-macro-utils-c",
diff --git a/ports/azure-uhttp-c/fix-install-location.patch b/ports/azure-uhttp-c/fix-install-location.patch
deleted file mode 100644
index 4daa488510..0000000000
--- a/ports/azure-uhttp-c/fix-install-location.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c63adc0..9ba6007 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,8 +145,8 @@ endif()
- # Set CMAKE_INSTALL_LIBDIR if not defined
- include(GNUInstallDirs)
-
--# Install umqtt
--set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-+# Install uhttp
-+set(package_location "cmake")
-
- if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-     set(CMAKE_INSTALL_LIBDIR "lib")
diff --git a/ports/azure-uhttp-c/package-location-fix-preview.patch b/ports/azure-uhttp-c/package-location-fix-preview.patch
new file mode 100644
index 0000000000..8544ae63b9
--- /dev/null
+++ b/ports/azure-uhttp-c/package-location-fix-preview.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27eae0b..ef87ec0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -138,7 +138,7 @@ if (NOT ${skip_samples})
+ endif()
+ 
+ # Install uhttp
+-set(package_location "cmake")
++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+ 
+ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+     set(CMAKE_INSTALL_LIBDIR "lib")
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index 263926b65b..0478c71743 100644
--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@@ -8,7 +8,7 @@ if("public-preview" IN_LIST FEATURES)
         SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6
         HEAD_REF master
         PATCHES
-            fix-install-location.patch
+            package-location-fix-preview.patch
     )
 else()
     vcpkg_from_github(
@@ -17,29 +17,28 @@ else()
         REF 1cc70f4d21ad69768cafb9551b1b512118fba995
         SHA512 6604e82b347a1a4eb5072ab762fde7bd5ae9b32848a78da9103e0eb528b9ccd420a12dbc237dc0b5fe6db271d5cdcd24eedf1cde8ac058102fdd24c5a5a33f26
         HEAD_REF master
-        PATCHES
-            fix-install-location.patch
     )
 endif()
 
 file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -Dskip_samples=ON
         -Duse_installed_dependencies=ON
         -Dbuild_as_dynamic=OFF
         -DCMAKE_INSTALL_INCLUDEDIR=include
+    MAYBE_UNUSED_VARIABLES
+        build_as_dynamic
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uhttp)
+vcpkg_cmake_config_fixup(PACKAGE_NAME uhttp CONFIG_PATH "lib/cmake/uhttp")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
 
 vcpkg_copy_pdbs()
diff --git a/ports/azure-uhttp-c/vcpkg.json b/ports/azure-uhttp-c/vcpkg.json
index 41a9d3f3bf..ff97c54e3c 100644
--- a/ports/azure-uhttp-c/vcpkg.json
+++ b/ports/azure-uhttp-c/vcpkg.json
@@ -1,12 +1,22 @@
 {
   "name": "azure-uhttp-c",
   "version-date": "2022-01-21",
+  "port-version": 1,
   "description": "Azure HTTP Library written in C",
   "homepage": "https://github.com/Azure/azure-uhttp-c",
+  "license": "MIT",
   "dependencies": [
     "azure-c-shared-utility",
     "azure-macro-utils-c",
-    "umock-c"
+    "umock-c",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "public-preview": {
diff --git a/ports/azure-umqtt-c/fix-install-location.patch b/ports/azure-umqtt-c/package-location-fix-preview.patch
similarity index 64%
rename from ports/azure-umqtt-c/fix-install-location.patch
rename to ports/azure-umqtt-c/package-location-fix-preview.patch
index f2bb134d9c..ec837b7c01 100644
--- a/ports/azure-umqtt-c/fix-install-location.patch
+++ b/ports/azure-umqtt-c/package-location-fix-preview.patch
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0dcf186..1d9bc8a 100755
+index 8fd08f0..c228519 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -155,7 +155,7 @@ endif ()
  include(GNUInstallDirs)
  
  # Install umqtt
--set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-+set(package_location "cmake")
+-set(package_location "cmake")
++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
  
  if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
      set(CMAKE_INSTALL_LIBDIR "lib")
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index 87dd212570..e9e65434ff 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -8,7 +8,7 @@ if("public-preview" IN_LIST FEATURES)
         SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40
         HEAD_REF master
         PATCHES
-            fix-install-location.patch
+            package-location-fix-preview.patch
     )
 else()
     vcpkg_from_github(
@@ -17,28 +17,27 @@ else()
         REF 09558f380a314ea89b28f406cc810f47718cea49
         SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548
         HEAD_REF master
-        PATCHES
-            fix-install-location.patch
     )
 endif()
 
 file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/)
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
         -Dskip_samples=ON
         -Duse_installed_dependencies=ON
         -Dbuild_as_dynamic=OFF
+    MAYBE_UNUSED_VARIABLES
+        build_as_dynamic
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umqtt)
+vcpkg_cmake_config_fixup(PACKAGE_NAME umqtt CONFIG_PATH "lib/cmake/umqtt")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
 
 vcpkg_copy_pdbs()
diff --git a/ports/azure-umqtt-c/vcpkg.json b/ports/azure-umqtt-c/vcpkg.json
index c1fc532fc6..ec223bd03b 100644
--- a/ports/azure-umqtt-c/vcpkg.json
+++ b/ports/azure-umqtt-c/vcpkg.json
@@ -1,12 +1,22 @@
 {
   "name": "azure-umqtt-c",
   "version-date": "2022-01-21",
+  "port-version": 1,
   "description": "General purpose library for communication over the mqtt protocol",
   "homepage": "https://github.com/Azure/azure-umqtt-c",
+  "license": "MIT",
   "dependencies": [
     "azure-c-shared-utility",
     "azure-macro-utils-c",
-    "umock-c"
+    "umock-c",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "public-preview": {
diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json
index e443d47c46..aab35215be 100644
--- a/versions/a-/azure-c-shared-utility.json
+++ b/versions/a-/azure-c-shared-utility.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "42be8335b113cba6ca88b9f9789b29fc7be280b4",
+      "version-date": "2022-01-21",
+      "port-version": 2
+    },
     {
       "git-tree": "aceee8533b4eeea6eb87371c4d37ae82859cefc7",
       "version-date": "2022-01-21",
diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json
index be183cd3a1..3953986f7d 100644
--- a/versions/a-/azure-iot-sdk-c.json
+++ b/versions/a-/azure-iot-sdk-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "80f1eb4e465fef817503af2c9599b2186d4922e6",
+      "version-date": "2022-01-21",
+      "port-version": 2
+    },
     {
       "git-tree": "0570fa462646f08bb3ed9a34ecb693082def3d3b",
       "version-date": "2022-01-21",
diff --git a/versions/a-/azure-uamqp-c.json b/versions/a-/azure-uamqp-c.json
index ba8a9b1ed1..3684f27960 100644
--- a/versions/a-/azure-uamqp-c.json
+++ b/versions/a-/azure-uamqp-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d7d284a159afe6ab21ce65d5e5d96dbee83339f6",
+      "version-date": "2022-01-21",
+      "port-version": 1
+    },
     {
       "git-tree": "a2c6897e3392683dcce93a846b98b2c95dc41a55",
       "version-date": "2022-01-21",
diff --git a/versions/a-/azure-uhttp-c.json b/versions/a-/azure-uhttp-c.json
index ec05c1decf..e7cf5ca1a1 100644
--- a/versions/a-/azure-uhttp-c.json
+++ b/versions/a-/azure-uhttp-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "28439985096cc9a714695d10830ceb2f54859c24",
+      "version-date": "2022-01-21",
+      "port-version": 1
+    },
     {
       "git-tree": "f614a1ac990dd4189b292fa0e6e31897ee4b7ae8",
       "version-date": "2022-01-21",
diff --git a/versions/a-/azure-umqtt-c.json b/versions/a-/azure-umqtt-c.json
index c523e9e1e1..8933265990 100644
--- a/versions/a-/azure-umqtt-c.json
+++ b/versions/a-/azure-umqtt-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5953c7aee01e5c0972a8eb97fbb763c74b60c49c",
+      "version-date": "2022-01-21",
+      "port-version": 1
+    },
     {
       "git-tree": "f5b18f17519b9de8a2ab956eebc7dff6e7bf7a05",
       "version-date": "2022-01-21",
diff --git a/versions/baseline.json b/versions/baseline.json
index eb316255bf..07d1837bc6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -314,7 +314,7 @@
     },
     "azure-c-shared-utility": {
       "baseline": "2022-01-21",
-      "port-version": 1
+      "port-version": 2
     },
     "azure-core-cpp": {
       "baseline": "1.3.1",
@@ -326,7 +326,7 @@
     },
     "azure-iot-sdk-c": {
       "baseline": "2022-01-21",
-      "port-version": 1
+      "port-version": 2
     },
     "azure-kinect-sensor-sdk": {
       "baseline": "1.4.1",
@@ -374,15 +374,15 @@
     },
     "azure-uamqp-c": {
       "baseline": "2022-01-21",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-uhttp-c": {
       "baseline": "2022-01-21",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-umqtt-c": {
       "baseline": "2022-01-21",
-      "port-version": 0
+      "port-version": 1
     },
     "b64": {
       "baseline": "2.0.0.1",