diff --git a/Dockerfile.labels b/Dockerfile.labels
index f480af4..2c5356e 100644
--- a/Dockerfile.labels
+++ b/Dockerfile.labels
@@ -1 +1,2 @@
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/helpers/cops_pkgmgr_install.sh b/helpers/cops_pkgmgr_install.sh
index f5abe6e..b6f5460 100755
--- a/helpers/cops_pkgmgr_install.sh
+++ b/helpers/cops_pkgmgr_install.sh
@@ -36,6 +36,7 @@ SYSTEM_COPS_ROOT=${SYSTEM_COPS_ROOT-$DEFAULT_COPS_ROOT}
 DOCKER_COPS_ROOT=${DOCKER_COPS_ROOT-$SYSTEM_COPS_ROOT}
 COPS_URL=${COPS_URL-$DEFAULT_COPS_URL}
 BASE_PREPROVISION_IMAGES="ubuntu:latest_preprovision"
+BASE_PREPROVISION_IMAGES="$BASE_PREPROVISION_IMAGES corpusops/ubuntu:24.04_preprovision"
 BASE_PREPROVISION_IMAGES="$BASE_PREPROVISION_IMAGES corpusops/ubuntu:22.04_preprovision"
 BASE_PREPROVISION_IMAGES="$BASE_PREPROVISION_IMAGES corpusops/ubuntu:20.04_preprovision"
 BASE_PREPROVISION_IMAGES="$BASE_PREPROVISION_IMAGES corpusops/ubuntu:18.04_preprovision"
@@ -44,6 +45,7 @@ BASE_PREPROVISION_IMAGES="$BASE_PREPROVISION_IMAGES corpusops/ubuntu:14.04_prepr
 BASE_PREPROVISION_IMAGES="$BASE_PREPROVISION_IMAGES corpusops/centos:7_preprovision"
 
 BASE_CORE_IMAGES="$BASE_CORE_IMAGES corpusops/ubuntu:latest"
+BASE_CORE_IMAGES="$BASE_CORE_IMAGES corpusops/ubuntu:24.04"
 BASE_CORE_IMAGES="$BASE_CORE_IMAGES corpusops/ubuntu:22.04"
 BASE_CORE_IMAGES="$BASE_CORE_IMAGES corpusops/ubuntu:20.04"
 BASE_CORE_IMAGES="$BASE_CORE_IMAGES corpusops/ubuntu:18.04"
@@ -55,6 +57,7 @@ EXP_PREPROVISION_IMAGES=""
 EXP_PREPROVISION_IMAGES="$EXP_PREPROVISION_IMAGES archlinux:latest_preprovision"
 EXP_PREPROVISION_IMAGES="$EXP_PREPROVISION_IMAGES debian:latest_preprovision"
 #EXP_PREPROVISION_IMAGES="$EXP_PREPROVISION_IMAGES debian:stretch_preprovision"
+EXP_PREPROVISION_IMAGES="$EXP_PREPROVISION_IMAGES debian:bookworm_preprovision"
 EXP_PREPROVISION_IMAGES="$EXP_PREPROVISION_IMAGES debian:bullseye_preprovision"
 EXP_PREPROVISION_IMAGES="$EXP_PREPROVISION_IMAGES debian:buster_preprovision"
 EXP_PREPROVISION_IMAGES="$EXP_PREPROVISION_IMAGES debian:sid_preprovision"
@@ -64,6 +67,7 @@ EXP_CORE_IMAGES="$EXP_CORE_IMAGES corpusops/debian:latest"
 #EXP_CORE_IMAGES="$EXP_CORE_IMAGES corpusops/debian:stretch"
 EXP_CORE_IMAGES="$EXP_CORE_IMAGES corpusops/debian:bullseye"
 EXP_CORE_IMAGES="$EXP_CORE_IMAGES corpusops/debian:buster"
