diff --git a/.github/workflows/CI-mingw.yml b/.github/workflows/CI-mingw.yml
index 390de83d..99991737 100644
--- a/.github/workflows/CI-mingw.yml
+++ b/.github/workflows/CI-mingw.yml
@@ -16,12 +16,11 @@ jobs:
       matrix:
         compiler: [g++, clang++]
         # TODO: add MSYS after #556 is fixed
-        msystem: [MINGW32, MINGW64, CLANG64]
+        # MINGW32 was removed since MSYS2 is phasing out 32-bit environments
+        msystem: [MINGW64, CLANG64]
         include:
           #- msystem: MSYS
           #  pkg-prefix: ''
-          - msystem: MINGW32
-            pkg-prefix: 'mingw-w64-i686-'
           - msystem: MINGW64
             pkg-prefix: 'mingw-w64-x86_64-'
           - msystem: CLANG64
@@ -33,9 +32,6 @@ jobs:
         exclude:
           - msystem: CLANG64
             compiler: g++
-          # the mingw-w64-i686-clang package is no longer available
-          - msystem: MINGW32
-            compiler: clang++
       fail-fast: false
 
     runs-on: windows-2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2c99e89..220c6c3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,11 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options_safe(-Wno-thread-safety-negative)
     add_compile_options_safe(-Wno-thread-safety-beta)
 
+    # TODO: add [[clang::lifetimebound]] annotations?
+    add_compile_options_safe(-Wno-lifetime-safety-intra-tu-suggestions)
+    add_compile_options_safe(-Wno-lifetime-safety-intra-tu-constructor-suggestions)
+    add_compile_options_safe(-Wno-lifetime-safety-cross-tu-constructor-suggestions)
+
     # TODO: fix these?
     add_compile_options(-Wno-padded)
     add_compile_options(-Wno-sign-conversion)