diff --git a/ports/libyaml/export-pkgconfig.patch b/ports/libyaml/export-pkgconfig.patch
index f104be4aaf..5e0d5a3b74 100644
--- a/ports/libyaml/export-pkgconfig.patch
+++ b/ports/libyaml/export-pkgconfig.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 4f81148..8006536 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -158,3 +158,10 @@ install(
+@@ -158,3 +158,11 @@ install(
    FILES ${config_version_file}
    DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development
    )
@@ -11,5 +11,6 @@ index 4f81148..8006536 100644
 +set(exec_prefix ${CMAKE_INSTALL_PREFIX})
 +set(includedir ${CMAKE_INSTALL_PREFIX}/include)
 +set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
++set(PACKAGE_VERSION 0.1)
 +configure_file(yaml-0.1.pc.in ${PROJECT_BINARY_DIR}/yaml-0.1.pc @ONLY)
 +install(FILES ${PROJECT_BINARY_DIR}/yaml-0.1.pc DESTINATION lib/pkgconfig)
diff --git a/ports/libyaml/vcpkg.json b/ports/libyaml/vcpkg.json
index e2e22b722f..06a3e7600f 100644
--- a/ports/libyaml/vcpkg.json
+++ b/ports/libyaml/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libyaml",
   "version-string": "0.2.5",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A C library for parsing and emitting YAML.",
   "homepage": "https://github.com/yaml/libyaml",
   "dependencies": [
diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json
index ab51564a23..c167968da5 100644
--- a/ports/qtapplicationmanager/vcpkg.json
+++ b/ports/qtapplicationmanager/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtapplicationmanager",
   "version-semver": "6.2.2",
+  "port-version": 1,
   "description": "Qt component for application lifecycle management",
   "homepage": "https://www.qt.io/",
   "supports": "!(windows & arm)",
diff --git a/ports/qtapplicationmanager/wrapper-fixes.patch b/ports/qtapplicationmanager/wrapper-fixes.patch
index 058df84189..194e35f816 100644
--- a/ports/qtapplicationmanager/wrapper-fixes.patch
+++ b/ports/qtapplicationmanager/wrapper-fixes.patch
@@ -47,7 +47,7 @@ index 1dab912..c09e97f 100644
 +    endif()
 +else()
 +    add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED)
-+    target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES})
++    target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE PkgConfig::pc_libyaml)
  endif()
 -
 -add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED)
diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake
index 587d6192cf..6598117f6b 100644
--- a/ports/qtbase/cmake/qt_install_submodule.cmake
+++ b/ports/qtbase/cmake/qt_install_submodule.cmake
@@ -34,6 +34,7 @@ function(qt_download_submodule)
         URL "https://code.qt.io/qt/${PORT}.git"
         REF "${${PORT}_REF}"
         ${UPDATE_PORT_GIT_OPTIONS}
+        ${QT_FETCH_REF}
         PATCHES ${_qarg_PATCHES}
     )
 
diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake
index 963fc1ee84..ec0610ab3f 100644
--- a/ports/qtbase/cmake/qt_port_details.cmake
+++ b/ports/qtbase/cmake/qt_port_details.cmake
@@ -7,9 +7,11 @@ if(PORT MATCHES "qtquickcontrols2")
 endif()
 
 ### Setting up the git tag.
+set(QT_FETCH_REF "")
 set(QT_GIT_TAG "v${QT_VERSION}")
 if(PORT MATCHES "qtdeviceutilities|qtlocation|qtinterfaceframework|qtapplicationmanager")
     # So much for consistency ....
+    set(QT_FETCH_REF FETCH_REF "${QT_VERSION}")
     set(QT_GIT_TAG "${QT_VERSION}")
 endif()
 
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 09a3cc7667..61c1c67c85 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtbase",
   "version-semver": "6.2.2",
+  "port-version": 1,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 7f2e8121c0..fe586e6fff 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4094,7 +4094,7 @@
     },
     "libyaml": {
       "baseline": "0.2.5",
-      "port-version": 2
+      "port-version": 3
     },
     "libyuv": {
       "baseline": "2021-04-15",
@@ -5694,11 +5694,11 @@
     },
     "qtapplicationmanager": {
       "baseline": "6.2.2",
-      "port-version": 0
+      "port-version": 1
     },
     "qtbase": {
       "baseline": "6.2.2",
-      "port-version": 0
+      "port-version": 1
     },
     "qtcharts": {
       "baseline": "6.2.2",
diff --git a/versions/l-/libyaml.json b/versions/l-/libyaml.json
index 4bed0c46c3..3c90caf31c 100644
--- a/versions/l-/libyaml.json
+++ b/versions/l-/libyaml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a7af4d5e003c4971aa031bf5533ac14f35e91d7",
+      "version-string": "0.2.5",
+      "port-version": 3
+    },
     {
       "git-tree": "888d62d1f7440f3c9c5ff403e85175372903c0ef",
       "version-string": "0.2.5",
diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json
index 141a3cd0e6..f6d3dcf73e 100644
--- a/versions/q-/qtapplicationmanager.json
+++ b/versions/q-/qtapplicationmanager.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "79db0a47002752179eb5aacedca44c0bc670030c",
+      "version-semver": "6.2.2",
+      "port-version": 1
+    },
     {
       "git-tree": "ca033ed7578b002c1ce195d879c622333231d159",
       "version-semver": "6.2.2",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index ce35abda75..bae58a9e82 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c343c019fd735cbe38bd56b00460539e94eaa9a",
+      "version-semver": "6.2.2",
+      "port-version": 1
+    },
     {
       "git-tree": "c314a6af00c3a57bbd887c834cc0b5f80bfd65fc",
       "version-semver": "6.2.2",