diff --git a/.github/workflows/build-test-push.yml b/.github/workflows/build-test-push.yml
index 3c00d26..4f18920 100644
--- a/.github/workflows/build-test-push.yml
+++ b/.github/workflows/build-test-push.yml
@@ -14,10 +14,11 @@ on:
         version_major:
           description: 'AlmaLinux major version'
           required: true
-          default: '9'
+          default: '10'
           type: choice
           options:
-            - "10-kitten"
+            - 10-kitten
+            - 10
             - 9
             - 8
 
@@ -146,7 +147,7 @@ jobs:
           cat << EOF > containerd-snapshotter.jq
           .features |= . + { "containerd-snapshotter": true }
           EOF
-          sudo jq -n -f containerd-snapshotter.jq > /etc/docker/daemon.json
+          sudo sh -c 'jq -n -f containerd-snapshotter.jq > /etc/docker/daemon.json'
           sudo systemctl restart docker
           docker info -f '{{ .DriverStatus }}'
 
diff --git a/Containerfiles/10/Containerfile.base b/Containerfiles/10/Containerfile.base
index c2d1eb8..1e7b294 100644
--- a/Containerfiles/10/Containerfile.base
+++ b/Containerfiles/10/Containerfile.base
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/ykohut/almalinux:10
+ARG SYSBASE=quay.io/ykohut/almalinux:10-bootstrap
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir -p /mnt/sys-root; \
@@ -31,7 +31,7 @@ RUN mkdir -p /mnt/sys-root; \
     --nodocs \
     krb5-libs ; \
     dnf --installroot /mnt/sys-root clean all;
-# Additional hacks for kickstart file and backward compatable support
+# Additional hacks for kickstart file and backward compatible support
 RUN rm -rf /mnt/sys-root/var/log/dnf* /mnt/sys-root/var/log/yum.* /mnt/sys-root/var/cache/dnf/* /mnt/sys-root/var/lib/dnf/repos; \
     rm -rf /mnt/sys-root/var/log/hawkey.log /mnt/sys-root/boot /mnt/sys-root/dev/null /mnt/sys-root/var/log/*  /mnt/sys-root/run/blkid ; \
     mkdir -p /mnt/sys-root/run/lock; \
@@ -57,7 +57,7 @@ RUN rm -rf /mnt/sys-root/var/log/dnf* /mnt/sys-root/var/log/yum.* /mnt/sys-root/
     touch /mnt/sys-root/etc/machine-id; \
     touch /mnt/sys-root/etc/resolv.conf; \
     touch /mnt/sys-root/etc/hostname
-# AL9 specific hacks
+# AL10 specific hacks
 RUN mkdir -p /mnt/sys-root/var/cache/private /mnt/sys-root/var/lib/private /mnt/sys-root/var/lib/systemd/coredump /mnt/sys-root/var/lib/tpm2-tss/system/keystore ;\
     mkdir -p /mnt/sys-root/run/cryptsetup /mnt/sys-root/run/lock/subsys /mnt/sys-root/run/log /mnt/sys-root/run/user /mnt/sys-root/run/tpm2-tss/eventlog ;\
     mkdir -p /mnt/sys-root/run/systemd/ask-password /mnt/sys-root/run/systemd/machines /mnt/sys-root/run/systemd/seats /mnt/sys-root/run/systemd/sessions /mnt/sys-root/run/systemd/shutdown /mnt/sys-root/run/systemd/users ;\
diff --git a/Containerfiles/10/Containerfile.default b/Containerfiles/10/Containerfile.default
index 5180585..7315d5e 100644
--- a/Containerfiles/10/Containerfile.default
+++ b/Containerfiles/10/Containerfile.default
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/ykohut/almalinux:10
+ARG SYSBASE=quay.io/ykohut/almalinux:10-bootstrap
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir /mnt/sys-root; \
@@ -35,7 +35,7 @@ RUN mkdir /mnt/sys-root; \
     --nodocs \
     krb5-libs ; \
     dnf --installroot /mnt/sys-root clean all;
-# Additional hacks for kickstart file and backward compatable support   /mnt/sys-root/var/lib/dnf/history*
+# Additional hacks for kickstart file and backward compatible support   /mnt/sys-root/var/lib/dnf/history*
 RUN rm -rf /mnt/sys-root/var/log/dnf* /mnt/sys-root/var/log/yum.* /mnt/sys-root/usr/share/i18n/charmaps /mnt/sys-root/usr/share/i18n/locales ; \
     rm -rf /mnt/sys-root/var/cache/dnf/* /mnt/sys-root/var/lib/dnf/repos /mnt/sys-root/boot /mnt/sys-root/dev/null ; \
     rm -rf /mnt/sys-root/var/log/hawkey.log /mnt/sys-root/var/log/*  ; \
@@ -61,7 +61,7 @@ RUN rm -rf /mnt/sys-root/var/log/dnf* /mnt/sys-root/var/log/yum.* /mnt/sys-root/
     touch /mnt/sys-root/etc/machine-id; \
     touch /mnt/sys-root/etc/resolv.conf; \
     touch /mnt/sys-root/etc/hostname
-# AL9 specific hacks
+# AL10 specific hacks
 RUN mkdir -p /mnt/sys-root/var/cache/private /mnt/sys-root/var/lib/private /mnt/sys-root/var/lib/systemd/coredump /mnt/sys-root/var/lib/tpm2-tss/system/keystore ;\
     mkdir -p /mnt/sys-root/run/cryptsetup /mnt/sys-root/run/lock/subsys /mnt/sys-root/run/log /mnt/sys-root/run/user /mnt/sys-root/run/tpm2-tss/eventlog ;\
     mkdir -p /mnt/sys-root/run/systemd/ask-password /mnt/sys-root/run/systemd/machines /mnt/sys-root/run/systemd/seats /mnt/sys-root/run/systemd/sessions /mnt/sys-root/run/systemd/shutdown /mnt/sys-root/run/systemd/users ;\
diff --git a/Containerfiles/10/Containerfile.init b/Containerfiles/10/Containerfile.init
index d26dbc8..f4892a9 100644
--- a/Containerfiles/10/Containerfile.init
+++ b/Containerfiles/10/Containerfile.init
@@ -1,11 +1,8 @@
-ARG SYSBASE=quay.io/ykohut/almalinux:10
+ARG SYSBASE=quay.io/ykohut/almalinux:10-bootstrap
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir /mnt/sys-root; \
     dnf install -y \
-#    --nogpgcheck --repoid=AppStream --repoid=BaseOS \
-#    --repofrompath='BaseOS,https://repo.almalinux.org/almalinux/10/BaseOS/$basearch/os/' \
-#    --repofrompath='AppStream,https://repo.almalinux.org/almalinux/10/AppStream/$basearch/os/' \
     --installroot /mnt/sys-root \
     --releasever 10 \
     --setopt install_weak_deps=false \
@@ -38,7 +35,7 @@ RUN mkdir /mnt/sys-root; \
     --nodocs \
     krb5-libs ; \
     dnf --installroot /mnt/sys-root clean all;
-# Additional hacks for kickstart file and backward compatable support
+# Additional hacks for kickstart file and backward compatible support
 RUN rm -rf /mnt/sys-root/var/log/dnf* /mnt/sys-root/var/log/yum.* /mnt/sys-root/var/cache/dnf/* /mnt/sys-root/var/lib/dnf/repos; \
     rm -rf /mnt/sys-root/var/log/hawkey.log /mnt/sys-root/boot /mnt/sys-root/dev/null /mnt/sys-root/var/log/*  /mnt/sys-root/run/blkid ; \
     mkdir -p /mnt/sys-root/run/lock; \
@@ -64,7 +61,7 @@ RUN rm -rf /mnt/sys-root/var/log/dnf* /mnt/sys-root/var/log/yum.* /mnt/sys-root/
     touch /mnt/sys-root/etc/machine-id; \
     touch /mnt/sys-root/etc/resolv.conf; \
     touch /mnt/sys-root/etc/hostname
-# AL9 specific hacks
+# AL10 specific hacks
 RUN mkdir -p /mnt/sys-root/var/cache/private /mnt/sys-root/var/lib/private /mnt/sys-root/var/lib/systemd/coredump /mnt/sys-root/var/lib/tpm2-tss/system/keystore ;\
     mkdir -p /mnt/sys-root/run/cryptsetup /mnt/sys-root/run/lock/subsys /mnt/sys-root/run/log /mnt/sys-root/run/user /mnt/sys-root/run/tpm2-tss/eventlog ;\
     mkdir -p /mnt/sys-root/run/systemd/ask-password /mnt/sys-root/run/systemd/machines /mnt/sys-root/run/systemd/seats /mnt/sys-root/run/systemd/sessions /mnt/sys-root/run/systemd/shutdown /mnt/sys-root/run/systemd/users ;\
diff --git a/Containerfiles/10/Containerfile.micro b/Containerfiles/10/Containerfile.micro
index 8f1095f..983f501 100644
--- a/Containerfiles/10/Containerfile.micro
+++ b/Containerfiles/10/Containerfile.micro
@@ -1,11 +1,11 @@
-ARG SYSBASE=quay.io/ykohut/almalinux:10
+ARG SYSBASE=quay.io/ykohut/almalinux:10-bootstrap
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir -p /mnt/sys-root; \
     dnf install --installroot /mnt/sys-root coreutils-single glibc-minimal-langpack \
     --releasever 10 --setopt install_weak_deps=false --nodocs -y; \
     dnf --installroot /mnt/sys-root clean all;
-# Additional hacks for kickstart file and backward compatable support
+# Additional hacks for kickstart file and backward compatible support
 RUN rm -rf /mnt/sys-root/var/cache/dnf /mnt/sys-root/var/log/dnf* /mnt/sys-root/var/lib/dnf /mnt/sys-root/var/log/yum.* /mnt/sys-root/var/lib/rpm/* ; \
     /bin/date +%Y%m%d_%H%M > /mnt/sys-root/etc/BUILDTIME ;  \
     echo '%_install_langs C.utf8' > /mnt/sys-root/etc/rpm/macros.image-language-conf; \
diff --git a/Containerfiles/10/Containerfile.minimal b/Containerfiles/10/Containerfile.minimal
index ff26366..65a36c1 100644
--- a/Containerfiles/10/Containerfile.minimal
+++ b/Containerfiles/10/Containerfile.minimal
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/ykohut/almalinux:10
+ARG SYSBASE=quay.io/ykohut/almalinux:10-bootstrap
 FROM ${SYSBASE} as system-build
 
 RUN mkdir /mnt/sys-root; \
@@ -25,7 +25,7 @@ RUN mkdir /mnt/sys-root; \
     --nodocs \
     krb5-libs ; \
     dnf --installroot /mnt/sys-root clean all;
-# Additional hacks for kickstart file and backward compatable support
+# Additional hacks for kickstart file and backward compatible support
 RUN rm -rf /mnt/sys-root/var/log/dnf* /mnt/sys-root/var/log/yum.* /mnt/sys-root/var/cache/dnf /mnt/sys-root/var/lib/dnf/repos; \
     rm -rf /mnt/sys-root/var/lib/dnf/history* /mnt/sys-root/var/log/hawkey.log /mnt/sys-root/boot /mnt/sys-root/dev/null /mnt/sys-root/run/*; \
     mkdir -p /mnt/sys-root/run/lock; \