diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake
index fcbf82491f..d17a421156 100644
--- a/ports/discordcoreapi/portfile.cmake
+++ b/ports/discordcoreapi/portfile.cmake
@@ -10,8 +10,21 @@ vcpkg_from_github(
     HEAD_REF main
 )
 
+# discordcoreapi consumes extreme amounts of memory (>9GB per .cpp file). With our default
+# concurrency values this causes hanging and/or OOM killing on Linux build machines and
+# warnings on the Windows machines like:
+# #[warning]Free memory is lower than 5%; Currently used: 99.99%
+# #[warning]Free memory is lower than 5%; Currently used: 99.99%
+# #[warning]Free memory is lower than 5%; Currently used: 99.99%
+# Cut the requested concurrency in quarter to avoid this.
+if(VCPKG_CONCURRENCY GREATER 4)
+    math(EXPR VCPKG_CONCURRENCY "${VCPKG_CONCURRENCY} / 4")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    # Due to CMake/DCADetectArchitecture.cmake invoking a sub-CMake and using the source tree as the target
+    DISABLE_PARALLEL_CONFIGURE
 )
 
 vcpkg_cmake_install()
diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json
index 10fc18de5f..3417fc992a 100644
--- a/ports/discordcoreapi/vcpkg.json
+++ b/ports/discordcoreapi/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "discordcoreapi",
   "version": "2.0.7",
+  "port-version": 1,
   "description": "A Discord bot library written in C++ using custom asynchronous coroutines.",
   "homepage": "https://discordcoreapi.com",
   "license": "MIT",
diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake
index 94f782669b..79b10828fc 100644
--- a/ports/jsonifier/portfile.cmake
+++ b/ports/jsonifier/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO realtimechris/jsonifier
-    REF "v${VERSION}"    
+    REF "v${VERSION}"
     SHA512 6168378a117850297fcda78853a0babd0ce7e0ca21b3e8c276acb7e75e04d85ed8909061a62e3324c309fe9e31bc59d89ea06e47853b50481843273e95172ab8
     HEAD_REF main
 )
@@ -10,6 +10,8 @@ set(VCPKG_BUILD_TYPE release) # header-only
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    # Due to CMake/JsonifierDetectArchitecture.cmake invoking a sub-CMake and using the source tree as the target
+    DISABLE_PARALLEL_CONFIGURE
 )
 
 vcpkg_cmake_install()
diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json
index 705154254e..da80b4e090 100644
--- a/ports/jsonifier/vcpkg.json
+++ b/ports/jsonifier/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "jsonifier",
   "version": "0.9.97",
+  "port-version": 1,
   "description": "A few classes for parsing and serializing json - very rapidly.",
   "homepage": "https://github.com/realtimechris/jsonifier",
   "license": "MIT",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 527e0ca759..8a43f1d208 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -289,7 +289,9 @@ directxsdk:x64-windows-static=skip
 directxsdk:x64-windows-static-md=skip
 discord-rpc:arm64-uwp=fail
 discord-rpc:x64-uwp=fail
-discordcoreapi:x64-linux=skip   # cause linux CI to hang https://github.com/microsoft/vcpkg/pull/40229
+# Needs newer GCC than we have
+discordcoreapi:x64-linux=fail
+# Needs newer standard library than we have
 discordcoreapi:x64-osx=fail
 discount:x64-android=fail
 eathread:x64-android=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 1987cb7a00..e50c830727 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2358,7 +2358,7 @@
     },
     "discordcoreapi": {
       "baseline": "2.0.7",
-      "port-version": 0
+      "port-version": 1
     },
     "discount": {
       "baseline": "3.0.0d",
@@ -3910,7 +3910,7 @@
     },
     "jsonifier": {
       "baseline": "0.9.97",
-      "port-version": 0
+      "port-version": 1
     },
     "jsonnet": {
       "baseline": "0.20.0",
diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json
index 1982660999..9902de2ffd 100644
--- a/versions/d-/discordcoreapi.json
+++ b/versions/d-/discordcoreapi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1371e3f72145af807a144e3fadb1daf58c0b7cdd",
+      "version": "2.0.7",
+      "port-version": 1
+    },
     {
       "git-tree": "b3a2a5137d39b32f98a88f4e454b885a6097929f",
       "version": "2.0.7",
diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json
index 2e819d4c44..af011007e6 100644
--- a/versions/j-/jsonifier.json
+++ b/versions/j-/jsonifier.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5d654c9f844e2a31fdefed0d5e628d241e6451f6",
+      "version": "0.9.97",
+      "port-version": 1
+    },
     {
       "git-tree": "dfff3ea4e35d5d5df9f66101829cfe766e5b6f66",
       "version": "0.9.97",