diff --git a/.github/workflows/on_PR_meson.yaml b/.github/workflows/on_PR_meson.yaml
index a5a9a07e..37958d21 100644
--- a/.github/workflows/on_PR_meson.yaml
+++ b/.github/workflows/on_PR_meson.yaml
@@ -24,8 +24,10 @@ jobs:
           python3 -m pip install meson ninja
 
       - name: Sanity Checks
+        env:
+          CXX: g++-${{matrix.cxx}}
         run: |
-          env CXX=g++-${{matrix.cxx}} meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3
+          meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3
           meson compile -C "${{github.workspace}}/build" --verbose
           meson test -C "${{github.workspace}}/build" --verbose
 
diff --git a/.github/workflows/on_PR_meson_clang.yaml b/.github/workflows/on_PR_meson_clang.yaml
index aef723f0..9bf7c502 100644
--- a/.github/workflows/on_PR_meson_clang.yaml
+++ b/.github/workflows/on_PR_meson_clang.yaml
@@ -24,7 +24,10 @@ jobs:
           python3 -m pip install meson ninja
 
       - name: Sanity Checks
+        env:
+          CXX: clang++-${{matrix.cxx}}
+          CXXFLAGS: -stdlib=libc++
         run: |
-          env CXX=clang++-${{matrix.cxx}} CXXFLAGS=-stdlib=libc++ meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3 -Dcpp_std=c++20
+          meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3 -Dcpp_std=c++20
           meson compile -C "${{github.workspace}}/build" --verbose
           meson test -C "${{github.workspace}}/build" --verbose