diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json
index a93cf1f6f3..29b3035dff 100644
--- a/ports/apsi/vcpkg.json
+++ b/ports/apsi/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "apsi",
   "version-semver": "0.7.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "APSI is a research library for asymmetric private set intersection.",
   "homepage": "https://github.com/microsoft/APSI",
-  "supports": "static",
+  "supports": "static & !(arm & osx)",
   "dependencies": [
     "flatbuffers",
     "jsoncpp",
diff --git a/ports/bde/vcpkg.json b/ports/bde/vcpkg.json
index 7fffab8885..b4e77488fd 100644
--- a/ports/bde/vcpkg.json
+++ b/ports/bde/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bde",
-  "version-string": "3.2.0.0",
-  "port-version": 4,
+  "version": "3.2.0.0",
+  "port-version": 5,
   "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.",
-  "supports": "!windows"
+  "supports": "!windows & !arm"
 }
diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json
index 748a662937..67c0e31197 100644
--- a/ports/brpc/vcpkg.json
+++ b/ports/brpc/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "brpc",
-  "version-string": "0.9.7",
-  "port-version": 6,
+  "version": "0.9.7",
+  "port-version": 7,
   "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
   "homepage": "https://github.com/apache/incubator-brpc",
   "license": "Apache-2.0",
-  "supports": "!windows",
+  "supports": "!windows & !arm",
   "dependencies": [
     "gflags",
     "glog",
diff --git a/ports/ctemplate/vcpkg.json b/ports/ctemplate/vcpkg.json
index 2f3d6bd413..7a8c84bbf1 100644
--- a/ports/ctemplate/vcpkg.json
+++ b/ports/ctemplate/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "ctemplate",
   "version-date": "2020-09-14",
-  "port-version": 2,
+  "port-version": 3,
   "description": "C++ CTemplate system",
-  "homepage": "https://github.com/OlafvdSpek/ctemplate"
+  "homepage": "https://github.com/OlafvdSpek/ctemplate",
+  "supports": "!arm"
 }
diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json
index 10616156b7..8f0d893d0c 100644
--- a/ports/dcmtk/vcpkg.json
+++ b/ports/dcmtk/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "dcmtk",
-  "version-string": "3.6.6",
-  "port-version": 2,
+  "version": "3.6.6",
+  "port-version": 3,
   "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.",
+  "supports": "!arm",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/embree2/vcpkg.json b/ports/embree2/vcpkg.json
index e7fdad98dc..e89bc2b2ed 100644
--- a/ports/embree2/vcpkg.json
+++ b/ports/embree2/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "embree2",
   "version-semver": "2.17.7",
-  "port-version": 3,
+  "port-version": 4,
   "description": "High Performance Ray Tracing Kernels.",
   "homepage": "https://github.com/embree/embree",
