diff --git a/ports/fastrtps/CONTROL b/ports/fastrtps/CONTROL
index edbe4b7d46c..97748211c18 100644
--- a/ports/fastrtps/CONTROL
+++ b/ports/fastrtps/CONTROL
@@ -1,4 +1,4 @@
 Source: fastrtps
-Version: 1.5.0
+Version: 1.5.0-1
 Description: Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.
 Build-Depends: openssl, asio, tinyxml2
\ No newline at end of file
diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake
index 855d9f8b566..0dce8ed73c5 100644
--- a/ports/fastrtps/portfile.cmake
+++ b/ports/fastrtps/portfile.cmake
@@ -21,12 +21,13 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
-file(COPY ${CURRENT_PACKAGES_DIR}/lib/fastrtps DESTINATION ${CURRENT_PACKAGES_DIR}/share)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/fastrtps/cmake)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/examples)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/fastrtps)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/fastrtps)
 
 file(RENAME ${CURRENT_PACKAGES_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/fastrtps/copyright)
diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake
index c6a625e82c7..52a891b695c 100644
--- a/ports/forest/portfile.cmake
+++ b/ports/forest/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xorz57/forest
-    REF 9.0.1
-    SHA512 4c7cda31c49afffd2ade97481eb47455c58d9d4ba1015661e08abe0b9db34f7d69ea9bd932f792b8bd2f6c92d38dc30e2a64b8ff34b4c4204b8da2260c15ae66
+    REF bc6b82ce436dfbf60d6e8882252c55cf923ad99e
+    SHA512 e711148025c40fb73e6ae221fe5a4416bea006994d9ff958d565cd3cefa75c9ee7241087c7470ecb6530be073ac9171fe724351898ecd33db61f5752c3a950bc
     HEAD_REF master
 )
 
diff --git a/ports/octomap/CONTROL b/ports/octomap/CONTROL
index 6b26d7ef110..21c72834f94 100644
--- a/ports/octomap/CONTROL
+++ b/ports/octomap/CONTROL
@@ -1,3 +1,3 @@
 Source: octomap
-Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-2
+Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-3
 Description: An Efficient Probabilistic 3D Mapping Framework Based on Octrees
diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake
index 099a1ed7892..e07551dbef8 100644
--- a/ports/octomap/portfile.cmake
+++ b/ports/octomap/portfile.cmake
@@ -4,20 +4,20 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 
 include(vcpkg_common_functions)
-set(GIT_REF "cefed0c1d79afafa5aeb05273cf1246b093b771c")
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/octomap-${GIT_REF})
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://codeload.github.com/OctoMap/octomap/zip/${GIT_REF}"
-    FILENAME "octomap-${GIT_REF}.zip"
-    SHA512 0d470ea9929a80366314a6e99717f68f489e8b58f26ae79bd02b7c1a4f1d8ee64591d61d95154724caefc5a0b71e1dab96a1280d9ff927c6e4d854b25b509295
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO OctoMap/octomap
+    REF cefed0c1d79afafa5aeb05273cf1246b093b771c
+    SHA512 8fdea8b33680488d41e570d55ff88c20b923efb9d48238031f9b96d2e3917dbe7e49699769de63794f4b1d24e40a99615151e72487f30de340a3abf6522ea156
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
+    OPTIONS
+        -DBUILD_OCTOVIS_SUBPROJECT=OFF
+        -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF
+        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()
@@ -43,9 +43,7 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/eval_octree_accuracy.exe)
 file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/graph2tree.exe)
 file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/log2graph.exe)
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/share/octomap/octomap-targets-debug.cmake _contents)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/octomap/octomap-targets-debug.cmake "${_contents}")
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/octomap)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
@@ -56,4 +54,4 @@ file(COPY ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/octomap/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/octomap/copyright)
 
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/octomap)
\ No newline at end of file
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/octomap)
diff --git a/ports/sol2/portfile.cmake b/ports/sol2/portfile.cmake
index 584f9af9dd8..403e9e6465f 100644
--- a/ports/sol2/portfile.cmake
+++ b/ports/sol2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ThePhD/sol2
-    REF v2.20.4
-    SHA512 dacacf57da3d1be3f20542ba83676e247a0d5815d0ee5dbfdbe996ffa264a5aaa71d7e5088088b0f1b41001f681d3c81339fc3f1ba394095eeaef4cb9376499a
+    REF 7f1c2e3ecfc2b78e396c60e067f6486ae1df66c5
+    SHA512 a7e84d3eca26fb3cd4eb73ce0daa2f6f41136e9e919f27713d2d903ec7793017dfd87e7c4fdf54b9ee9b601da1412dad02a191dd614661dfa96da521dfc58a65
     HEAD_REF develop
 )