diff --git a/ports/graphqlparser/CONTROL b/ports/graphqlparser/CONTROL
deleted file mode 100644
index 128c494989cbe3..00000000000000
--- a/ports/graphqlparser/CONTROL
+++ /dev/null
@@ -1,3 +0,0 @@
-Source: graphqlparser
-Version: 0.7.0-1
-Description: A GraphQL query parser in C++ with C and C++ APIs
diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake
index 67b8a2231599d3..92e36911089508 100644
--- a/ports/graphqlparser/portfile.cmake
+++ b/ports/graphqlparser/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         win-cmake.patch
         static-compile-fix.patch
+        remove-invalid-bison-directive.patch
 )
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
diff --git a/ports/graphqlparser/remove-invalid-bison-directive.patch b/ports/graphqlparser/remove-invalid-bison-directive.patch
new file mode 100644
index 00000000000000..0e0b896dcb566b
--- /dev/null
+++ b/ports/graphqlparser/remove-invalid-bison-directive.patch
@@ -0,0 +1,13 @@
+diff --git a/parser.ypp b/parser.ypp
+index 2afbcac..baa9cab 100644
+--- a/parser.ypp
++++ b/parser.ypp
+@@ -7,8 +7,6 @@
+  * of patent rights can be found in the PATENTS file in the same directory.
+  */
+ 
+-%require "3"
+-
+ %skeleton "lalr1.cc"
+ 
+ %defines
diff --git a/ports/graphqlparser/vcpkg.json b/ports/graphqlparser/vcpkg.json
new file mode 100644
index 00000000000000..d859a1f19f7567
--- /dev/null
+++ b/ports/graphqlparser/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "name": "graphqlparser",
+  "version-string": "0.7.0",
+  "port-version": 2,
+  "description": "A GraphQL query parser in C++ with C and C++ APIs"
+}
diff --git a/ports/msgpack11/CONTROL b/ports/msgpack11/CONTROL
deleted file mode 100644
index 3fde8f39ca5d5f..00000000000000
--- a/ports/msgpack11/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: msgpack11
-Version: 0.0.10-1
-Homepage: https://msgpack.org
-Build-Depends: gtest
-Description: msgpack11 is a tiny MsgPack library for C++11, providing MsgPack parsing and serialization.This library is inspired by json11.The API of msgpack11 is designed to be similar with json11.
-
diff --git a/ports/msgpack11/disable-werror.patch b/ports/msgpack11/disable-werror.patch
new file mode 100644
index 00000000000000..eb4a17e084acbf
--- /dev/null
+++ b/ports/msgpack11/disable-werror.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 080cefa..b73072a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,9 +9,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ add_library(msgpack11 STATIC msgpack11.cpp)
+ target_include_directories(msgpack11 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+ target_compile_options(msgpack11 PRIVATE -fno-rtti)
+-if(NOT MSVC)
+-  target_compile_options(msgpack11 PRIVATE -Wall -Wextra -Werror)
+-endif()
+ configure_file("msgpack11.pc.in" "msgpack11.pc" @ONLY)
+ 
+ if (MSGPACK11_BUILD_TESTS)
diff --git a/ports/msgpack11/portfile.cmake b/ports/msgpack11/portfile.cmake
index cf828f6b12017d..f4dc73c63c4730 100644
--- a/ports/msgpack11/portfile.cmake
+++ b/ports/msgpack11/portfile.cmake
@@ -8,19 +8,20 @@ vcpkg_from_github(
     PATCHES
         msvc.patch
         fix-additerator.patch
+        disable-werror.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-    	-DMSGPACK11_BUILD_TESTS=OFF
-    	-DMSGPACK11_BUILD_EXAMPLES=OFF
+        -DMSGPACK11_BUILD_TESTS=OFF
+        -DMSGPACK11_BUILD_EXAMPLES=OFF
 )
 
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/msgpack11/vcpkg.json b/ports/msgpack11/vcpkg.json
new file mode 100644
index 00000000000000..0072e7dfd09d04
--- /dev/null
+++ b/ports/msgpack11/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "msgpack11",
+  "version": "0.0.10",
+  "port-version": 2,
+  "description": "msgpack11 is a tiny MsgPack library for C++11, providing MsgPack parsing and serialization.This library is inspired by json11.The API of msgpack11 is designed to be similar with json11.",
+  "homepage": "https://msgpack.org",
+  "dependencies": [
+    "gtest"
+  ]
+}
diff --git a/ports/opensubdiv/fix-version-search.patch b/ports/opensubdiv/fix-version-search.patch
new file mode 100644
index 00000000000000..7973472854feae
--- /dev/null
+++ b/ports/opensubdiv/fix-version-search.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake
+index 485e55e..1c98b91 100644
+--- a/cmake/FindOpenCL.cmake
++++ b/cmake/FindOpenCL.cmake
+@@ -177,7 +177,7 @@ if(_OPENCL_CPP_INCLUDE_DIRS)
+     
+     if(EXISTS "${OPENCL_INCLUDE_DIRS}/CL/cl.h")
+     
+-        file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_.*$")
++        file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_[0-9]+_[0-9]+.*$")
+ 
+         foreach(LINE ${LINES})
+         
diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake
index defd00a5a414d8..03ec368c22f1fb 100644
--- a/ports/opensubdiv/portfile.cmake
+++ b/ports/opensubdiv/portfile.cmake
@@ -8,14 +8,15 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix_compile-option.patch
+        fix-version-search.patch
 )
 
 if(VCPKG_TARGET_IS_LINUX)
     message(
 "OpenSubdiv currently requires the following libraries from the system package manager:
-    xinerama
+    xinerama xxf86vm
 
-These can be installed on Ubuntu systems via sudo apt install libxinerama-dev")
+These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxxf86vm-dev")
 endif()
 
 vcpkg_find_acquire_program(PYTHON2)
diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json
index 42a86d483f50ec..dc6b41f65afcab 100644
--- a/ports/opensubdiv/vcpkg.json
+++ b/ports/opensubdiv/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opensubdiv",
   "version-semver": "3.4.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "An Open-Source subdivision surface library.",
   "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv",
   "supports": "!arm & !uwp"
diff --git a/ports/qt5-wayland/CONTROL b/ports/qt5-wayland/CONTROL
deleted file mode 100644
index 84f8cd621c685d..00000000000000
--- a/ports/qt5-wayland/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: qt5-wayland
-Version: 5.15.2
-Description: Qt5 wayland Module; 
-Build-Depends: qt5-base[core]
diff --git a/ports/qt5-wayland/portfile.cmake b/ports/qt5-wayland/portfile.cmake
index a9d16989ea4643..42560f179f777b 100644
--- a/ports/qt5-wayland/portfile.cmake
+++ b/ports/qt5-wayland/portfile.cmake
@@ -1,6 +1,8 @@
-#Will not build on Windows! 
+#Will not build on Windows!
 message(WARNING "This port is just a placeholder until the required wayland libraries have been added into VCPKG! \
             As such the build will most likely fail until your system has the required wayland libraries installed (untested)")
-
+message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with
+sudo apt install libwayland-dev
+on Ubuntu systems.")
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation()
\ No newline at end of file
+qt_submodule_installation()
diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json
new file mode 100644
index 00000000000000..7ccb51624c5972
--- /dev/null
+++ b/ports/qt5-wayland/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "qt5-wayland",
+  "version-string": "5.15.2",
+  "port-version": 2,
+  "description": "Qt5 wayland Module;",
+  "supports": "linux",
+  "dependencies": [
+    {
+      "name": "qt5-base",
+      "default-features": false
+    }
+  ]
+}
diff --git a/ports/qtwayland/portfile.cmake b/ports/qtwayland/portfile.cmake
index 787758cbbd36ef..cac3fa73e388d2 100644
--- a/ports/qtwayland/portfile.cmake
+++ b/ports/qtwayland/portfile.cmake
@@ -1,6 +1,10 @@
 set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
