diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b70e528..4665e9d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,15 +6,33 @@ on:
       - 'v*'
 
 jobs:
-  build-x64-linux:
+  build-linux:
     timeout-minutes: 360
-    env:
-      VCPKG_DEP_LIST: x64-linux
-      VCPKG_FEATURE_FLAGS: -binarycaching
-    runs-on: [self-hosted, linux, X64, dep-builder]
+    name: ${{ matrix.osversion }} ${{ matrix.arch }}
+    runs-on: [self-hosted, linux, '${{ matrix.arch }}', dep-builder]
     strategy:
+      fail-fast: false
       matrix:
-        osversion: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
+        include:
+          - osversion: ubuntu-18.04
+            arch: "x64"
+            force_system_binary: 0
+          - osversion: ubuntu-20.04
+            arch: "x64"
+            force_system_binary: 0
+          - osversion: ubuntu-22.04
+            arch: "x64"
+            force_system_binary: 0
+          - osversion: ubuntu-20.04
+            arch: "arm64"
+            force_system_binary: 1
+          - osversion: ubuntu-22.04
+            arch: "arm64"
+            force_system_binary: 1
+    env:
+      VCPKG_DEP_LIST: ${{ matrix.arch }}-linux
+      VCPKG_FORCE_SYSTEM_BINARIES: ${{ matrix.force_system_binary }}
+      VCPKG_FEATURE_FLAGS: -binarycaching
     steps:
       - uses: actions/checkout@v3
         with:
@@ -22,7 +40,7 @@ jobs:
           fetch-depth: 0
       - name: Checkout vcokg submodules
         working-directory: ${{ github.workspace }}/vcpkg/
-        run: git fetch origin daa7215f3d68c2a2f2e18c398cb73dab63cda829
+        run: git fetch --unshallow || true
       - name: Set output vars to the actual tag name
         id: vars
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
@@ -33,12 +51,12 @@ jobs:
       - name: Install vcpkg
         id: bootstrapvcpkg
         run: |
-          docker run -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }} ./build_dir/vcpkg/bootstrap-vcpkg.sh -disableMetrics
+          docker run -e ARCH=${{ matrix.arch }} -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }} ./build_dir/vcpkg/bootstrap-vcpkg.sh -disableMetrics
         shell: bash
       - name: Install dependencies in manifest mode
         id: installdeps
         run: |
-          docker run -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }} \
+          docker run -e ARCH=${{ matrix.arch }} -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }}  \
           ./build_dir/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes \
           --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=/build_dir/custom-triplets/ --x-manifest-root=/build_dir/ --overlay-ports=/build_dir/vcpkg-registry/ports
       - name: Compress artifacts
@@ -77,70 +95,19 @@ jobs:
           test -n "$(docker image ls -q nes_dep_build_${{ matrix.osversion }})" && \
           docker image rm $(docker image ls -q nes_dep_build_${{ matrix.osversion }}) || \
           true
-
-  build-arm64-linux:
-    timeout-minutes: 360
-    env:
-      VCPKG_DEP_LIST: arm64-linux
-      VCPKG_FORCE_SYSTEM_BINARIES: 1
-      VCPKG_FEATURE_FLAGS: -binarycaching
-    runs-on: [self-hosted, linux, ARM64, dep-builder]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-          fetch-depth: 0
-      - name: Checkout vcokg submodules
-        working-directory: ${{ github.workspace }}/vcpkg/
-        run: git fetch origin daa7215f3d68c2a2f2e18c398cb73dab63cda829
-      - name: Set output vars to the actual tag name
-        id: vars
-        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
-      - name: Install vcpkg
-        id: bootstrapvcpkg
-        run: |
-          ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
-        shell: bash
-      - name: Install dependencies in manifest mode
-        id: installdeps
-        run: |
-          ${{ github.workspace }}/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=custom-triplets/ --overlay-ports=vcpkg-registry/ports
-      - name: Compress artifacts
-        id: compressdeps
-        run: |
-          mkdir nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes && \
-          mv ${{ github.workspace }}/vcpkg_installed nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \
-          mkdir -p nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems && \
-          cp ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \
-          touch ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/.vcpkg-root && \
-          7z a nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes -mx9 -aoa
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        id: createrelease
-        with:
-          files: |
-            nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z
-      - name: Upload GitHub Actions artifact of vcpkg build logs
-        uses: actions/upload-artifact@v2
-        if: failure()
-        id: uploadlogs
-        with:
-          name: vcpkg-logs-${{ env.VCPKG_DEP_LIST }}
-          path: ${{ github.workspace }}/vcpkg/buildtrees/**/*.log
-      - name: Clean build artifacts
-        id: cleanbuildartifacts
-        if: always()
-        run: |
-          rm -rf nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes \
-          nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \
-          ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages}
-
-  build-arm-osx:
+  build-osx:
     timeout-minutes: 360
+    name: osx ${{ matrix.arch }}
+    runs-on: [self-hosted, macOS, '${{ matrix.arch }}']
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: "x64"
+          - arch: "arm64"
     env:
-      VCPKG_DEP_LIST: arm64-osx
+      VCPKG_DEP_LIST: ${{ matrix.arch }}-osx
       VCPKG_FEATURE_FLAGS: -binarycaching
-    runs-on: [ self-hosted, macos, ARM64]
     steps:
       - uses: lukka/get-cmake@latest
       - uses: actions/checkout@v3
@@ -149,7 +116,7 @@ jobs:
           fetch-depth: 0
       - name: Checkout vcokg submodules
         working-directory: ${{ github.workspace }}/vcpkg/
-        run: git fetch origin daa7215f3d68c2a2f2e18c398cb73dab63cda829
+        run: git fetch --unshallow || true
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
@@ -188,66 +155,6 @@ jobs:
         with:
           name: vcpkg-logs-${{ env.VCPKG_DEP_LIST }}
           path: ${{ github.workspace }}/vcpkg/buildtrees/**/*.log
-      - name: Clean build artifacts
-        id: cleanbuildartifacts
-        if: always()
-        run: |
-          rm -rf nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes \
-          nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \
-          ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages}
-
-  build-x64-osx:
-    timeout-minutes: 360
-    env:
-      VCPKG_DEP_LIST: x64-osx
-      VCPKG_FEATURE_FLAGS: -binarycaching
-    runs-on: [ self-hosted, macos, X64, dep-builder ]
-    steps:
-      - uses: lukka/get-cmake@latest
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-          fetch-depth: 0
-      - name: Checkout vcokg submodules
-        working-directory: ${{ github.workspace }}/vcpkg/
-        run: git fetch origin daa7215f3d68c2a2f2e18c398cb73dab63cda829
-      - name: Set output vars to the actual tag name
-        id: vars
-        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
-      - name: Install vcpkg
-        id: bootstrapvcpkg
-        run: |
-          ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
-        shell: bash
-      - name: Install dependencies in manifest mode
-        id: installdeps
-        run: |
-          ${{ github.workspace }}/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=custom-triplets/ --overlay-ports=vcpkg-registry/ports
-      - name: Compress artifacts
-        id: compressdeps
-        run: |
-          mkdir nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes && \
-          mv ${{ github.workspace }}/vcpkg_installed nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \
-          mkdir -p nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems && \
-          cp ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \
-          touch ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/.vcpkg-root && \
-          7z a nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes -mx9 -aoa
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        id: createrelease
-        with:
-          files: |
-            nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z
-      - name: Upload GitHub Actions artifact of vcpkg build logs
-        uses: actions/upload-artifact@v2
-        if: failure()
-        id: uploadlogs
-        with:
-          name: vcpkg-logs-${{ env.VCPKG_DEP_LIST }}
-          path: ${{ github.workspace }}/vcpkg/buildtrees/**/*.log
       - name: Clean build artifacts
         id: cleanbuildartifacts
         if: always()
diff --git a/custom-triplets/arm64-linux-nes.cmake b/custom-triplets/arm64-linux-nes.cmake
index 89ce8cd..10e0a50 100644
--- a/custom-triplets/arm64-linux-nes.cmake
+++ b/custom-triplets/arm64-linux-nes.cmake
@@ -35,8 +35,4 @@ endif()
 
 if (PORT STREQUAL oatpp)
 	set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-if (PORT STREQUAL cppkafka)
