diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake
index 603eab88a0..5be5d42d04 100644
--- a/ports/gazebo/portfile.cmake
+++ b/ports/gazebo/portfile.cmake
@@ -30,12 +30,20 @@ vcpkg_cmake_configure(
         -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON
         -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe
         ${FEATURE_OPTIONS}
+        -DBUILD_TESTING=OFF  # Not enabled by default, but to be sure
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo")
 vcpkg_copy_pdbs()
 
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gazebo-11/gazebo/test")
+
+foreach(postfix "" "-11")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..")
+endforeach()
+
 vcpkg_copy_tools(
     TOOL_NAMES gazebo gz gzclient gzserver
     AUTO_CLEAN
@@ -48,5 +56,6 @@ endforeach()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
+vcpkg_fixup_pkgconfig()
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json
index 8f4bd52869..0d88306bc7 100644
--- a/ports/gazebo/vcpkg.json
+++ b/ports/gazebo/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gazebo",
   "version-date": "2022-01-20",
+  "port-version": 1,
   "description": "Open source robotics simulator.",
   "homepage": "http://gazebosim.org",
   "license": "Apache-2.0",
diff --git a/ports/ignition-transport8/portfile.cmake b/ports/ignition-transport8/portfile.cmake
index a01b24ee2f..7ca8513e7c 100644
--- a/ports/ignition-transport8/portfile.cmake
+++ b/ports/ignition-transport8/portfile.cmake
@@ -1,5 +1,3 @@
 ignition_modular_library(NAME transport
                          VERSION "8.1.0"
-                         SHA512 04b4cd954453505398da35b284e7db4b4691d9a705924c41e0082fd20e94176a3eaeae7329fd9992aaa50f90b2d8973c71daf763ccff58aa30d06be1da15189a
-                         # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 )
-                         DISABLE_PKGCONFIG_INSTALL)
+                         SHA512 04b4cd954453505398da35b284e7db4b4691d9a705924c41e0082fd20e94176a3eaeae7329fd9992aaa50f90b2d8973c71daf763ccff58aa30d06be1da15189a)
diff --git a/ports/ignition-transport8/vcpkg.json b/ports/ignition-transport8/vcpkg.json
index 0c088bc709..52bcedab15 100644
--- a/ports/ignition-transport8/vcpkg.json
+++ b/ports/ignition-transport8/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ignition-transport8",
   "version": "8.1.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Transport middleware for robotics",
   "license": null,
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index cb04d73b13..4d0ae6f40f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2426,7 +2426,7 @@
     },
     "gazebo": {
       "baseline": "2022-01-20",
-      "port-version": 0
+      "port-version": 1
     },
     "gcem": {
       "baseline": "1.14.1",
@@ -2898,7 +2898,7 @@
     },
     "ignition-transport8": {
       "baseline": "8.1.0",
-      "port-version": 3
+      "port-version": 4
     },
     "ignition-transport9": {
       "baseline": "9.0.0",
diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json
index 78d9fcac42..57626811bb 100644
--- a/versions/g-/gazebo.json
+++ b/versions/g-/gazebo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "702a7de5c38ff156813a73a32eac6c7ca73248e4",
+      "version-date": "2022-01-20",
+      "port-version": 1
+    },
     {
       "git-tree": "983e90284c8c0073e0193750a412eb4df01accdc",
       "version-date": "2022-01-20",
diff --git a/versions/i-/ignition-transport8.json b/versions/i-/ignition-transport8.json
index fbfbbafb4b..06f92d704b 100644
--- a/versions/i-/ignition-transport8.json
+++ b/versions/i-/ignition-transport8.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "967c8839fce7bd85b58ed1d4a5506a2be278a8ef",
+      "version": "8.1.0",
+      "port-version": 4
+    },
     {
       "git-tree": "df4d904c15b18ca24200a42fdfc4e5930c91618a",
       "version": "8.1.0",