diff --git a/CHANGELOG.md b/CHANGELOG.md
index b761d76d5..610396d2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ All notable changes to this project will be documented in this file.
 - ci: Rename local actions, adjust action inputs and outputs, add definition
   README file ([#819]).
 - Update cargo-cyclonedx to 0.5.5 and build CycloneDX 1.5 files ([#783])
+- Enable [Docker build checks](https://docs.docker.com/build/checks/) ([#872])
 
 ### Removed
 
@@ -68,6 +69,7 @@ All notable changes to this project will be documented in this file.
 [#866]: https://github.com/stackabletech/docker-images/pull/866
 [#867]: https://github.com/stackabletech/docker-images/pull/867
 [#868]: https://github.com/stackabletech/docker-images/pull/868
+[#872]: https://github.com/stackabletech/docker-images/pull/872
 [#874]: https://github.com/stackabletech/docker-images/pull/874
 [#877]: https://github.com/stackabletech/docker-images/pull/877
 [#878]: https://github.com/stackabletech/docker-images/pull/878
diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index 5f1bf8e0f..6bfc4ac49 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 ARG GIT_SYNC
 
diff --git a/druid/Dockerfile b/druid/Dockerfile
index e0e3eea26..c78326888 100644
--- a/druid/Dockerfile
+++ b/druid/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-devel AS druid-builder
 
diff --git a/hadoop/Dockerfile b/hadoop/Dockerfile
index 8f011c218..2cdd44cde 100644
--- a/hadoop/Dockerfile
+++ b/hadoop/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-devel AS builder
 
diff --git a/hbase/Dockerfile b/hbase/Dockerfile
index 961f3b2ad..216aed6be 100644
--- a/hbase/Dockerfile
+++ b/hbase/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/hadoop AS hadoop-builder
 
@@ -142,7 +143,7 @@ WORKDIR /stackable
 
 # Cache mounts are owned by root by default
 # We need to explicitly give the uid to use which is hardcoded to "1000" in stackable-base
-RUN --mount=type=cache,id=maven-hbase-operator-tools,uid=1000,target=/stackable/.m2/repository <<EOF
+RUN --mount=type=cache,id=maven-hbase-operator-tools-${HBASE_OPERATOR_TOOLS},uid=1000,target=/stackable/.m2/repository <<EOF
 
 curl "https://repo.stackable.tech/repository/packages/hbase-operator-tools/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src.tar.gz" | tar -xzC .
 mv hbase-operator-tools-${HBASE_OPERATOR_TOOLS} hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src
@@ -229,7 +230,7 @@ COPY --chown=stackable:stackable hbase/stackable/patches /stackable/patches
 USER stackable
 WORKDIR /stackable
 
-RUN --mount=type=cache,id=maven-phoenix,uid=1000,target=/stackable/.m2/repository <<EOF
+RUN --mount=type=cache,id=maven-phoenix-${PHOENIX},uid=1000,target=/stackable/.m2/repository <<EOF
 cd /stackable
 curl "https://repo.stackable.tech/repository/packages/phoenix/phoenix-${PHOENIX}-src.tar.gz" | tar -xzC .
 mv phoenix-${PHOENIX} phoenix-${PHOENIX}-src
diff --git a/hello-world/Dockerfile b/hello-world/Dockerfile
index 6792741ce..6395d20fc 100644
--- a/hello-world/Dockerfile
+++ b/hello-world/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-base
 
diff --git a/hive/Dockerfile b/hive/Dockerfile
index 5398c3d76..d7f40e15f 100644
--- a/hive/Dockerfile
+++ b/hive/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/hadoop AS hadoop-builder
 
@@ -24,7 +25,7 @@ WORKDIR /stackable
 
 # Cache mounts are owned by root by default
 # We need to explicitly give the uid to use which is hardcoded to "1000" in stackable-base
-RUN --mount=type=cache,id=maven-hive,uid=1000,target=/stackable/.m2/repository <<EOF
+RUN --mount=type=cache,id=maven-hive-${PRODUCT},uid=1000,target=/stackable/.m2/repository <<EOF
 curl "https://repo.stackable.tech/repository/packages/hive/apache-hive-${PRODUCT}-src.tar.gz" | tar -xzC .
 
 patches/apply_patches.sh ${PRODUCT}
diff --git a/java-base/Dockerfile b/java-base/Dockerfile
index e3420a317..b8ef6f8c7 100644
--- a/java-base/Dockerfile
+++ b/java-base/Dockerfile
@@ -1,4 +1,6 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
+
 #
 # Provides the common Java Runtime for SDP products
 #
diff --git a/java-devel/Dockerfile b/java-devel/Dockerfile
index d4238870c..8fed379e1 100644
--- a/java-devel/Dockerfile
+++ b/java-devel/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 #
 # Base imaege for builder stages
diff --git a/kafka-testing-tools/Dockerfile b/kafka-testing-tools/Dockerfile
index 90328bca0..8cd439e46 100644
--- a/kafka-testing-tools/Dockerfile
+++ b/kafka-testing-tools/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/kcat AS kcat
 
@@ -6,6 +7,7 @@ FROM stackable/image/stackable-base AS final
 
 ARG PRODUCT
 ARG KCAT
+ARG RELEASE
 
 LABEL name="Kafka Testing Tools" \
       maintainer="info@stackable.tech" \
diff --git a/kafka/Dockerfile b/kafka/Dockerfile
index 7b710803b..462f8f1e0 100644
--- a/kafka/Dockerfile
+++ b/kafka/Dockerfile
@@ -1,8 +1,9 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/kcat AS kcat
 
-FROM stackable/image/java-devel as kafka-builder
+FROM stackable/image/java-devel AS kafka-builder
 
 ARG PRODUCT
 ARG SCALA
diff --git a/kcat/Dockerfile b/kcat/Dockerfile
index 8d01dd04e..384829996 100644
--- a/kcat/Dockerfile
+++ b/kcat/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Normally we would use stackable/image/stackable-base here, *but* we fail to link kcat at the end with error messages
 # shown in Snippet 1, which we were not able to solve.
diff --git a/krb5/Dockerfile b/krb5/Dockerfile
index 27788521f..35260fd9d 100644
--- a/krb5/Dockerfile
+++ b/krb5/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # RedHat UBI does not package krb5-server, so we cannot use it as a KDC
 # FROM stackable/image/stackable-base
diff --git a/nifi/Dockerfile b/nifi/Dockerfile
index a3c5cc3fc..5cae45841 100644
--- a/nifi/Dockerfile
+++ b/nifi/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-devel AS nifi-builder
 
diff --git a/omid/Dockerfile b/omid/Dockerfile
index cc20e266e..b8606faf9 100644
--- a/omid/Dockerfile
+++ b/omid/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-devel AS builder
 
diff --git a/opa/Dockerfile b/opa/Dockerfile
index 2c13fe2bb..2fe1802c9 100644
--- a/opa/Dockerfile
+++ b/opa/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/stackable-base AS opa-bundle-builder
 
@@ -54,7 +55,7 @@ WORKDIR /daemontools/admin/daemontools-${DAEMONTOOLS_VERSION}
 
 RUN package/install
 
-FROM stackable/image/stackable-base as opa-builder
+FROM stackable/image/stackable-base AS opa-builder
 
 ARG PRODUCT
 ARG RELEASE
diff --git a/spark-k8s/Dockerfile b/spark-k8s/Dockerfile
index b62fc2ada..f7082baae 100644
--- a/spark-k8s/Dockerfile
+++ b/spark-k8s/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # hadoop-builder: Provides Hadoop libraries
 FROM stackable/image/hadoop AS hadoop-builder
@@ -8,7 +9,7 @@ FROM stackable/image/hbase AS hbase-builder
 
 # spark-source-builder: Download the Spark source code into
 # /stackable/spark and apply the patches
-FROM stackable/image/java-devel as spark-source-builder
+FROM stackable/image/java-devel AS spark-source-builder
 
 ARG PRODUCT
 
@@ -45,7 +46,7 @@ RUN patches/apply_patches.sh ${PRODUCT}
 
 # hbase-connectors-builder: Build the Spark HBase connector and copy
 # required JARs into /stackable/spark/jars
-FROM stackable/image/java-devel as hbase-connectors-builder
+FROM stackable/image/java-devel AS hbase-connectors-builder
 
 ARG PRODUCT
 ARG HADOOP
@@ -243,8 +244,7 @@ COPY shared/log4shell_scanner /bin/log4shell_scanner
 RUN /bin/log4shell_scanner s /stackable/spark-${PRODUCT}/dist
 # ===
 
-
-FROM stackable/image/java-base as final
+FROM stackable/image/java-base AS final
 
 ARG PRODUCT
 ARG PYTHON
@@ -283,7 +283,7 @@ ENV HOME=/stackable
 ENV SPARK_HOME=/stackable/spark
 ENV PATH=$SPARK_HOME:$PATH:/bin:$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$HOME/.local/bin
 ENV PYSPARK_PYTHON=/usr/bin/python
-ENV PYTHONPATH=$SPARK_HOME/python:$PYTHONPATH
+ENV PYTHONPATH=$SPARK_HOME/python
 
 COPY --chown=stackable:stackable --from=spark-builder /stackable/spark-${PRODUCT}/dist /stackable/spark
 COPY --chown=stackable:stackable --from=spark-builder /stackable/spark-${PRODUCT}/assembly/target/bom.json /stackable/spark/spark-${PRODUCT}.cdx.json
diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
index 102935474..0dc2487d6 100644
--- a/stackable-base/Dockerfile
+++ b/stackable-base/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
 # IMPORTANT: Make sure to use the "Manifest List Digest" that references the images for multiple architectures
diff --git a/statsd_exporter/Dockerfile b/statsd_exporter/Dockerfile
index 0a084a1fc..4c6a07b4c 100644
--- a/statsd_exporter/Dockerfile
+++ b/statsd_exporter/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/stackable-base
 ARG PRODUCT
diff --git a/superset/Dockerfile b/superset/Dockerfile
index 57bd52a72..cb5fd0d50 100644
--- a/superset/Dockerfile
+++ b/superset/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/statsd_exporter AS statsd_exporter-builder
 
diff --git a/testing-tools/Dockerfile b/testing-tools/Dockerfile
index 3efb417d2..c7e8bd6da 100644
--- a/testing-tools/Dockerfile
+++ b/testing-tools/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Manifest list digest because of multi architecture builds ( https://www.redhat.com/architect/pull-container-image#:~:text=A%20manifest%20list%20exists%20to,system%20on%20a%20specific%20architecture )
 # https://hub.docker.com/_/python/tags
diff --git a/tools/Dockerfile b/tools/Dockerfile
index f4fed14c3..bd0f2bcf1 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/stackable-base
 
diff --git a/trino-cli/Dockerfile b/trino-cli/Dockerfile
index 75f3c48f1..dcdc6d582 100644
--- a/trino-cli/Dockerfile
+++ b/trino-cli/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-base
 
diff --git a/trino/Dockerfile b/trino/Dockerfile
index 2286a760f..d828c4e01 100644
--- a/trino/Dockerfile
+++ b/trino/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-devel AS storage-connector-builder
 
diff --git a/ubi8-rust-builder/Dockerfile b/ubi8-rust-builder/Dockerfile
index 7c412e0ea..732ade00d 100644
--- a/ubi8-rust-builder/Dockerfile
+++ b/ubi8-rust-builder/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Deprecation notice: Stackable has moved to UBI9 as of its 24.7 release
 # This builder is kept around and updated until the last SDP release is EOL that uses UBI8 (which is 24.3) so we'll remove this sometime in the summer of 2025
diff --git a/ubi9-rust-builder/Dockerfile b/ubi9-rust-builder/Dockerfile
index 5ba251a00..beb4551a3 100644
--- a/ubi9-rust-builder/Dockerfile
+++ b/ubi9-rust-builder/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
 # IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
diff --git a/vector/Dockerfile b/vector/Dockerfile
index d2f843c20..a4962131f 100644
--- a/vector/Dockerfile
+++ b/vector/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/stackable-base
 
diff --git a/zookeeper/Dockerfile b/zookeeper/Dockerfile
index 21d87b91e..523da1ecc 100644
--- a/zookeeper/Dockerfile
+++ b/zookeeper/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # ==============================================================================
 # START ZOOKEEPER BUILDER