diff --git a/ports/libbson/CONTROL b/ports/libbson/CONTROL
index f8bb6bb951..6c929c8830 100644
--- a/ports/libbson/CONTROL
+++ b/ports/libbson/CONTROL
@@ -1,4 +1,5 @@
 Source: libbson
 Version: 1.16.1
+Port-Version: 1
 Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.
 Homepage: https://github.com/mongodb/libbson
diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake
index f608be1989..8430b3ef62 100644
--- a/ports/libbson/portfile.cmake
+++ b/ports/libbson/portfile.cmake
@@ -23,6 +23,7 @@ string(REGEX REPLACE ".+Version:[ ]*([\\.0-9]+).*" "\\1" BUILD_VERSION "${_conte
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DENABLE_MONGOC=OFF
         -DENABLE_BSON=ON
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index bc4657f484..63bf033183 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -329,8 +329,6 @@ dlfcn-win32:x64-uwp=fail
 dmlc:arm-uwp=fail
 dmlc:arm64-windows=fail
 dmlc:x64-uwp=fail
-dmlc:x64-windows-static=fail
-dmlc:x86-windows=fail
 dpdk:arm-uwp=fail
 dpdk:arm64-windows=fail
 dpdk:x64-linux=fail
@@ -442,9 +440,6 @@ fmilib:arm64-windows=fail
 fmilib:arm-uwp=fail
 fmilib:x64-linux=fail
 fmilib:x64-uwp=fail
-fmilib:x64-windows=fail
-fmilib:x64-windows-static=fail
-fmilib:x86-windows=fail
 foonathan-memory:arm64-windows=fail
 foonathan-memory:arm-uwp=fail
 foonathan-memory:x64-uwp=fail
@@ -463,11 +458,8 @@ freetds:x64-osx=fail
 freetds:x64-uwp=fail
 freetype-gl:x64-uwp=fail
 freexl:arm-uwp=fail
-freexl:arm64-windows=fail
 freexl:x64-uwp=fail
-freexl:x86-windows=fail
 freexl:x64-windows=fail
-freexl:x64-windows-static=fail
 fribidi:arm64-windows=fail
 fribidi:arm-uwp=fail
 fribidi:x64-linux=fail
@@ -1030,7 +1022,6 @@ mhook:x64-osx=fail
 mhook:x64-uwp=fail
 milerius-sfml-imgui:x64-osx=fail
 milerius-sfml-imgui:x64-windows-static=fail
-milerius-sfml-imgui:x64-linux=fail
 mimalloc:arm64-windows=fail
 mimalloc:arm-uwp=fail
 mimalloc:x64-uwp=fail
@@ -1092,7 +1083,6 @@ moos-core:x86-windows=fail
 moos-essential:arm64-windows=fail
 moos-essential:x64-windows=fail
 moos-essential:x86-windows=fail
-moos-essential:x64-linux=fail
 mozjpeg:arm64-windows      = skip
 mozjpeg:arm-uwp            = skip
 mozjpeg:x64-linux          = skip
@@ -1150,12 +1140,7 @@ nanorange:x64-windows=fail
 nanorange:x64-windows-static=fail
 nanorange:x86-windows=fail
 nanovg:arm-uwp=fail
-nanovg:arm64-windows=fail
 nanovg:x64-uwp=fail
-nanovg:x64-linux=fail
-nanovg:x64-windows=fail
-nanovg:x64-windows-static=fail
-nanovg:x86-windows=skip
 nativefiledialog:arm-uwp=fail
 nativefiledialog:x64-uwp=fail
 nethost:x64-uwp=fail
@@ -1476,7 +1461,6 @@ qt5-x11extras:x64-windows-static=fail
 qt5-translations:x64-windows-static=skip
 quickfix:arm-uwp=fail
 quickfix:arm64-windows=fail
-quickfix:x64-linux=fail
 quickfix:x64-uwp=fail
 quickfix:x64-windows-static=fail
 quickfix:x64-windows=fail