diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 57e4b2a58..210d21927 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
       run: |
         mkdir -p $GITHUB_WORKSPACE/build
         cd $GITHUB_WORKSPACE/build
-        meson .. -Dman=false -Defi_binary=false -Dplugin_uefi_capsule_splash=false --prefix=$GITHUB_WORKSPACE/dist
+        meson setup .. -Dman=false -Defi_binary=false -Dplugin_uefi_capsule_splash=false --prefix=$GITHUB_WORKSPACE/dist
         ninja
 
     - name: Perform CodeQL Analysis
diff --git a/contrib/build-openbmc.sh b/contrib/build-openbmc.sh
index 4427ebd09..4de5fd1c9 100755
--- a/contrib/build-openbmc.sh
+++ b/contrib/build-openbmc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-meson ../ \
+meson setup ../ \
     -Dauto_features=disabled \
     -Dbash_completion=false \
     -Dcompat_cli=false \
diff --git a/contrib/build-windows.sh b/contrib/build-windows.sh
index c60a8024e..8390eef58 100755
--- a/contrib/build-windows.sh
+++ b/contrib/build-windows.sh
@@ -12,7 +12,7 @@ if [ ! -f /usr/share/mingw/toolchain-mingw64.meson ]; then
 fi
 
 # try to keep this and ../contrib/ci/build_windows.sh in sync as much as makes sense
-meson .. \
+meson setup .. \
     --cross-file=/usr/share/mingw/toolchain-mingw64.meson \
     --cross-file=../contrib/mingw64.cross \
     --prefix=/ \
diff --git a/contrib/ci/build_macos.sh b/contrib/ci/build_macos.sh
index 80ad4a5cd..9d15fbfc9 100755
--- a/contrib/ci/build_macos.sh
+++ b/contrib/ci/build_macos.sh
@@ -3,7 +3,7 @@ set -e
 set -x
 
 mkdir -p build-macos && cd build-macos
-meson .. \
+meson setup .. \
     -Dbuild=standalone \
     -Dsoup_session_compat=false \
     -Dgusb:docs=false \
diff --git a/contrib/ci/build_windows.sh b/contrib/ci/build_windows.sh
index 9bb589a32..8e5c5b0f4 100755
--- a/contrib/ci/build_windows.sh
+++ b/contrib/ci/build_windows.sh
@@ -33,7 +33,7 @@ rm -rf $DESTDIR $build
 
 # try to keep this and ../contrib/build-windows.sh in sync as much as makes sense
 mkdir -p $build $DESTDIR && cd $build
-meson .. \
+meson setup .. \
     --cross-file=/usr/share/mingw/toolchain-mingw64.meson \
     --cross-file=../contrib/mingw64.cross \
     --prefix=/ \
diff --git a/contrib/ci/centos.sh b/contrib/ci/centos.sh
index 14e5e23f9..d7af97b6b 100755
--- a/contrib/ci/centos.sh
+++ b/contrib/ci/centos.sh
@@ -9,7 +9,7 @@ set -x
 rm -rf build
 mkdir -p build
 cd build
-meson .. \
+meson setup .. \
 	--werror \
 	-Dplugin_uefi_capsule=disabled \
 	-Dplugin_dell=disabled \
diff --git a/contrib/ci/debian_s390x.sh b/contrib/ci/debian_s390x.sh
index 4bff8baba..332ebf7c2 100755
--- a/contrib/ci/debian_s390x.sh
+++ b/contrib/ci/debian_s390x.sh
@@ -14,7 +14,7 @@ rm -rf build
 mkdir -p build
 cp contrib/ci/s390x_cross.txt build/
 cd build
-meson .. \
+meson setup .. \
 	--cross-file s390x_cross.txt \
 	--werror \
 	-Dplugin_flashrom=disabled \
diff --git a/contrib/ci/fedora.sh b/contrib/ci/fedora.sh
index cdb398a10..b2a51a0ba 100755
--- a/contrib/ci/fedora.sh
+++ b/contrib/ci/fedora.sh
@@ -16,7 +16,7 @@ if [ "$QUBES" = "true" ]; then
     QUBES_MACRO=(--define "qubes_packages 1")
 fi
 
-meson .. \
+meson setup .. \
     -Ddocs=disabled \
     -Dman=true \
     -Dtests=true \