diff --git a/Dockerfile.agnos b/Dockerfile.agnos
index 12901a8..5d1cb5e 100644
--- a/Dockerfile.agnos
+++ b/Dockerfile.agnos
@@ -1,3 +1,5 @@
+# check=error=true
+
 # ################## #
 # ###### Base ###### #
 # ################## #
diff --git a/Dockerfile.builder b/Dockerfile.builder
index 7b661fc..cfe61ac 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -1,3 +1,5 @@
+# check=error=true
+
 FROM ubuntu:20.04
 
 ARG UNAME
diff --git a/build_system.sh b/build_system.sh
index aee039d..7347f7d 100755
--- a/build_system.sh
+++ b/build_system.sh
@@ -42,12 +42,21 @@ if [ "$ARCH" = "x86_64" ]; then
   docker run --rm --privileged multiarch/qemu-user-static --reset -p yes > /dev/null
 fi
 
+# Check agnos-builder Dockerfile
+docker build -f Dockerfile.agnos --check $DIR
+
 # Start agnos-builder docker build and create container
 echo "Building agnos-builder docker image"
 docker build -f Dockerfile.agnos -t agnos-builder $DIR
 echo "Creating agnos-builder container"
 CONTAINER_ID=$(docker container create --entrypoint /bin/bash agnos-builder:latest)
 
+# Check agnos-meta-builder Dockerfile
+docker build -f Dockerfile.builder --check $DIR \
+  --build-arg UNAME=$(id -nu) \
+  --build-arg UID=$(id -u) \
+  --build-arg GID=$(id -g)
+
 # Setup mount container for macOS and CI support (namespace.so)
 echo "Building agnos-meta-builder docker image"
 docker build -f Dockerfile.builder -t agnos-meta-builder $DIR \