diff --git a/deps/+Blosc/Blosc.cmake b/deps/+Blosc/Blosc.cmake
index a38ea62df4..aeecd672a6 100644
--- a/deps/+Blosc/Blosc.cmake
+++ b/deps/+Blosc/Blosc.cmake
@@ -7,10 +7,8 @@ else()
 endif()
 
 add_cmake_project(Blosc
-    #URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip
-    #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
-    URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip
-    URL_HASH SHA256=dcb48bf43a672fa3de6a4b1de2c4c238709dad5893d1e097b8374ad84b1fc3b3
+    URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm_universal.zip #https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip
+    #URL_HASH SHA256=dcb48bf43a672fa3de6a4b1de2c4c238709dad5893d1e097b8374ad84b1fc3b3
     # Patching upstream does not work this way with git version 2.28 installed on mac worker
     # PATCH_COMMAND  ${GIT_EXECUTABLE} apply --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/blosc-mods.patch
     CMAKE_ARGS
diff --git a/deps/+Boost/Boost.cmake b/deps/+Boost/Boost.cmake
index 71c24259b4..17202c3277 100644
--- a/deps/+Boost/Boost.cmake
+++ b/deps/+Boost/Boost.cmake
@@ -1,3 +1,13 @@
+
+set(_context_abi_line "")
+if (APPLE AND CMAKE_OSX_ARCHITECTURES)
+    if (CMAKE_OSX_ARCHITECTURES MATCHES "x86")
+        set(_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=sysv")
+    elseif (CMAKE_OSX_ARCHITECTURES MATCHES "arm")
+        set (_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=aapcs")
+    endif ()
+endif ()
+
 add_cmake_project(Boost
     URL "https://github.com/boostorg/boost/releases/download/boost-1.82.0/boost-1.82.0.zip"
     URL_HASH SHA256=200f9292b5ef957ab551a648834239f502df165cb7bff18432702fb7ae98accb
@@ -5,4 +15,6 @@ add_cmake_project(Boost
     CMAKE_ARGS
         -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
         -DBUILD_TESTING:BOOL=OFF
+        -DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}
+        "${_context_abi_line}"
 )