diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 8a747d52..a4411e2f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -23,13 +23,10 @@ jobs:
       run: mkdir test-logs
     - name: setup
       run: |
-        meson _build
+        meson setup _build -Db_sanitize=address,undefined -Doptimization=2
       env:
         CFLAGS: >-
-          -O2
           -Wp,-D_FORTIFY_SOURCE=2
-          -fsanitize=address
-          -fsanitize=undefined
     - name: compile
       run: ninja -C _build -v
     - name: smoke-test
@@ -94,11 +91,10 @@ jobs:
       uses: actions/checkout@v4
     - name: Install build-dependencies
       run: sudo ./ci/builddeps.sh --clang
-    - run: meson build -Dselinux=enabled
+    - run: meson setup build -Doptimization=2 -Dselinux=enabled
       env:
         CC: clang
         CFLAGS: >-
-          -O2
           -Werror=unused-variable
     - run: meson compile -C build
     - name: CodeQL analysis
diff --git a/README.md b/README.md
index 18d0becf..69addd6f 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ and can be installed from there.
 If you need to build bubblewrap from source, you can do this with meson:
 
 ```sh
-meson _builddir
+meson setup _builddir
 meson compile -C _builddir
 meson test -C _builddir
 meson install -C _builddir