+  "supports": "!arm",
   "dependencies": [
     "tbb",
     {
diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json
index 38463ce083..6b2477d6b4 100644
--- a/ports/tesseract/vcpkg.json
+++ b/ports/tesseract/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "tesseract",
   "version": "4.1.1",
-  "port-version": 9,
+  "port-version": 10,
   "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.",
   "homepage": "https://github.com/tesseract-ocr/tesseract",
-  "supports": "!(windows & (arm | arm64))",
+  "supports": "!arm",
   "dependencies": [
     "leptonica",
     "libarchive",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index af23038232..8db3976efc 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -170,8 +170,6 @@ crashpad:arm64-windows=fail
 crashpad:arm-uwp=fail
 crashpad:x64-linux=fail
 crashpad:x86-windows=fail
-ctemplate:arm64-windows=fail
-ctemplate:arm-uwp=fail
 ctemplate:x64-linux=fail
 ctemplate:x64-osx=fail
 cuda:x64-osx=fail
@@ -190,8 +188,6 @@ dbghelp:x64-windows-static=skip
 dbghelp:x64-windows-static-md=skip
 dbghelp:x64-windows=skip
 dbghelp:x86-windows=skip
-dcmtk:arm-uwp=fail
-dcmtk:arm64-windows=fail
 dcmtk:x64-uwp=fail
 devicenameresolver:x64-windows-static=fail
 # legacy directxsdk which conflicts with dxsdk-d3dx
diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json
index 3a593eceb1..991bf7ddcf 100644
--- a/versions/a-/apsi.json
+++ b/versions/a-/apsi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "08bc0f650b7fa0ef77541eb74b90d0b9fe7fec03",
+      "version-semver": "0.7.0",
+      "port-version": 2
+    },
     {
       "git-tree": "c2703eaa248b72c269dd22aac1e2aca49060dfba",
       "version-semver": "0.7.0",
diff --git a/versions/b-/bde.json b/versions/b-/bde.json
index f587a05e53..5d27e439a9 100644
--- a/versions/b-/bde.json
+++ b/versions/b-/bde.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7ce72f2854f44eee806e6e5f3e97d29897549787",
+      "version": "3.2.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "60082ad73e5c9fb9828041183b026fc15e453218",
       "version-string": "3.2.0.0",
diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json
index a4a7a98e02..a7a9687b5a 100644
--- a/versions/b-/brpc.json
+++ b/versions/b-/brpc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bcff3231352f577720f51a99dbf9ecf0132ebcba",
+      "version": "0.9.7",
+      "port-version": 7
+    },
     {
       "git-tree": "f658cec9384935d01319d2725a039da7cb5e6c77",
       "version-string": "0.9.7",
diff --git a/versions/baseline.json b/versions/baseline.json
index 0a31229fde..d605727024 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -118,7 +118,7 @@
     },
     "apsi": {
       "baseline": "0.7.0",
-      "port-version": 1
+      "port-version": 2
     },
     "arb": {
       "baseline": "2.21.1",
@@ -402,7 +402,7 @@
     },
     "bde": {
       "baseline": "3.2.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "bdwgc": {
       "baseline": "8.2.0",
@@ -1146,7 +1146,7 @@
     },
     "brpc": {
       "baseline": "0.9.7",
-      "port-version": 6
+      "port-version": 7
     },
     "brunocodutra-metal": {
       "baseline": "2.1.3",
@@ -1682,7 +1682,7 @@
     },
     "ctemplate": {
       "baseline": "2020-09-14",
-      "port-version": 2
+      "port-version": 3
     },
     "ctp": {
       "baseline": "6.6.1_P1_20210406_se",
@@ -1798,7 +1798,7 @@
     },
     "dcmtk": {
       "baseline": "3.6.6",
-      "port-version": 2
+      "port-version": 3
     },
     "debug-assert": {
       "baseline": "1.3.3",
@@ -2018,7 +2018,7 @@
     },
     "embree2": {
       "baseline": "2.17.7",
-      "port-version": 3
+      "port-version": 4
     },
     "embree3": {
       "baseline": "3.12.2",
@@ -6794,7 +6794,7 @@
     },
     "tesseract": {
       "baseline": "4.1.1",
-      "port-version": 9
+      "port-version": 10
     },
     "tfhe": {
       "baseline": "1.0.1",
diff --git a/versions/c-/ctemplate.json b/versions/c-/ctemplate.json
index d9e9f8ecb4..231ef80ca6 100644
--- a/versions/c-/ctemplate.json
+++ b/versions/c-/ctemplate.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d0cd0a34b622b661af41d0f829ad22e406cd6c7f",
+      "version-date": "2020-09-14",
+      "port-version": 3
+    },
     {
       "git-tree": "491ab782407b38835b9a555dc77e6d3af485fdae",
       "version-date": "2020-09-14",
diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json
index 98820308ec..a75be29323 100644
--- a/versions/d-/dcmtk.json
+++ b/versions/d-/dcmtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ce25087f7df7d83c796eee09b4457e7aa70848ad",
+      "version": "3.6.6",
+      "port-version": 3
+    },
     {
       "git-tree": "24716759e4aa3fb67b014163ae3be95ad88120b6",
       "version-string": "3.6.6",
diff --git a/versions/e-/embree2.json b/versions/e-/embree2.json
index 668cfc9cc5..6b45901ef3 100644
--- a/versions/e-/embree2.json
+++ b/versions/e-/embree2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "59aae2cf542f2420880b312e4e5071c6afcd5aaa",
+      "version-semver": "2.17.7",
+      "port-version": 4
+    },
     {
       "git-tree": "b4048eb6da97d8a23b849a1b5fba7ba93f9c33bf",
       "version-semver": "2.17.7",
diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json
index ec7094f6c5..e13ddd0256 100644
--- a/versions/t-/tesseract.json
+++ b/versions/t-/tesseract.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ac84bef93d2709f28bf4ab8341a80dab949a8cf1",
+      "version": "4.1.1",
+      "port-version": 10
+    },
     {
       "git-tree": "10ffafb1de68c463fbac91a484d2c27cc618c0c9",
       "version": "4.1.1",