-	set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
\ No newline at end of file
diff --git a/custom-triplets/arm64-osx-nes.cmake b/custom-triplets/arm64-osx-nes.cmake
index 52f0160..7831833 100644
--- a/custom-triplets/arm64-osx-nes.cmake
+++ b/custom-triplets/arm64-osx-nes.cmake
@@ -28,8 +28,4 @@ endif()
 
 if (PORT STREQUAL oatpp)
 	set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-if (PORT STREQUAL cppkafka)
-	set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
\ No newline at end of file
diff --git a/custom-triplets/x64-linux-musl-nes.cmake b/custom-triplets/x64-linux-musl-nes.cmake
index 0a94253..85427c3 100644
--- a/custom-triplets/x64-linux-musl-nes.cmake
+++ b/custom-triplets/x64-linux-musl-nes.cmake
@@ -30,8 +30,4 @@ endif()
 
 if (PORT STREQUAL oatpp)
 	set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-if (PORT STREQUAL cppkafka)
-	set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
\ No newline at end of file
diff --git a/custom-triplets/x64-linux-nes.cmake b/custom-triplets/x64-linux-nes.cmake
index 0a94253..85427c3 100644
--- a/custom-triplets/x64-linux-nes.cmake
+++ b/custom-triplets/x64-linux-nes.cmake
@@ -30,8 +30,4 @@ endif()
 
 if (PORT STREQUAL oatpp)
 	set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-if (PORT STREQUAL cppkafka)
-	set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
\ No newline at end of file
diff --git a/custom-triplets/x64-osx-nes.cmake b/custom-triplets/x64-osx-nes.cmake
index 068a13f..8d7a94e 100644
--- a/custom-triplets/x64-osx-nes.cmake
+++ b/custom-triplets/x64-osx-nes.cmake
@@ -28,8 +28,4 @@ endif()
 
 if (PORT STREQUAL oatpp)
 	set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-if (PORT STREQUAL cppkafka)
-	set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
\ No newline at end of file
diff --git a/docker/Dockerfile-ubuntu-18.04 b/docker/Dockerfile-ubuntu-18.04
index 591e8fa..e0978bd 100644
--- a/docker/Dockerfile-ubuntu-18.04
+++ b/docker/Dockerfile-ubuntu-18.04
@@ -13,8 +13,18 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -qq \
   build-essential \
   curl zip unzip tar \  
   pkg-config \
+  autoconf \
+  cmake \
+  ninja-build \
+  flex \
+  bison \
   && apt-get clean -qq
 
+RUN cd ${HOME} && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null \
+    && apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' \
+    && apt update && apt install -y kitware-archive-keyring && rm /etc/apt/trusted.gpg.d/kitware.gpg && apt update && apt install -y cmake
+
+
 ADD ./entrypoint-build.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/Dockerfile-ubuntu-20.04 b/docker/Dockerfile-ubuntu-20.04
index 1ea5f4a..eb42787 100644
--- a/docker/Dockerfile-ubuntu-20.04
+++ b/docker/Dockerfile-ubuntu-20.04
@@ -13,8 +13,18 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -qq \
   build-essential \
   curl zip unzip tar \  
   pkg-config \
+  autoconf \
+  cmake \
+  ninja-build \
+  flex \
+  bison \
   && apt-get clean -qq
 
+RUN cd ${HOME} && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null \
+    && apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' \
+    && apt update && apt install -y kitware-archive-keyring && rm /etc/apt/trusted.gpg.d/kitware.gpg && apt update && apt install -y cmake
+
+
 ADD ./entrypoint-build.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/Dockerfile-ubuntu-21.10 b/docker/Dockerfile-ubuntu-21.10
index 933e1c2..2c781f2 100644
--- a/docker/Dockerfile-ubuntu-21.10
+++ b/docker/Dockerfile-ubuntu-21.10
@@ -13,6 +13,11 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -qq \
   build-essential \
   curl zip unzip tar \  
   pkg-config \
+  autoconf \
+  cmake \
+  ninja-build \
+  flex \
+  bison \
   && apt-get clean -qq
 
 ADD ./entrypoint-build.sh /entrypoint.sh
diff --git a/docker/Dockerfile-ubuntu-22.04 b/docker/Dockerfile-ubuntu-22.04
index f32f8df..7572942 100644
--- a/docker/Dockerfile-ubuntu-22.04
+++ b/docker/Dockerfile-ubuntu-22.04
@@ -13,8 +13,15 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -qq \
   build-essential \
   curl zip unzip tar \  
   pkg-config \
+  autoconf \
+  cmake \
+  ninja-build \
+  flex \
+  bison \
   && apt-get clean -qq
 
+
+
 ADD ./entrypoint-build.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/entrypoint-build.sh b/docker/entrypoint-build.sh
index 5fe1225..64bbdb6 100755
--- a/docker/entrypoint-build.sh
+++ b/docker/entrypoint-build.sh
@@ -16,6 +16,14 @@
 #quit if command returns non-zero code
 set -e
 
+if [ "$ARCH" == "arm64" ]
+then
+ echo "USE ARM"
+ export VCPKG_FORCE_SYSTEM_BINARIES=1
+else
+ echo "USE X64"
+fi
+
 if [ $# -eq 0 ]
 then
     cd /build_dir/  
diff --git a/vcpkg-registry/ports/folly/FindLZ4.cmake b/vcpkg-registry/ports/folly/FindLZ4.cmake
deleted file mode 100644
index f80962c..0000000
--- a/vcpkg-registry/ports/folly/FindLZ4.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-find_path(LZ4_INCLUDE_DIR lz4.h)
-
-find_library(LZ4_LIBRARY_DEBUG NAMES lz4d)
-find_library(LZ4_LIBRARY_RELEASE NAMES lz4)
-
-include(SelectLibraryConfigurations)
-select_library_configurations(LZ4)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-    LZ4 DEFAULT_MSG
-    LZ4_LIBRARY LZ4_INCLUDE_DIR
-)
diff --git a/vcpkg-registry/ports/folly/FindSnappy.cmake b/vcpkg-registry/ports/folly/FindSnappy.cmake
deleted file mode 100644
index 253d0d8..0000000
--- a/vcpkg-registry/ports/folly/FindSnappy.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-find_path(SNAPPY_INCLUDE_DIR snappy.h)
-
-find_library(SNAPPY_LIBRARY_DEBUG NAMES snappyd)
-find_library(SNAPPY_LIBRARY_RELEASE NAMES snappy)
-
-include(SelectLibraryConfigurations)
-select_library_configurations(SNAPPY)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-    SNAPPY DEFAULT_MSG
-    SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR
-)
diff --git a/vcpkg-registry/ports/folly/boost-1.70.patch b/vcpkg-registry/ports/folly/boost-1.70.patch
deleted file mode 100644
index bca0c99..0000000
--- a/vcpkg-registry/ports/folly/boost-1.70.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
-index 2126ec0..ef82ade 100644
---- a/folly/portability/PThread.cpp
-+++ b/folly/portability/PThread.cpp
-@@ -20,6 +20,8 @@
- #include <boost/thread/exceptions.hpp>
- #include <boost/thread/tss.hpp>
- #include <boost/version.hpp>
-+#include <boost/shared_ptr.hpp>
-+#include <boost/thread/thread_only.hpp>
- 
- #include <errno.h>
- 
-@@ -691,7 +693,7 @@ int pthread_setspecific(pthread_key_t key, const void* value) {
-         boost::detail::thread::cleanup_caller_t(),
-         boost::detail::thread::cleanup_func_t(),
- #else
--        boost::shared_ptr<boost::detail::tss_cleanup_function>(),
-+        0,0,
- #endif
-         const_cast<void*>(value),
-         false);
diff --git a/vcpkg-registry/ports/folly/disable-non-underscore-posix-names.patch b/vcpkg-registry/ports/folly/disable-non-underscore-posix-names.patch
deleted file mode 100644
index ad36fad..0000000
--- a/vcpkg-registry/ports/folly/disable-non-underscore-posix-names.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/folly/portability/Windows.h b/folly/portability/Windows.h
-index 86fd0f9..ccad11e 100644
---- a/folly/portability/Windows.h
-+++ b/folly/portability/Windows.h
-@@ -32,24 +32,17 @@
- // disabled to ensure all of the normal names get declared properly.
- #include <stdio.h>
- 
--#ifndef __STDC__
--/* nolint */
--#define __STDC__ 1
- #pragma push_macro("_CRT_DECLARE_NONSTDC_NAMES")
- #ifdef _CRT_DECLARE_NONSTDC_NAMES
- #undef _CRT_DECLARE_NONSTDC_NAMES
- #endif
-+
-+#include <corecrt.h>
- #pragma push_macro("_CRT_INTERNAL_NONSTDC_NAMES")
--#undef _CRT_INTERNAL_NONSTDC_NAMES
--#include <direct.h> // @manual nolint
--#include <io.h> // @manual nolint
--#undef __STDC__
-+#define _CRT_INTERNAL_NONSTDC_NAMES 0
-+#include <direct.h>
-+#include <io.h>
- #pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES")
--#pragma pop_macro("_CRT_DECLARE_NONSTDC_NAMES")
--#else
--#include <direct.h> // @manual nolint
--#include <io.h> // @manual nolint
--#endif
- 
- #if defined(min) || defined(max)
- #error Windows.h needs to be included by this header, or else NOMINMAX needs \
diff --git a/vcpkg-registry/ports/folly/fix-musl.patch b/vcpkg-registry/ports/folly/fix-musl.patch
deleted file mode 100644
index fe4b19d..0000000
--- a/vcpkg-registry/ports/folly/fix-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/folly/experimental/symbolizer/Elf.cpp b/folly/experimental/symbolizer/Elf.cpp
-index cbd0feec8..8e7454082 100644
---- a/folly/experimental/symbolizer/Elf.cpp
-+++ b/folly/experimental/symbolizer/Elf.cpp
-@@ -38,7 +38,7 @@
-
- #if defined(__ELF_NATIVE_CLASS)
- #define FOLLY_ELF_NATIVE_CLASS __ELF_NATIVE_CLASS
--#elif defined(__FreeBSD__)
-+#else
- #if defined(__LP64__)
- #define FOLLY_ELF_NATIVE_CLASS 64
- #else
diff --git a/vcpkg-registry/ports/folly/fix-windows-minmax.patch b/vcpkg-registry/ports/folly/fix-windows-minmax.patch
deleted file mode 100644
index 1fc69a4..0000000
--- a/vcpkg-registry/ports/folly/fix-windows-minmax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake
-index ec2ce1a1d..16deda71c 100644
---- a/CMake/FollyCompilerMSVC.cmake
-+++ b/CMake/FollyCompilerMSVC.cmake
-@@ -289,6 +289,7 @@ function(apply_folly_compile_options_to_target THETARGET)
-   # And the extra defines:
-   target_compile_definitions(${THETARGET}
-     PUBLIC
-+      NOMINMAX
-       _CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions.
-       _CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
-       _SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
diff --git a/vcpkg-registry/ports/folly/portfile.cmake b/vcpkg-registry/ports/folly/portfile.cmake
deleted file mode 100644
index 558e8ad..0000000
--- a/vcpkg-registry/ports/folly/portfile.cmake
+++ /dev/null
@@ -1,95 +0,0 @@
-if (VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm" "arm64")
-else()
-    vcpkg_fail_port_install(ON_ARCH "x86" "arm")
-endif()
-
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-# Required to run build/generate_escape_tables.py et al.
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-vcpkg_add_to_path("${PYTHON3_DIR}")
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO nebulastream/folly
-    REF dd3a8a099582982999e6b1f31267a0a7d2919b27 
-    SHA512 56111217bb9a03c28f17e4912b64025b988c2dbe64a2eef1f197a28e84ded8796cedab2189901b0d5c7c8ef1a28a44cb11e984a1128f5df2cea2400229145cea
-    #HEAD_REF main
-    PATCHES
-        reorder-glog-gflags.patch
-        disable-non-underscore-posix-names.patch
-        boost-1.70.patch
-        fix-windows-minmax.patch
-        fix-musl.patch
-)
-
-file(COPY
-    "${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake"
-    "${CMAKE_CURRENT_LIST_DIR}/FindSnappy.cmake"
-    DESTINATION "${SOURCE_PATH}/CMake/"
-)
-file(REMOVE "${SOURCE_PATH}/CMake/FindGFlags.cmake")
-
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_STATIC_RUNTIME)
-
-set(FEATURE_OPTIONS)
-
-macro(feature FEATURENAME PACKAGENAME)
-    if("${FEATURENAME}" IN_LIST FEATURES)
-        list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${PACKAGENAME}=OFF)
-    else()
-        list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${PACKAGENAME}=ON)
-    endif()
-endmacro()
-
-feature(zlib ZLIB)
-feature(bzip2 BZip2)
-feature(lzma LibLZMA)
-feature(lz4 LZ4)
-feature(zstd Zstd)
-feature(snappy Snappy)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DMSVC_USE_STATIC_RUNTIME=${MSVC_USE_STATIC_RUNTIME}
-        -DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_LibAIO=ON
-        -DLIBAIO_FOUND=OFF
-        -DLIBURCU_FOUND=OFF
-        -DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON
-        -DCMAKE_INSTALL_DIR=share/folly
-        ${FEATURE_OPTIONS}
-)
-
-vcpkg_cmake_install(ADD_BIN_TO_PATH)
-
-vcpkg_copy_pdbs()
-
-vcpkg_cmake_config_fixup()
-
-# Release folly-targets.cmake does not link to the right libraries in debug mode.
-# We substitute with generator expressions so that the right libraries are linked for debug and release.
-set(FOLLY_TARGETS_CMAKE "${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake")
-FILE(READ ${FOLLY_TARGETS_CMAKE} _contents)
-STRING(REPLACE "\${_IMPORT_PREFIX}/lib/zlib.lib" "ZLIB::ZLIB" _contents "${_contents}")
-STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
-STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
-STRING(REPLACE "-vc140-mt.lib" "-vc140-mt\$<\$<CONFIG:DEBUG>:-gd>.lib" _contents "${_contents}")
-FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}")
-FILE(READ ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake _contents)
-FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake
-"include(CMakeFindDependencyMacro)
-find_dependency(Threads)
-find_dependency(glog CONFIG)
-find_dependency(gflags CONFIG REQUIRED)
-find_dependency(ZLIB)
-${_contents}")
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/vcpkg-registry/ports/folly/reorder-glog-gflags.patch b/vcpkg-registry/ports/folly/reorder-glog-gflags.patch
deleted file mode 100644
index 38ddbc1..0000000
--- a/vcpkg-registry/ports/folly/reorder-glog-gflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index 92b8ce7..04589ed 100644
---- a/CMake/folly-deps.cmake
-+++ b/CMake/folly-deps.cmake
-@@ -52,6 +52,11 @@ find_package(DoubleConversion MODULE REQUIRED)
- list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
- 
-+find_package(Glog CONFIG REQUIRED)
-+set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
-+list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
-+list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
-+
- find_package(Gflags MODULE)
- set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
- if(LIBGFLAGS_FOUND)
-@@ -61,11 +66,6 @@ if(LIBGFLAGS_FOUND)
-   set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
- endif()
- 
--find_package(Glog MODULE)
--set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
--list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
--
- find_package(LibEvent MODULE REQUIRED)
- list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
diff --git a/vcpkg-registry/ports/folly/vcpkg.json b/vcpkg-registry/ports/folly/vcpkg.json
deleted file mode 100644
index e44103d..0000000
--- a/vcpkg-registry/ports/folly/vcpkg.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "name": "folly",
-  "version-string": "2021.10.11.00",
-  "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
-  "homepage": "https://github.com/facebook/folly",
-  "supports": "x64 | (arm64 & !windows)",
-  "dependencies": [
-    "boost-chrono",
-    "boost-context",
-    "boost-conversion",
-    "boost-crc",
-    "boost-date-time",
-    "boost-filesystem",
-    "boost-multi-index",
-    "boost-program-options",
-    "boost-regex",
-    "boost-smart-ptr",
-    "boost-system",
-    "boost-thread",
-    "double-conversion",
-    "fmt",
-    "gflags",
-    "glog",
-    "libevent",
-    "libsodium",
-    "openssl",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ],
-  "default-features": [
-    "zlib"
-  ],
-  "features": {
-    "bzip2": {
-      "description": "Support bzip2 for compression",
-      "dependencies": [
-        "bzip2"
-      ]
-    },
-    "lz4": {
-      "description": "Support lz4 for compression",
-      "dependencies": [
-        "lz4"
-      ]
-    },
-    "lzma": {
-      "description": "Support LZMA for compression",
-      "dependencies": [
-        "liblzma"
-      ]
-    },
-    "snappy": {
-      "description": "Support Snappy for compression",
-      "dependencies": [
-        "snappy"
-      ]
-    },
-    "zlib": {
-      "description": "Support zlib for compression",
-      "dependencies": [
-        "zlib"
-      ]
-    },
-    "zstd": {
-      "description": "Support zstd for compression",
-      "dependencies": [
-        "zstd"
-      ]
-    }
-  }
-}
diff --git a/vcpkg-registry/versions/baseline.json b/vcpkg-registry/versions/baseline.json
index b4f045e..4134912 100644
--- a/vcpkg-registry/versions/baseline.json
+++ b/vcpkg-registry/versions/baseline.json
@@ -1,6 +1,5 @@
 {
   "default": {
-    "folly": { "baseline": "2021.10.11.00", "port-version": 0 },
     "jemalloc-nes": { "baseline": "5.2.1", "port-version": 0 },
     "oatpp": { "baseline": "1.3.0", "port-version": 0 }
   }
diff --git a/vcpkg-registry/versions/f/folly.json b/vcpkg-registry/versions/f/folly.json
deleted file mode 100644
index 1765707..0000000
--- a/vcpkg-registry/versions/f/folly.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "versions": [
-    {
-      "git-tree": "",
-      "version-string": "2021.10.11.00",
-      "port-version": 0
-    }
-  ]
-}
diff --git a/vcpkg.json b/vcpkg.json
index 4769861..2ddbc3d 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -7,16 +7,9 @@
   "builtin-baseline": "daa7215f3d68c2a2f2e18c398cb73dab63cda829",
   "dependencies": [
     "z3",
-    "boost-system",
-    "boost-process",
-    "boost-thread",
-    "boost-program-options",
-    "boost-filesystem",
-    "boost-chrono",
     "zeromq",
     "cppzmq",
     "grpc",
-    "cpprestsdk",
     "libevent",
     "fmt",
     "paho-mqttpp3",
@@ -25,14 +18,23 @@
     "libsodium",
     "eigen3",
     "gtest",
+    "benchmark",
     "antlr4",
     "spdlog",
     "folly",
     "jemalloc-nes",
-    {
-      "name": "cppkafka",
-      "platform": "!osx"
-    },
+    "simdjson",
+    "oatpp",
+    "cpr",
+    "nlohmann-json",
+    "tensorflow-lite",
+    "s2",
+    "cppkafka",
+    "snappy",
+    "lz4",
+    "fastlz",
+    "zstd",
+    "brotli",
     {
       "name": "libiconv",
       "platform": "osx"
@@ -42,12 +44,7 @@
       "default-features": false,
       "features": ["openssl"],
       "platform": "osx"
-    },
-    "oatpp",
-    "cpr",
-    "nlohmann-json",
-    "tensorflow-lite",
-    "s2"
+    }
   ],
   "overrides": [
     {
@@ -58,6 +55,12 @@
     },
     {
       "name": "spdlog", "version": "1.11.0"
+    },
+    {
+      "name": "folly", "version-string": "2022.10.31.00"
+    },
+    {
+      "name": "simdjson", "version": "3.0.0"
     }
   ]
 }