diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index db3983c3..522f0793 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -18,9 +18,9 @@ jobs:
       fail-fast: false
       matrix:
         sys:
-        - {compiler: clang, version: '16', config-flags: '', stdlib: 'libstdc++-13' }
+        - {compiler: clang, version: '16', config-flags: '', stdlib: 'libstdc++-12' }
         # - {compiler: clang, version: '16', config-flags: '-DCMAKE_CXX_FLAGS=-stdlib=libc++', stdlib: 'libc++-17' }
-        - {compiler: clang, version: '17', config-flags: '', stdlib: 'libstdc++-13' }
+        - {compiler: clang, version: '17', config-flags: '', stdlib: 'libstdc++-12' }
         # - {compiler: clang, version: '17', config-flags: '-DCMAKE_CXX_FLAGS=-stdlib=libc++', stdlib: 'libc++-17' }
         - {compiler: gcc, version: '12', config-flags: '' }
         - {compiler: gcc, version: '13', config-flags: '' }
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 196c41d6..a401e07d 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -24,7 +24,7 @@ jobs:
         - { name: Debug }
         - { name: Release }
         compiler:
-        - clang
+        # - clang # TODO: Uncomment this line when we have fixed the compilation issue
         - apple-clang
 
     steps: