diff --git a/.github/workflows/install-framework.yml b/.github/workflows/install-framework.yml
index d7ac868..ba5260d 100644
--- a/.github/workflows/install-framework.yml
+++ b/.github/workflows/install-framework.yml
@@ -17,7 +17,7 @@ jobs:
   build:
     name: 'build and install'
     runs-on: ubuntu-22.04
-    container: ghcr.io/skaginn3x/skaginn3x/framework/tfc-toolchain:sha-7315878
+    container: ghcr.io/skaginn3x/skaginn3x/framework/tfc-toolchain:sha-09328eb
     strategy:
       fail-fast: false
       matrix:
diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake
deleted file mode 100644
index 592514b..0000000
--- a/ports/async-mqtt/portfile.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-set(VCPKG_BUILD_TYPE release) #header-only
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO redboltz/async_mqtt
-    REF ad5910358e0bd3c897a9c056d3c3be52c2a078be
-    SHA512 880b0123236f7c1254013b8f58a2ca316a5fa68637ebff06a027c9c5b70c6279030b551c71177dc8e55dd5b48b0f5cd9060cf8c44a547039168585cbf3bb8e0e
-    HEAD_REF main
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DASYNC_MQTT_BUILD_TOOLS=OFF
-        -DASYNC_MQTT_BUILD_EXAMPLES=OFF
-        -DASYNC_MQTT_BUILD_UNIT_TESTS=OFF
-        -DASYNC_MQTT_BUILD_SYSTEM_TESTS=OFF
-        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME async_mqtt_iface CONFIG_PATH "lib/cmake/async_mqtt_iface")
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json
deleted file mode 100644
index ce1a90f..0000000
--- a/ports/async-mqtt/vcpkg.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "async-mqtt",
-  "version": "1.0.5",
-  "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.",
-  "homepage": "https://github.com/redboltz/async_mqtt",
-  "license": "BSL-1.0",
-  "dependencies": [
-    "boost-any",
-    "boost-asio",
-    "boost-assert",
-    "boost-beast",
-    "boost-container",
-    "boost-container-hash",
-    "boost-endian",
-    "boost-log",
-    "boost-multi-index",
-    "boost-numeric-conversion",
-    "boost-system",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/ports/mp-units/portfile.cmake b/ports/mp-units/portfile.cmake
deleted file mode 100644
index 01ce23b..0000000
--- a/ports/mp-units/portfile.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO mpusz/units
-    REF v0.8.0
-    SHA512 6369c886629955c6457911b98a702c29bacce58e9049e1da700055a3f8b1981cce4f545c1d09550ec1c57f8805f7fc1f0198118950a14b2a7b797dd437ed72df
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/src"
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
-
-# Handle copyright/readme/package files
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug"
-    "${CURRENT_PACKAGES_DIR}/lib") # Header only
diff --git a/ports/mp-units/vcpkg.json b/ports/mp-units/vcpkg.json
deleted file mode 100644
index 809b808..0000000
--- a/ports/mp-units/vcpkg.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "mp-units",
-  "version-semver": "0.8.0",
-  "description": "mp-units - A Units Library for C++",
-  "homepage": "https://github.com/mpusz/units",
-  "license": "MIT",
-  "dependencies": [
-    "fmt",
-    "gsl-lite",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/ports/tfc-framework/portfile.cmake b/ports/tfc-framework/portfile.cmake
index 0d4fc2e..5202208 100644
--- a/ports/tfc-framework/portfile.cmake
+++ b/ports/tfc-framework/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO skaginn3x/framework
-    REF 40ddcc277f1b384b952ed6b60147e0a1a40f371e
-    SHA512 d76ba7539ef27f30690de1b53642ee29ecc3ad82a1361e378581e191f909f5544e6e13cdf38712dd1c0852ca2bc6600ffdffa2916fc15cddf3b001cdcab2d46c
+    REF f9f38e69714d02bbce22044d823a24de6c0e50ce
+    SHA512 ab9731aa4c668fca4b6a28e2bd80b01e32f5ccf6328b38bee595efee021fb5d30d9d7f987e5b729da6672c7a083bf9030585e05c300d43dbea92a93544791d1d
 )
 
 if ("build-exes" IN_LIST FEATURES)
diff --git a/ports/tfc-framework/vcpkg.json b/ports/tfc-framework/vcpkg.json
index 84da395..1fc8fee 100644
--- a/ports/tfc-framework/vcpkg.json
+++ b/ports/tfc-framework/vcpkg.json
@@ -23,6 +23,7 @@
     "sdbusplus",
     "soem",
     "spdlog",
+    "protobuf",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/test/vcpkg-configuration.json b/test/vcpkg-configuration.json
index a4dd952..0cf838c 100644
--- a/test/vcpkg-configuration.json
+++ b/test/vcpkg-configuration.json
@@ -2,7 +2,7 @@
   "default-registry": {
     "kind": "git",
     "repository": "https://github.com/microsoft/vcpkg",
-    "baseline": "fbc868ee5e12e3e81f464104be246ec06553c274"
+    "baseline": "2f6176ce98fee807a207dc9e8fec213f111c291b"
   },
   "overlay-triplets": [
     "../triplets"
diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json
deleted file mode 100644
index 9d9d52a..0000000
--- a/versions/a-/async-mqtt.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "versions": [
-    {
-      "git-tree": "5e0740b8cbd953e54192434c69bcc1bba77dd27a",
-      "version": "1.0.5",
-      "port-version": 0
-    }
-  ]
-}
diff --git a/versions/baseline.json b/versions/baseline.json
index c2a2a63..c06957b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1,9 +1,5 @@
 {
   "default": {
-    "async-mqtt": {
-      "baseline": "1.0.5",
-      "port-version": 0
-    },
     "azmq": {
       "baseline": "1.0.4",
       "port-version": 0
@@ -20,10 +16,6 @@
       "baseline": "4.4.33",
       "port-version": 0
     },
-    "mp-units": {
-      "baseline": "0.8.0",
-      "port-version": 0
-    },
     "sdbusplus": {
       "baseline": "1.0.0",
       "port-version": 0
diff --git a/versions/m-/mp-units.json b/versions/m-/mp-units.json
deleted file mode 100644
index a97a61e..0000000
--- a/versions/m-/mp-units.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "versions": [
-    {
-      "git-tree": "800903c637b6d1f3ab7158146c53fa293a8bac8b",
-      "version-semver": "0.8.0",
-      "port-version": 0
-    },
-    {
-      "git-tree": "d91ed663a2bccf38789ad710d61f4c3a8f9e7d0e",
-      "version-semver": "0.7.0",
-      "port-version": 2
-    }
-  ]
-}