+EXP_CORE_IMAGES="$EXP_CORE_IMAGES corpusops/debian:bookworm"
 EXP_CORE_IMAGES="$EXP_CORE_IMAGES corpusops/debian:sid"
 EXP_IMAGES="$EXP_PREPROVISION_IMAGES $EXP_CORE_IMAGES"
 # ansible related
@@ -273,7 +277,7 @@ is_debian_like() { echo $DISTRIB_ID | grep -E -iq "debian|ubuntu|mint"; }
 is_suse_like() { echo $DISTRIB_ID | grep -E -iq "suse"; }
 is_alpine_like() { echo $DISTRIB_ID | grep -E -iq "alpine" || test -e /etc/alpine-release; }
 is_redhat_like() { echo $DISTRIB_ID \
-        | grep -E -iq "((^ol$)|rhel|redhat|red-hat|centos|fedora|amzn)"; }
+        | grep -E -iq "((^ol$)|rhel|redhat|red-hat|centos|fedora)"; }
 set_lang() { locale=${1:-C};export LANG=${locale};export LC_ALL=${locale}; }
 is_darwin () {
     if [ "x${FORCE_DARWIN-}" != "x" ];then return 0;fi
@@ -518,8 +522,8 @@ get_python2() {
 get_python3() {
     local py_ver=3
     get_python_ $py_ver \
-        python3.10  python3.9  python3.8  python3.7  python3.6  python3.5  python3.4  \
-        python-3.10 python-3.9 python-3.8 python-3.7 python-3.6 python-3.5 python-3.4 \
+        python3.12  python3.11  python3.10  python3.9  python3.8  python3.7  python3.6  python3.5  python3.4  \
+        python-3.12 python-3.11 python-3.10 python-3.9 python-3.8 python-3.7 python-3.6 python-3.5 python-3.4 \
         python-${py_ver} python${py_ver} python
 }
 has_python_module() {
@@ -538,9 +542,19 @@ pymod_ver() {
 get_setuptools() {
     local py=${1:-python}
     local setuptoolsreq="setuptools"
-    if ( is_python2 $py );then setuptoolsreq="setuptools<=45"; else setuptoolsreq="setuptools<50"; fi
+    local cpyver=$($py -c "import sys;print(sys.version.split()[0])")
+    if ( is_python2 $py );then
+        setuptoolsreq="setuptools<=45"
+    elif ( version_lt $cpyver 3.12.0 );then
+        setuptoolsreq="setuptools<66"
+    else
+        setuptoolsreq="setuptools>=75"
+    fi
     echo "$setuptoolsreq"
 }
+setup_setuptools_requirement() {
+    sed -i -re "s/^setuptools\s*(>|<|=|$)/$(get_setuptools $py)/g" requirements/python_requirements.txt
+}
 install_pip() {
     local py="${1:-python}"
     local DEFAULT_PIP_URL="https://bootstrap.pypa.io/get-pip.py"
@@ -760,8 +774,8 @@ ensure_command() {
 ### archlinux (pacman)
 is_pacman_available() {
     for i in $@;do
-        if ! ( pacman -Si $(i_y) "$i" >/devnull 2>&1 ||\
-                pacman -Sg $(i_y) "$i" >/devnull 2>&1; );then
+        if ! ( pacman -Si $(i_y) "$i" >/dev/null 2>&1 ||\
+                pacman -Sg $(i_y) "$i" >/dev/null 2>&1; );then
             return 1
         fi
     done
@@ -770,7 +784,7 @@ is_pacman_available() {
 
 is_pacman_installed() {
     for i in $@;do
-        if ! ( pacman -Qi $(i_y) "$i" >/devnull 2>&1; ); then
+        if ! ( pacman -Qi $(i_y) "$i" >/dev/null 2>&1; ); then
             return 1
         fi
     done
diff --git a/library/ubuntu/14.04/Dockerfile b/library/ubuntu/14.04/Dockerfile
index e1dcdfc..430a090 100644
--- a/library/ubuntu/14.04/Dockerfile
+++ b/library/ubuntu/14.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/16.04/Dockerfile b/library/ubuntu/16.04/Dockerfile
index 7829035..bd12195 100644
--- a/library/ubuntu/16.04/Dockerfile
+++ b/library/ubuntu/16.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/17.04/Dockerfile b/library/ubuntu/17.04/Dockerfile
index aaea82a..c9b7268 100644
--- a/library/ubuntu/17.04/Dockerfile
+++ b/library/ubuntu/17.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/17.10/Dockerfile b/library/ubuntu/17.10/Dockerfile
index 9245751..12bb5ec 100644
--- a/library/ubuntu/17.10/Dockerfile
+++ b/library/ubuntu/17.10/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/18.04/Dockerfile b/library/ubuntu/18.04/Dockerfile
index b98e3a5..6760e31 100644
--- a/library/ubuntu/18.04/Dockerfile
+++ b/library/ubuntu/18.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/18.10/Dockerfile b/library/ubuntu/18.10/Dockerfile
index 9a3a1b3..398a581 100644
--- a/library/ubuntu/18.10/Dockerfile
+++ b/library/ubuntu/18.10/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/19.04/Dockerfile b/library/ubuntu/19.04/Dockerfile
index d463406..55dbd76 100644
--- a/library/ubuntu/19.04/Dockerfile
+++ b/library/ubuntu/19.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/19.10/Dockerfile b/library/ubuntu/19.10/Dockerfile
index ab4e1d3..11f0375 100644
--- a/library/ubuntu/19.10/Dockerfile
+++ b/library/ubuntu/19.10/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/20.04/Dockerfile b/library/ubuntu/20.04/Dockerfile
index bb536ea..5cc7c05 100644
--- a/library/ubuntu/20.04/Dockerfile
+++ b/library/ubuntu/20.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/20.10/Dockerfile b/library/ubuntu/20.10/Dockerfile
index 25a51ea..66f1b26 100644
--- a/library/ubuntu/20.10/Dockerfile
+++ b/library/ubuntu/20.10/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/21.04/Dockerfile b/library/ubuntu/21.04/Dockerfile
index eaaadf7..04f1bcf 100644
--- a/library/ubuntu/21.04/Dockerfile
+++ b/library/ubuntu/21.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/21.10/Dockerfile b/library/ubuntu/21.10/Dockerfile
index 20b3fdf..e70f056 100644
--- a/library/ubuntu/21.10/Dockerfile
+++ b/library/ubuntu/21.10/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/22.04/Dockerfile b/library/ubuntu/22.04/Dockerfile
index 286dc62..917c4ad 100644
--- a/library/ubuntu/22.04/Dockerfile
+++ b/library/ubuntu/22.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/22.10/Dockerfile b/library/ubuntu/22.10/Dockerfile
index 71f0b1c..9b31e6b 100644
--- a/library/ubuntu/22.10/Dockerfile
+++ b/library/ubuntu/22.10/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/23.04/Dockerfile b/library/ubuntu/23.04/Dockerfile
index add0347..2f894cc 100644
--- a/library/ubuntu/23.04/Dockerfile
+++ b/library/ubuntu/23.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/23.10/Dockerfile b/library/ubuntu/23.10/Dockerfile
index 1bdfd9a..efc1358 100644
--- a/library/ubuntu/23.10/Dockerfile
+++ b/library/ubuntu/23.10/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/24.04/Dockerfile b/library/ubuntu/24.04/Dockerfile
index ffad60c..e8e498e 100644
--- a/library/ubuntu/24.04/Dockerfile
+++ b/library/ubuntu/24.04/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/24.10/Dockerfile b/library/ubuntu/24.10/Dockerfile
index 3992e8d..dc45007 100644
--- a/library/ubuntu/24.10/Dockerfile
+++ b/library/ubuntu/24.10/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/artful/Dockerfile b/library/ubuntu/artful/Dockerfile
index 7d19bb7..e07b973 100644
--- a/library/ubuntu/artful/Dockerfile
+++ b/library/ubuntu/artful/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/bionic/Dockerfile b/library/ubuntu/bionic/Dockerfile
index 4a64c65..32a79e3 100644
--- a/library/ubuntu/bionic/Dockerfile
+++ b/library/ubuntu/bionic/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/cosmic/Dockerfile b/library/ubuntu/cosmic/Dockerfile
index 9be98f8..143d2fa 100644
--- a/library/ubuntu/cosmic/Dockerfile
+++ b/library/ubuntu/cosmic/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/devel/Dockerfile b/library/ubuntu/devel/Dockerfile
index 62747d5..a4fd7d5 100644
--- a/library/ubuntu/devel/Dockerfile
+++ b/library/ubuntu/devel/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/eoan/Dockerfile b/library/ubuntu/eoan/Dockerfile
index 9b248ff..5693c8f 100644
--- a/library/ubuntu/eoan/Dockerfile
+++ b/library/ubuntu/eoan/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/focal/Dockerfile b/library/ubuntu/focal/Dockerfile
index a66a4c9..b5e7e5d 100644
--- a/library/ubuntu/focal/Dockerfile
+++ b/library/ubuntu/focal/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/hirsute/Dockerfile b/library/ubuntu/hirsute/Dockerfile
index 144c0a7..ca2e4d3 100644
--- a/library/ubuntu/hirsute/Dockerfile
+++ b/library/ubuntu/hirsute/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/impish/Dockerfile b/library/ubuntu/impish/Dockerfile
index becaf60..b47f522 100644
--- a/library/ubuntu/impish/Dockerfile
+++ b/library/ubuntu/impish/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/jammy/Dockerfile b/library/ubuntu/jammy/Dockerfile
index 5088074..1e15e81 100644
--- a/library/ubuntu/jammy/Dockerfile
+++ b/library/ubuntu/jammy/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/kinetic/Dockerfile b/library/ubuntu/kinetic/Dockerfile
index 7acc194..0df866c 100644
--- a/library/ubuntu/kinetic/Dockerfile
+++ b/library/ubuntu/kinetic/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/latest/Dockerfile b/library/ubuntu/latest/Dockerfile
index 1fc7fcf..342bcc1 100644
--- a/library/ubuntu/latest/Dockerfile
+++ b/library/ubuntu/latest/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/lunar/Dockerfile b/library/ubuntu/lunar/Dockerfile
index 5f3f005..3e00025 100644
--- a/library/ubuntu/lunar/Dockerfile
+++ b/library/ubuntu/lunar/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/mantic/Dockerfile b/library/ubuntu/mantic/Dockerfile
index 3b4739a..669c961 100644
--- a/library/ubuntu/mantic/Dockerfile
+++ b/library/ubuntu/mantic/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/noble/Dockerfile b/library/ubuntu/noble/Dockerfile
index 9950a82..7494da4 100644
--- a/library/ubuntu/noble/Dockerfile
+++ b/library/ubuntu/noble/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/oracular/Dockerfile b/library/ubuntu/oracular/Dockerfile
index cc90943..50e59de 100644
--- a/library/ubuntu/oracular/Dockerfile
+++ b/library/ubuntu/oracular/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/trusty/Dockerfile b/library/ubuntu/trusty/Dockerfile
index ce09b62..0acc719 100644
--- a/library/ubuntu/trusty/Dockerfile
+++ b/library/ubuntu/trusty/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/xenial/Dockerfile b/library/ubuntu/xenial/Dockerfile
index 5723381..c62accd 100644
--- a/library/ubuntu/xenial/Dockerfile
+++ b/library/ubuntu/xenial/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"
diff --git a/library/ubuntu/zesty/Dockerfile b/library/ubuntu/zesty/Dockerfile
index 6b04751..9cac248 100644
--- a/library/ubuntu/zesty/Dockerfile
+++ b/library/ubuntu/zesty/Dockerfile
@@ -93,4 +93,5 @@ SHELL ["busybox",  "sh", "-c"]
 RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \
 rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue
 SHELL ["/bin/sh", "-c"]
+ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT"
 LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT"