diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00594cf0..80a7a6aa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -541,9 +541,9 @@ jobs:
             if [ "${MATRIX_ZLIB}" = 'OFF' ]; then
               options+=' --with-libz=no'
             else
-              options+=' --with-zlib'
+              options+=' --with-libz'
             fi
-            ../configure --enable-werror --enable-debug \
+            ../configure --enable-option-checking=fatal --enable-werror --enable-debug \
               ${options} ${MATRIX_OPTIONS} \
               --disable-dependency-tracking \
               || { tail -n 1000 config.log; false; }
@@ -592,7 +592,7 @@ jobs:
           # Test build from tarball
           tar -xvf libssh2-99.98.97.tar.gz
           cd libssh2-99.98.97
-          ./configure --enable-werror --enable-debug --prefix="$HOME"/temp \
+          ./configure --enable-option-checking=fatal --enable-werror --enable-debug --prefix="$HOME"/temp \
             ${MATRIX_OPTIONS} --disable-dependency-tracking
           make install
           cd ..
@@ -653,7 +653,7 @@ jobs:
               || { cat bld/CMakeFiles/CMake*.yaml; false; }
           else
             mkdir bld && cd bld
-            ../configure --enable-werror --enable-debug \
+            ../configure --enable-option-checking=fatal --enable-werror --enable-debug \
               --host="${TRIPLET}" \
               --disable-dependency-tracking \
               || { tail -n 1000 config.log; false; }
@@ -718,7 +718,7 @@ jobs:
               || { cat bld/CMakeFiles/CMake*.yaml; false; }
           else
             mkdir bld && cd bld
-            ../configure --enable-werror --enable-debug \
+            ../configure --enable-option-checking=fatal --enable-werror --enable-debug \
               --with-crypto=openssl \
               --disable-docker-tests \
               --disable-dependency-tracking \
@@ -836,7 +836,7 @@ jobs:
             fi
             # sshd tests sometimes hang
             mkdir bld && cd bld
-            ../configure --enable-werror --enable-debug \
+            ../configure --enable-option-checking=fatal --enable-werror --enable-debug \
               --with-crypto="${MATRIX_CRYPTO}" \
               --disable-docker-tests \
               --disable-sshd-tests \
@@ -995,7 +995,7 @@ jobs:
               || { cat bld/CMakeFiles/CMake*.yaml; false; }
           else
             mkdir bld && cd bld
-            ../configure --enable-werror --enable-debug \
+            ../configure --enable-option-checking=fatal --enable-werror --enable-debug \
               --with-libz ${MATRIX_CONFIGURE} \
               --disable-docker-tests \
               --disable-sshd-tests \
@@ -1111,7 +1111,7 @@ jobs:
             sudo pkg install -y autoconf automake libtool
             autoreconf -fi
             mkdir bld && cd bld
-            ../configure --enable-werror --enable-debug \
+            ../configure --enable-option-checking=fatal --enable-werror --enable-debug \
               --with-crypto=openssl \
               --disable-docker-tests \
               --disable-dependency-tracking \