diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 29cb45f7..03bca891 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -103,7 +103,8 @@ jobs:
     name: Exercise Python examples on ${{matrix.os}}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        #os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -140,7 +141,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        #os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-13]
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 333b5297..cdaa68bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.0)
 set(CMAKE_CXX_STANDARD 14)
 
 project(OpenCL-SDK
-  VERSION 2023.12.14
+  VERSION 2024.05.08
   LANGUAGES
     C CXX
 )
diff --git a/external/OpenCL-CLHPP b/external/OpenCL-CLHPP
index 83cc072d..0bdbbfe5 160000
--- a/external/OpenCL-CLHPP
+++ b/external/OpenCL-CLHPP
@@ -1 +1 @@
-Subproject commit 83cc072d8240aad47ef4663d572a31ef27d0411a
+Subproject commit 0bdbbfe5ecda42cff50c96cc5e33527f42fcbd45
diff --git a/external/OpenCL-Headers b/external/OpenCL-Headers
index 2368105c..8275634c 160000
--- a/external/OpenCL-Headers
+++ b/external/OpenCL-Headers
@@ -1 +1 @@
-Subproject commit 2368105c0531069fe927989505de7d125ec58c55
+Subproject commit 8275634cf9ec31b6484c2e6be756237cb583999d
diff --git a/external/OpenCL-ICD-Loader b/external/OpenCL-ICD-Loader
index 229410f8..861b68b2 160000
--- a/external/OpenCL-ICD-Loader
+++ b/external/OpenCL-ICD-Loader
@@ -1 +1 @@
-Subproject commit 229410f86a8c8c9e0f86f195409e5481a2bae067
+Subproject commit 861b68b290e76d08e7241608479c16431f529945
diff --git a/samples/core/callback/CMakeLists.txt b/samples/core/callback/CMakeLists.txt
index 54d05d84..f02e776f 100644
--- a/samples/core/callback/CMakeLists.txt
+++ b/samples/core/callback/CMakeLists.txt
@@ -20,6 +20,11 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/threads.c"
 int main(void) { thrd_sleep(&(struct timespec){.tv_nsec=1}, NULL); }
 ")
 
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/atomic.c"
+"#include <stdatomic.h>
+int main() { return 0; }
+")
+
 # Signature can be modernized at CMake version 3.25
 try_compile(
     HAS_C11_THREADS
@@ -29,7 +34,21 @@ try_compile(
     C_STANDARD_REQUIRED ON
 )
 
-if (HAS_C11_THREADS)
+try_compile(
+    HAS_C11_ATOMICS
+    "${CMAKE_CURRENT_BINARY_DIR}"
+    SOURCES "${CMAKE_CURRENT_BINARY_DIR}/atomic.c"
+    C_STANDARD 11
+    C_STANDARD_REQUIRED ON
+)
+
+if (NOT HAS_C11_THREADS)
+    message(WARNING
+    "Skipping callback sample, C11 standard threads are not supported with the current toolset")
+elseif (NOT HAS_C11_ATOMICS)
+    message(WARNING
+    "Skipping callback sample, C11 standard atomics are not supported with the current toolset")
+else()
     add_sample(
         TEST
         TARGET callback
@@ -38,9 +57,6 @@ if (HAS_C11_THREADS)
         KERNELS reaction_diffusion.cl)
     target_link_libraries(callback PRIVATE
         $<TARGET_NAME_IF_EXISTS:Threads::Threads>)
-else()
-    message(WARNING
-    "Skipping callback sample, C11 standard threads are not supported with the current toolset")
 endif()
 
 add_sample(