diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index c9f98efb4f0..68c5c6d8a15 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -24,18 +24,16 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/TBB")
-vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-set(arch_suffix "")
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-  set(arch_suffix "32")
-endif()
-
-
 if(NOT VCPKG_BUILD_TYPE)
+    if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|arm|wasm32)$")
+        set(arch_suffix "32")
+    endif()
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug")
+    unset(arch_suffix)
 endif()
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/share/doc"
diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json
index 6b17fda3600..69352fc6f6d 100644
--- a/ports/tbb/vcpkg.json
+++ b/ports/tbb/vcpkg.json
@@ -2,11 +2,11 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "tbb",
   "version": "2021.9.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Intel's Threading Building Blocks.",
   "homepage": "https://github.com/oneapi-src/oneTBB",
   "license": "Apache-2.0",
-  "supports": "(windows & !uwp) | linux | osx | ios",
+  "supports": "(windows & !uwp) | linux | osx | ios | android",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json
index aa10eaf5a81..5cd95382f30 100644
--- a/ports/usd/vcpkg.json
+++ b/ports/usd/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "usd",
   "version": "23.5",
+  "port-version": 1,
   "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.",
   "homepage": "https://github.com/PixarAnimationStudios/USD",
   "license": null,
-  "supports": "!x86 & !arm",
+  "supports": "!x86 & !arm & !android",
   "dependencies": [
     "boost-assign",
     "boost-crc",
diff --git a/versions/baseline.json b/versions/baseline.json
index be232c46fa3..7b2fac74253 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7890,7 +7890,7 @@
     },
     "tbb": {
       "baseline": "2021.9.0",
-      "port-version": 1
+      "port-version": 2
     },
     "tcb-span": {
       "baseline": "2021-12-15",
@@ -8282,7 +8282,7 @@
     },
     "usd": {
       "baseline": "23.5",
-      "port-version": 0
+      "port-version": 1
     },
     "usockets": {
       "baseline": "0.8.6",
diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json
index a63cac549ed..f62ba539782 100644
--- a/versions/t-/tbb.json
+++ b/versions/t-/tbb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d050b3a84687479bb03134f98f6360bfb72e64a8",
+      "version": "2021.9.0",
+      "port-version": 2
+    },
     {
       "git-tree": "97a86c92ba0419c50673782f0b3a7f1568aaaef7",
       "version": "2021.9.0",
diff --git a/versions/u-/usd.json b/versions/u-/usd.json
index 1b163da1cea..5ca746912cc 100644
--- a/versions/u-/usd.json
+++ b/versions/u-/usd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cfe836715c8cf43db76006deffa234cecf77745c",
+      "version": "23.5",
+      "port-version": 1
+    },
     {
       "git-tree": "5a5cb56688d1804bb35d8e361cfd41ef858919c9",
       "version": "23.5",