diff --git a/ports/aeron/vcpkg.json b/ports/aeron/vcpkg.json
index 0d6a71cdb3..c887772a40 100644
--- a/ports/aeron/vcpkg.json
+++ b/ports/aeron/vcpkg.json
@@ -2,11 +2,11 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "aeron",
   "version": "1.49.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Efficient reliable UDP unicast, UDP multicast, and IPC message transport",
   "homepage": "https://github.com/aeron-io/aeron",
   "license": "Apache-2.0",
-  "supports": "(x64 & windows & !uwp & !xbox) | ((x64 | arm64) & !windows & !android)",
+  "supports": "!((x86 | arm64) & windows) & !android & !uwp & !xbox",
   "dependencies": [
     {
       "name": "libuuid",
@@ -24,7 +24,7 @@
   "features": {
     "archive": {
       "description": "Build Aeron Archive API for recording and replaying message streams (requires Java)",
-      "supports": "(x64 & windows & !uwp & !xbox) | ((x64 | arm64) & !windows & !android)"
+      "supports": "!((x86 | arm64) & windows) & !android & !uwp & !xbox"
     }
   }
 }
diff --git a/ports/dpdk/vcpkg.json b/ports/dpdk/vcpkg.json
index 7ed43ab2de..9d071a2d8d 100644
--- a/ports/dpdk/vcpkg.json
+++ b/ports/dpdk/vcpkg.json
@@ -1,11 +1,12 @@
 {
   "name": "dpdk",
   "version": "25.11",
+  "port-version": 1,
   "description": "A set of libraries and drivers for fast packet processing",
   "homepage": "https://www.dpdk.org/",
   "documentation": "https://doc.dpdk.org/guides/",
   "license": "BSD-3-Clause",
-  "supports": "freebsd | linux | (windows & x64)",
+  "supports": "freebsd | linux",
   "dependencies": [
     {
       "name": "libarchive",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index c481aed1d8..0357924ad3 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -38,9 +38,6 @@
 ##
 
 # Add new items alphabetically
-aeron:arm-neon-android=fail
-aeron:arm64-android=fail
-aeron:x64-android=fail
 apr:arm-neon-android=fail
 apr:arm64-android=fail
 apr:x64-android=fail
@@ -52,9 +49,6 @@ arpack-ng:x64-windows-static=fail
 arrayfire:x64-linux=fail
 atliac-minitest:arm64-uwp=fail
 atliac-minitest:x64-uwp=fail
-avro-c:arm-neon-android=fail
-avro-c:arm64-android=fail
-avro-c:x64-android=fail
 azure-storage-cpp:arm64-osx=fail
 azure-storage-cpp:x64-linux=fail
 backward-cpp:arm-neon-android=fail
@@ -162,9 +156,6 @@ cppcoro:x64-linux=fail
 crashpad:x64-linux=fail #Compilation failed due to the lack of Clang++ compiler.
 ctbench:arm64-osx=fail
 ctp:x64-android=fail
-czmq:arm-neon-android=fail
-czmq:arm64-android=fail
-czmq:x64-android=fail
 # Since pipeline cannot automatically install dbghelp dependency, skip this detection
 dbghelp:arm64-uwp=skip
 dbghelp:arm64-windows-static-md=skip
@@ -420,8 +411,6 @@ libxt:x64-windows-release=fail # Appears to have broken races
 libxt:x64-windows=fail
 live555:arm64-uwp=fail
 live555:x64-uwp=fail
-llfio:arm-neon-android=fail
-llfio:arm64-android=fail
 llfio:x64-android=fail
 llgl:arm-neon-android=fail
 llgl:arm64-android=fail
@@ -589,10 +578,6 @@ qtopcua:x64-android=fail
 qtwayland:arm64-osx=skip
 quickfix:arm-neon-android=fail
 quickfix:arm64-android=fail
-# file conflicts with rbdl
-rbdl:arm-neon-android=fail
-rbdl:arm64-android=fail
-rbdl:x64-android=fail
 restbed:arm-neon-android=fail
 restbed:arm64-android=fail
 restbed:arm64-uwp=fail
@@ -741,7 +726,6 @@ zookeeper:x64-windows-static-md=fail
 zookeeper:x64-windows-static=fail
 zookeeper:x64-windows=fail
 zookeeper:x86-windows=fail
-zyre:arm64-windows-static-md=fail
 
 # Ports which needs to pass in CI
 cmake:arm64-osx=pass
diff --git a/versions/a-/aeron.json b/versions/a-/aeron.json
index 1484b8094b..d85e260a57 100644
--- a/versions/a-/aeron.json
+++ b/versions/a-/aeron.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "99b549362720ba9d2df482b3e21b9009a4f5f94b",
+      "version": "1.49.3",
+      "port-version": 2
+    },
     {
       "git-tree": "c7c0110b039da7b02fbf0a42de05428df118d56a",
       "version": "1.49.3",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4dd5c26224..f6ea9340f1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -58,7 +58,7 @@
     },
     "aeron": {
       "baseline": "1.49.3",
-      "port-version": 1
+      "port-version": 2
     },
     "air-ctl": {
       "baseline": "1.1.2",
@@ -2550,7 +2550,7 @@
     },
     "dpdk": {
       "baseline": "25.11",
-      "port-version": 0
+      "port-version": 1
     },
     "dpp": {
       "baseline": "10.1.4",
diff --git a/versions/d-/dpdk.json b/versions/d-/dpdk.json
index 8a37213323..f17da6a470 100644
--- a/versions/d-/dpdk.json
+++ b/versions/d-/dpdk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1ae5ab5a636f2c9dc7972c69a9c554bfe16823b5",
+      "version": "25.11",
+      "port-version": 1
+    },
     {
       "git-tree": "cc65391748bf0876d288a5a18f8ac58798b367d0",
       "version": "25.11",