+message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with
+sudo apt install libwayland-dev
+on Ubuntu systems.")
+
 set(${PORT}_PATCHES)
 
 set(TOOL_NAMES qtwaylandscanner)
diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json
index 9799150e1db707..ae2d9d17b4f352 100644
--- a/ports/qtwayland/vcpkg.json
+++ b/ports/qtwayland/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtwayland",
   "version-semver": "6.1.2",
+  "port-version": 2,
   "description": "A toolbox for making Qt based Wayland compositors",
   "homepage": "https://www.qt.io/",
   "supports": "!windows",
diff --git a/ports/soem/CONTROL b/ports/soem/CONTROL
deleted file mode 100644
index f3194a53bc28fc..00000000000000
--- a/ports/soem/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: soem
-Version: 1.4.0
-Homepage: https://github.com/OpenEtherCATsociety/SOEM
-Description: Simple Open Source EtherCAT Master
-Build-Depends: winpcap (windows)
diff --git a/ports/soem/disable-werror.patch b/ports/soem/disable-werror.patch
new file mode 100644
index 00000000000000..7c1fd96850f875
--- /dev/null
+++ b/ports/soem/disable-werror.patch
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1778965..4c481b7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,21 +13,18 @@ set(BUILD_TESTS TRUE)
+ 
+ if(WIN32)
+   set(OS "win32")
+-  find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
+-  find_library(winpcap_LIBRARY NAMES wpcap)
+-  find_library(packet_LIBRARY NAMES packet)
+-  include_directories(${winpcap_INCLUDE_DIRS})
++  find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
++  find_library(winpcap_LIBRARY NAMES wpcap)
++  find_library(packet_LIBRARY NAMES packet)
++  include_directories(${winpcap_INCLUDE_DIRS})
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  /WX")
+-  set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
++  set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
+ elseif(UNIX AND NOT APPLE)
+   set(OS "linux")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
+   set(OS_LIBS pthread rt)
+ elseif(APPLE)
+   # This must come *before* linux or MacOSX will identify as Unix.
+   set(OS "macosx")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
+   set(OS_LIBS pthread pcap)
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
+   set(OS "rtk")
+@@ -36,10 +33,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
+   include_directories(oshw/${OS}/${ARCH})
+   file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c)
+   set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format")
+   set(OS_LIBS "-Wl,--start-group -l${BSP} -l${ARCH} -lkern -ldev -lsio -lblock -lfs -lusb -llwip -leth -li2c -lrtc -lcan -lnand -lspi -lnor -lpwm -ladc -ltrace -lc -lm -Wl,--end-group")
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rtems")
+   message("Building for RTEMS")
diff --git a/ports/soem/portfile.cmake b/ports/soem/portfile.cmake
index 3eccfeb3a192ec..e80e64a3e1e5d8 100644
--- a/ports/soem/portfile.cmake
+++ b/ports/soem/portfile.cmake
@@ -8,8 +8,9 @@ vcpkg_from_github(
     REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0
     SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817
     HEAD_REF master
-    PATCHES 
+    PATCHES
         winpcap.patch
+        disable-werror.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/soem/vcpkg.json b/ports/soem/vcpkg.json
new file mode 100644
index 00000000000000..ffa002687d1149
--- /dev/null
+++ b/ports/soem/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "soem",
+  "version-string": "1.4.0",
+  "port-version": 2,
+  "description": "Simple Open Source EtherCAT Master",
+  "homepage": "https://github.com/OpenEtherCATsociety/SOEM",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "winpcap",
+      "platform": "windows"
+    }
+  ]
+}
diff --git a/ports/sophus/CONTROL b/ports/sophus/CONTROL
deleted file mode 100644
index d3c81de7744a9c..00000000000000
--- a/ports/sophus/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: sophus
-Version: 1.0.0-6
-Build-Depends: eigen3, ceres, suitesparse
-Homepage: https://github.com/strasdat/Sophus
-Description: Lie group library for C++
diff --git a/ports/sophus/disable-werror.patch b/ports/sophus/disable-werror.patch
new file mode 100644
index 00000000000000..60bfa7d5bab48c
--- /dev/null
+++ b/ports/sophus/disable-werror.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 844f304..952915b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,11 +16,11 @@ set(CMAKE_CXX_STANDARD 14)
+ IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    SET(CMAKE_CXX_FLAGS_DEBUG  "-O0 -g")
+    SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
+-   SET(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra -Wno-deprecated-register -std=c++14 -stdlib=libc++ -Wno-deprecated-register")
++   SET(CMAKE_CXX_FLAGS "-std=c++14 -stdlib=libc++")
+ ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    SET(CMAKE_CXX_FLAGS_DEBUG  "-O0 -g")
+    SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
+-   SET(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra -std=c++14 -Wno-deprecated-declarations -ftemplate-backtrace-limit=0")
++   SET(CMAKE_CXX_FLAGS "-std=c++14 -ftemplate-backtrace-limit=0")
+    SET(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_DEBUG} --coverage -fno-inline -fno-inline-small-functions -fno-default-inline")
+    SET(CMAKE_EXE_LINKER_FLAGS_COVERAGE "${CMAKE_EXE_LINKER_FLAGS_DEBUG} --coverage")
+    SET(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} --coverage")
diff --git a/ports/sophus/portfile.cmake b/ports/sophus/portfile.cmake
index ee7a6d576f354c..a906401262388e 100644
--- a/ports/sophus/portfile.cmake
+++ b/ports/sophus/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix_cmakelists.patch
+        disable-werror.patch
 )
 
 vcpkg_configure_cmake(
@@ -20,4 +21,4 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/ RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/sophus/vcpkg.json b/ports/sophus/vcpkg.json
new file mode 100644
index 00000000000000..ef8001d5eca167
--- /dev/null
+++ b/ports/sophus/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "sophus",
+  "version": "1.0.0",
+  "port-version": 7,
+  "description": "Lie group library for C++",
+  "homepage": "https://github.com/strasdat/Sophus",
+  "dependencies": [
+    "ceres",
+    "eigen3",
+    "suitesparse"
+  ]
+}
diff --git a/ports/tfhe/CONTROL b/ports/tfhe/CONTROL
deleted file mode 100644
index 514e5fbee92ec0..00000000000000
--- a/ports/tfhe/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: tfhe
-Version: 1.0.1-1
-Homepage: https://github.com/tfhe/tfhe
-Description: TFHE is open-source software distributed under the terms of the Apache 2.0 license.
diff --git a/ports/tfhe/portfile.cmake b/ports/tfhe/portfile.cmake
index aa98703ebcf9df..fc06a54a600b4f 100644
--- a/ports/tfhe/portfile.cmake
+++ b/ports/tfhe/portfile.cmake
@@ -10,6 +10,9 @@ vcpkg_from_github(
         mac-fix.patch
 )
 
+# Workaround for https://github.com/tfhe/tfhe/issues/246
+vcpkg_replace_string("${SOURCE_PATH}/src/CMakeLists.txt" "-Wall -Werror" "")
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/src
     PREFER_NINJA
@@ -20,4 +23,4 @@ vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/tfhe/vcpkg.json b/ports/tfhe/vcpkg.json
new file mode 100644
index 00000000000000..73898248b8f2d9
--- /dev/null
+++ b/ports/tfhe/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "tfhe",
+  "version-semver": "1.0.1",
+  "port-version": 2,
+  "description": "TFHE is open-source software distributed under the terms of the Apache 2.0 license.",
+  "homepage": "https://github.com/tfhe/tfhe",
+  "supports": "!windows"
+}
diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 12d3ffd920d554..43d729a42e658f 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -3,7 +3,7 @@
 #
 variables:
   windows-pool: 'PrWin-2021-07-09'
