diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json
index ee66b622f7..319c8cb320 100644
--- a/ports/boost-mpi/vcpkg.json
+++ b/ports/boost-mpi/vcpkg.json
@@ -2,7 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-mpi",
   "version": "1.85.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Boost mpi module",
   "homepage": "https://www.boost.org/libs/mpi",
   "license": "BSL-1.0",
@@ -93,9 +93,6 @@
       "dependencies": [
         {
           "name": "boost-python",
-          "features": [
-            "python3"
-          ],
           "platform": "!uwp & !emscripten & !ios & !android",
           "version>=": "1.85.0"
         },
diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json
index e9f83f394e..5f993d5f18 100644
--- a/ports/boost-python/vcpkg.json
+++ b/ports/boost-python/vcpkg.json
@@ -2,7 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-python",
   "version": "1.85.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Boost python module",
   "homepage": "https://www.boost.org/libs/python",
   "license": "BSL-1.0",
@@ -99,24 +99,7 @@
     {
       "name": "boost-utility",
       "version>=": "1.85.0"
-    }
-  ],
-  "default-features": [
-    "python3"
-  ],
-  "features": {
-    "python2": {
-      "description": "Build with Python2 support",
-      "supports": "!(arm & windows)",
-      "dependencies": [
-        "python2"
-      ]
     },
-    "python3": {
-      "description": "Build with Python3 support",
-      "dependencies": [
-        "python3"
-      ]
-    }
-  }
+    "python3"
+  ]
 }
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index 2c05742de5..c70a13f9b7 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -123,7 +123,7 @@ $portData = @{
             "python3" = @{
                 "description"  = "Build Python3 bindings";
                 "supports"     = "!static";
-                "dependencies" = @(@{ "name" = "boost-python"; "features" = @( "python3" ); "platform" = "!uwp & !emscripten & !ios & !android" }, "python3");
+                "dependencies" = @(@{ "name" = "boost-python"; "platform" = "!uwp & !emscripten & !ios & !android" }, "python3");
             }
         }
     };
@@ -137,21 +137,7 @@ $portData = @{
         }
     };
     "boost-process"          = @{ "supports" = "!emscripten" };
-    "boost-python"           = @{
-        "default-features" = @("python3");
-        "supports"         = "!uwp & !emscripten & !ios & !android";
-        "features"         = @{
-            "python2" = @{
-                "description"  = "Build with Python2 support";
-                "supports"     = "!(arm & windows)";
-                "dependencies" = @("python2");
-            };
-            "python3" = @{
-                "description"  = "Build with Python3 support";
-                "dependencies" = @("python3");
-            }
-        }
-    };
+    "boost-python"           = @{ "supports" = "!uwp & !emscripten & !ios & !android"; "dependencies" = @("python3");};
     "boost-random"           = @{ "supports" = "!uwp" };
     "boost-regex"            = @{
         "features" = @{
diff --git a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json
index 5d6760fb0d..c3782cbbe0 100644
--- a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json
@@ -54,19 +54,8 @@
     {
       "name": "boost-python",
       "default-features": false,
-      "features": [
-        "python3"
-      ],
       "platform": "!emscripten & !ios & !android & !uwp"
     },
-    {
-      "name": "boost-python",
-      "default-features": false,
-      "features": [
-        "python2"
-      ],
-      "platform": "!android & !emscripten & !ios & !(arm & osx) & !(arm & windows) & !uwp"
-    },
     {
       "name": "boost-regex",
       "default-features": false,
diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json
index a711950a25..ca86594ecb 100644
--- a/versions/b-/boost-mpi.json
+++ b/versions/b-/boost-mpi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "42a13cbb45c4dfcaea71ec613ed2336722276165",
+      "version": "1.85.0",
+      "port-version": 2
+    },
     {
       "git-tree": "299e9f6ebcf9b9824e91f311b2432f3c55e47ccb",
       "version": "1.85.0",
diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json
index e3886523b3..5b3764b5ea 100644
--- a/versions/b-/boost-python.json
+++ b/versions/b-/boost-python.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "64f7d4e758e453c536669b20b1da47c940d4fe4c",
+      "version": "1.85.0",
+      "port-version": 2
+    },
     {
       "git-tree": "1c631b75d72aba4b4aad9a30cc914924c9e53806",
       "version": "1.85.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index f4b63192c0..bbd71ff995 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1046,7 +1046,7 @@
     },
     "boost-mpi": {
       "baseline": "1.85.0",
-      "port-version": 1
+      "port-version": 2
     },
     "boost-mpl": {
       "baseline": "1.85.0",
@@ -1158,7 +1158,7 @@
     },
     "boost-python": {
       "baseline": "1.85.0",
-      "port-version": 1
+      "port-version": 2
     },
     "boost-qvm": {
       "baseline": "1.85.0",