diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index b9cfb4e9..59e4a16d 100644
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -32,10 +32,7 @@ jobs:
     - name: Build shadow-utils
       run: |
         PROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
-        make -kj$PROCESSORS || true
-
-    - name: Check build errors
-      run: make
+        make -Orecurse -j$PROCESSORS
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/share/containers/alpine.dockerfile b/share/containers/alpine.dockerfile
index e1886e40..f6d9f11c 100644
--- a/share/containers/alpine.dockerfile
+++ b/share/containers/alpine.dockerfile
@@ -26,8 +26,7 @@ RUN ./autogen.sh \
 	--disable-man \
 	--disable-nls \
 	--with-yescrypt
-RUN make -kj4 || true
-RUN make
+RUN make -Orecurse -j4
 RUN bash -c "trap 'cat <tests/unit/test-suite.log >&2' ERR; make check;"
 RUN make install
 
diff --git a/share/containers/debian.dockerfile b/share/containers/debian.dockerfile
index 9a302967..408c6fa1 100644
--- a/share/containers/debian.dockerfile
+++ b/share/containers/debian.dockerfile
@@ -23,8 +23,7 @@ RUN ./autogen.sh \
 	--without-selinux \
 	--enable-man \
 	--with-yescrypt
-RUN make -kj4 || true
-RUN make
+RUN make -Orecurse -j4
 RUN bash -c "trap 'cat <tests/unit/test-suite.log >&2' ERR; make check;"
 RUN make install
 
diff --git a/share/containers/fedora.dockerfile b/share/containers/fedora.dockerfile
index 5ad9d418..93c6b220 100644
--- a/share/containers/fedora.dockerfile
+++ b/share/containers/fedora.dockerfile
@@ -25,8 +25,7 @@ RUN ./autogen.sh \
         --with-group-name-max-length=32 \
 	--enable-lastlog \
 	--enable-logind=no
-RUN make -kj4 || true
-RUN make
+RUN make -Orecurse -j4
 RUN bash -c "trap 'cat <tests/unit/test-suite.log >&2' ERR; make check;"
 RUN make install