diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake
index cf5a57b43e..bffa0efd4b 100644
--- a/ports/hpx/portfile.cmake
+++ b/ports/hpx/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO STEllAR-GROUP/hpx
     REF "v${VERSION}"
-    SHA512 e1cc9fa72cba4e66b5d6eff2487e93d5d553c32e6eebcfe9131bf69c5b595ab72295ff0986c81d5dc6a7caa8303d6709df91333f64efe59ee256d99a8c289dc5
+    SHA512 bf22add7a97087f68bd49fe0ae5b2bfbd7ba01d4018872c3934ebd81a632e2559e6144c5aa06779db971c642d5a41b16c8c48108af2c4069be6d9f9b72985182
     HEAD_REF master
 )
 
diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json
index 4555261663..84f17b6a08 100644
--- a/ports/hpx/vcpkg.json
+++ b/ports/hpx/vcpkg.json
@@ -1,14 +1,13 @@
 {
   "name": "hpx",
-  "version": "1.10.0",
-  "port-version": 1,
+  "version": "1.11.0",
   "description": [
     "The C++ Standards Library for Concurrency and Parallelism",
     "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case."
   ],
   "homepage": "https://github.com/STEllAR-GROUP/hpx",
   "license": "BSL-1.0",
-  "supports": "!(windows & x86)",
+  "supports": "!(windows & arm64) & !(windows & staticcrt)",
   "dependencies": [
     "asio",
     "boost-accumulators",
@@ -58,6 +57,7 @@
     },
     "cuda": {
       "description": "Build with CUDA support",
+      "supports": "!linux & !(windows & arm)",
       "dependencies": [
         "cuda"
       ]
diff --git a/ports/msmpi/vcpkg.json b/ports/msmpi/vcpkg.json
index 9725714826..d2837c109e 100644
--- a/ports/msmpi/vcpkg.json
+++ b/ports/msmpi/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "msmpi",
   "version": "10.1.12498",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Microsoft MPI (MS-MPI) is a Microsoft implementation of the Message Passing Interface standard for developing and running parallel applications on the Windows platform.",
   "homepage": "https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi",
   "license": "MIT",
-  "supports": "windows & !uwp"
+  "supports": "windows & !uwp & (x64 | x86)"
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 74dc3b752a..6836d4a98e 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -417,7 +417,6 @@ hello-imgui:arm-neon-android=fail
 hello-imgui:arm64-android=fail
 hello-imgui:x64-android=fail
 hexl:x64-android=fail
-hpx:x64-windows-static=fail
 hwloc:arm-neon-android=fail
 hwloc:arm64-android=fail
 hwloc:x64-android=fail
@@ -700,8 +699,6 @@ mpir:x64-windows-static-md=skip
 mpir:x64-windows-static=skip
 mpir:x64-windows=skip
 mpir:x86-windows=skip
-msmpi:arm64-windows-static-md=fail
-msmpi:arm64-windows=fail
 msquic:arm-neon-android=fail
 msquic:arm64-android=fail
 msquic:x64-android=fail
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index af7d136875..6a5391e600 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -151,8 +151,6 @@ graphicsmagick(uwp)=fail
 graphqlparser:arm64-osx=fail # python2 required
 gsoap = skip # gsoap does not offer stable public source downloads
 gtk:x64-windows-static=fail
-hpx:arm64-windows=fail
-hpx:x64-windows-static=fail
 hunspell:x64-windows-static-md=fail
 ideviceinstaller:x64-windows-static-md=fail
 idevicerestore:x64-linux=fail
@@ -314,11 +312,6 @@ moos-essential:arm64-windows=fail
 moos-essential:x64-windows-static-md=fail
 moos-essential:x64-windows=fail
 moos-essential:x86-windows=fail
-msmpi:arm-uwp=fail
-msmpi:arm64-windows=fail
-msmpi:x64-linux=fail
-msmpi:x64-osx=fail
-msmpi:x64-uwp=fail
 munit:arm-uwp=fail
 munit:arm64-windows=fail
 munit:x64-uwp=fail
@@ -958,10 +951,9 @@ highfive:arm64-uwp = cascade
 highfive:x64-uwp = cascade
 highfive[opencv]:arm64-windows = cascade
 hikogui:x64-uwp = cascade
-hpx:arm64-uwp = cascade
-hpx:x64-uwp = cascade
+hpx[cuda](!(windows & x64 & !uwp & !xbox) & !(linux & x64) & !(linux & arm64)) = cascade
 hpx[cuda](osx) = cascade
-hpx[cuda,mpi]:arm64-windows = cascade
+hpx[mpi](windows & !(x64 | x86))=cascade
 hyperscan:x64-uwp = cascade
 hypodermic:arm64-uwp = cascade
 hypodermic:x64-uwp = cascade
diff --git a/versions/baseline.json b/versions/baseline.json
index e56ce8f505..62957411e8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3741,8 +3741,8 @@
       "port-version": 0
     },
     "hpx": {
-      "baseline": "1.10.0",
-      "port-version": 1
+      "baseline": "1.11.0",
+      "port-version": 0
     },
     "htscodecs": {
       "baseline": "1.6.1",
@@ -6478,7 +6478,7 @@
     },
     "msmpi": {
       "baseline": "10.1.12498",
-      "port-version": 4
+      "port-version": 5
     },
     "msquic": {
       "baseline": "2.4.8",
diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json
index 42e70d648f..475494fcbc 100644
--- a/versions/h-/hpx.json
+++ b/versions/h-/hpx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ac39e75ba3daa8bce73eac933d71e2905f8472b",
+      "version": "1.11.0",
+      "port-version": 0
+    },
     {
       "git-tree": "422ed34b487e71a3939e6829f0346f1e323f33ab",
       "version": "1.10.0",
diff --git a/versions/m-/msmpi.json b/versions/m-/msmpi.json
index 1cca454f39..c900e8dd5d 100644
--- a/versions/m-/msmpi.json
+++ b/versions/m-/msmpi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "725c5656745976dabcf479bc5cd0d587a24fe050",
+      "version": "10.1.12498",
+      "port-version": 5
+    },
     {
       "git-tree": "d3ccfae00ebdaac2c41fa2acfa59b862171be3ae",
       "version": "10.1.12498",