-  linux-pool: 'PrLin-2021-06-11'
+  linux-pool: 'PrLin-2021-07-13'
   osx-pool: 'PrOsx-2021-04-16'
 
 stages:
diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1
index 2bfaae2f0af5ee..52ce23774fd8f8 100755
--- a/scripts/azure-pipelines/linux/create-vmss.ps1
+++ b/scripts/azure-pipelines/linux/create-vmss.ps1
@@ -225,8 +225,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id
 $VM = Set-AzVMSourceImage `
   -VM $VM `
   -PublisherName 'Canonical' `
-  -Offer 'UbuntuServer' `
-  -Skus '18.04-LTS' `
+  -Offer '0001-com-ubuntu-server-focal' `
+  -Skus '20_04-lts' `
   -Version latest
 
 $VM = Set-AzVMBootDiagnostic -VM $VM -Disable
diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh
index 5336e86f6eb50b..66d8fe9321d2c3 100755
--- a/scripts/azure-pipelines/linux/provision-image.sh
+++ b/scripts/azure-pipelines/linux/provision-image.sh
@@ -8,7 +8,7 @@ sudo apt -y dist-upgrade
 # Install common build dependencies
 APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \
   build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \
-  libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev \
+  libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \
   libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \
   flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \
   xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \
@@ -39,8 +39,17 @@ APT_PACKAGES="$APT_PACKAGES python3-pip"
 # Additionally required by rtaudio
 APT_PACKAGES="$APT_PACKAGES libasound2-dev"
 
+# Additionally required by qtwebengine
+APT_PACKAGES="$APT_PACKAGES nodejs"
+
+# Additionally required by qtwayland
+APT_PACKAGES="$APT_PACKAGES libwayland-dev"
+
+# Additionally required by all GN projects
+APT_PACKAGES="$APT_PACKAGES python2 python-is-python3"
+
 # Additionally required/installed by Azure DevOps Scale Set Agents
-APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu60"
+APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66"
 
 sudo apt -y install $APT_PACKAGES
 
@@ -58,16 +67,16 @@ cd ~
 curl -sSL https://get.haskellstack.org/ | sudo sh
 
 # Install CUDA
-wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
-sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
-sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub
-sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
+wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin
+sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600
+sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub
+sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
 sudo apt -y update
 sudo apt install -y --no-install-recommends cuda-compiler-11-3 cuda-libraries-dev-11-3 cuda-driver-dev-11-3 \
   cuda-cudart-dev-11-3 libcublas-11-3 libcurand-dev-11-3 libcudnn8-dev libnccl2 libnccl-dev
 
 # Install PowerShell
-wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
+wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
 sudo dpkg -i packages-microsoft-prod.deb
 sudo apt update
 sudo add-apt-repository universe
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 3c705195b57cab..8d6ac650b7e9e0 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -52,6 +52,8 @@ azure-storage-cpp:arm64-windows=fail
 
 aubio:arm-uwp=fail
 aubio:x64-uwp=fail
+# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937
+bde:x64-linux=fail
 blend2d:arm64-windows=fail
 blend2d:arm-uwp=fail
 blend2d:x64-uwp=fail
@@ -1066,6 +1068,8 @@ ogdf:x64-windows        = skip
 ogdf:x64-windows-static = skip
 ogdf:x64-windows-static-md=skip
 ogdf:x86-windows        = skip
+# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936
+ogdf:x64-linux=fail
 ogre:x64-osx=fail
 # Conflicts with ogre
 ogre-next:arm64-windows      = skip
@@ -1290,11 +1294,6 @@ qt5-canvas3d:x86-windows=skip
 # Missing system libraries
 qt5-wayland:x64-osx=fail
 qtwayland:x64-osx=fail
-# Missing libraries
-qt5-wayland:x86-windows=fail
-qt5-wayland:x64-windows=fail
-qt5-wayland:x64-windows-static=fail
-qt5-wayland:x64-windows-static-md=fail
 # Missing prerequisites for CI success
 qt5-webengine:x64-linux=fail
 qt5-webengine:x64-osx=fail
@@ -1475,8 +1474,6 @@ soci:arm-uwp=fail
 soci:x64-uwp=fail
 sockpp:arm-uwp=fail
 sockpp:x64-uwp=fail
-soem:x64-uwp=fail
-soem:arm-uwp=fail
 soil2:arm-uwp=fail
 soil2:x64-uwp=fail
 soqt:arm64-windows=fail
@@ -1541,13 +1538,6 @@ teemo:arm64-windows=fail
 teemo:x64-osx=fail
 telnetpp:arm-uwp=fail
 telnetpp:x64-uwp=fail
-tfhe:x86-windows=fail
-tfhe:x64-windows=fail
-tfhe:x64-windows-static=fail
-tfhe:x64-windows-static-md=fail
-tfhe:x64-uwp=fail
-tfhe:arm64-windows=fail
-tfhe:arm-uwp=fail
 theia:arm64-windows      = skip
 theia:arm-uwp            = skip
 theia:x64-uwp            = skip
diff --git a/versions/baseline.json b/versions/baseline.json
index 1d13df61403923..3b39fc47fb7caf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2397,8 +2397,8 @@
       "port-version": 0
     },
     "graphqlparser": {
-      "baseline": "0.7.0-1",
-      "port-version": 0
+      "baseline": "0.7.0",
+      "port-version": 2
     },
     "greatest": {
       "baseline": "1.4.2",
@@ -4193,8 +4193,8 @@
       "port-version": 0
     },
     "msgpack11": {
-      "baseline": "0.0.10-1",
-      "port-version": 0
+      "baseline": "0.0.10",
+      "port-version": 2
     },
     "msinttypes": {
       "baseline": "2018-02-25",
@@ -4638,7 +4638,7 @@
     },
     "opensubdiv": {
       "baseline": "3.4.3",
-      "port-version": 1
+      "port-version": 2
     },
     "opentracing": {
       "baseline": "1.6.0",
@@ -5230,7 +5230,7 @@
     },
     "qt5-wayland": {
       "baseline": "5.15.2",
-      "port-version": 0
+      "port-version": 2
     },
     "qt5-webchannel": {
       "baseline": "5.15.2",
@@ -5362,7 +5362,7 @@
     },
     "qtwayland": {
       "baseline": "6.1.2",
-      "port-version": 0
+      "port-version": 2
     },
     "quadtree": {
       "baseline": "2020-04-13",
@@ -5866,7 +5866,7 @@
     },
     "soem": {
       "baseline": "1.4.0",
-      "port-version": 0
+      "port-version": 2
     },
     "soil": {
       "baseline": "2021-04-22",
@@ -5889,8 +5889,8 @@
       "port-version": 0
     },
     "sophus": {
-      "baseline": "1.0.0-6",
-      "port-version": 0
+      "baseline": "1.0.0",
+      "port-version": 7
     },
     "soqt": {
       "baseline": "1.6.0",
@@ -6157,8 +6157,8 @@
       "port-version": 8
     },
     "tfhe": {
-      "baseline": "1.0.1-1",
-      "port-version": 0
+      "baseline": "1.0.1",
+      "port-version": 2
     },
     "tgbot-cpp": {
       "baseline": "1.2.1",
diff --git a/versions/g-/graphqlparser.json b/versions/g-/graphqlparser.json
index d577bf05e9f84d..e1240fb532907e 100644
--- a/versions/g-/graphqlparser.json
+++ b/versions/g-/graphqlparser.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1bddecee3cfbfe8826912f0b5de6bdf0b4f1a880",
+      "version-string": "0.7.0",
+      "port-version": 2
+    },
     {
       "git-tree": "24d87a9dc777a9ebd15ec9ff2ab7ade51134c86d",
       "version-string": "0.7.0-1",
diff --git a/versions/m-/msgpack11.json b/versions/m-/msgpack11.json
index a5ac8ea6ced495..ae8c3847cdd489 100644
--- a/versions/m-/msgpack11.json
+++ b/versions/m-/msgpack11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7d1352df08016b8ba7b2de4fa027e4b37825bb8e",
+      "version": "0.0.10",
+      "port-version": 2
+    },
     {
       "git-tree": "893e52e19e5a4b783a02f7be49825f9fa3903255",
       "version-string": "0.0.10-1",
diff --git a/versions/o-/opensubdiv.json b/versions/o-/opensubdiv.json
index d0c5cb18ce34ae..6fd0886032aad5 100644
--- a/versions/o-/opensubdiv.json
+++ b/versions/o-/opensubdiv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8158645b04f25a236cd3fdf2debc67b10cfd945",
+      "version-semver": "3.4.3",
+      "port-version": 2
+    },
     {
       "git-tree": "2ca1bb01f46ea1e8d94d453dfc9e535a8bb220b0",
       "version-semver": "3.4.3",
diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json
index f9bfb9c789f915..5960d4316a8e43 100644
--- a/versions/q-/qt5-wayland.json
+++ b/versions/q-/qt5-wayland.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "10dc10d68dd34e3db201364ec60567459c6857dc",
+      "version-string": "5.15.2",
+      "port-version": 2
+    },
     {
       "git-tree": "d35832bb03e8a61250192130ec88cd32ad432c48",
       "version-string": "5.15.2",
diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json
index 63008b3e47883f..b688f4d87b0865 100644
--- a/versions/q-/qtwayland.json
+++ b/versions/q-/qtwayland.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c520a4f068d807c3ec5bc04accf5af463007a1b8",
+      "version-semver": "6.1.2",
+      "port-version": 2
+    },
     {
       "git-tree": "39df5f0a73c89113b633ae47582d88e6b63b09c3",
       "version-semver": "6.1.2",
diff --git a/versions/s-/soem.json b/versions/s-/soem.json
index bcdf0b6c387736..5cf0babc9b1050 100644
--- a/versions/s-/soem.json
+++ b/versions/s-/soem.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "df36d49ff0f6b1755c5a1a046c98c4d0df0e7d77",
+      "version-string": "1.4.0",
+      "port-version": 2
+    },
     {
       "git-tree": "629ce214f8cc2718e87c5130d2bdce15490bf20e",
       "version-string": "1.4.0",
diff --git a/versions/s-/sophus.json b/versions/s-/sophus.json
index d4d1283e43e0d7..f31dd71d63d7af 100644
--- a/versions/s-/sophus.json
+++ b/versions/s-/sophus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4826fe050e6cfd22a46d50ab3d6258a39d2bb69f",
+      "version": "1.0.0",
+      "port-version": 7
+    },
     {
       "git-tree": "079947ab617bc50fc9c45b4a88a152c94c31ec58",
       "version-string": "1.0.0-6",
diff --git a/versions/t-/tfhe.json b/versions/t-/tfhe.json
index 6f952afd33463c..d44f73e0c2f499 100644
--- a/versions/t-/tfhe.json
+++ b/versions/t-/tfhe.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e87faaf58cb9feb686fe28d31f24cedf27e2aec1",
+      "version-semver": "1.0.1",
+      "port-version": 2
+    },
     {
       "git-tree": "ee11a6e5e9e756c531b78822f6465a4b43dc048e",
       "version-string": "1.0.1-1",